@contractkit/plugin-typescript 0.35.0 → 0.36.0

package/.turbo/turbo-build$colon$ci.log

@@ -5,9 +5,9 @@ $ tsup src/index.ts --format esm --sourcemap --dts && tsc --emitDeclarationOnly
 CLI tsup v8.5.1
 CLI Target: esnext
 ESM Build start
-ESM dist/index.js     225.18 KB
-ESM dist/index.js.map 531.21 KB
-ESM ⚡️ Build success in 386ms
+ESM dist/index.js     230.12 KB
+ESM dist/index.js.map 542.08 KB
+ESM ⚡️ Build success in 359ms
 DTS Build start
-DTS ⚡️ Build success in 3500ms
-DTS dist/index.d.ts 10.53 KB
+DTS ⚡️ Build success in 3932ms
+DTS dist/index.d.ts 11.34 KB

package/.turbo/turbo-test$colon$ci.log

@@ -3,39 +3,41 @@ $ vitest run --coverage
  RUN  v4.1.5 /home/runner/work/ContractKit/ContractKit/packages/plugin-typescript
       Coverage enabled with v8
 
- ✓ tests/codegen-operation.test.ts (161 tests) 207ms
- ✓ tests/codegen-contract.test.ts (147 tests) 155ms
- ✓ tests/codegen-sdk.test.ts (173 tests) 256ms
- ✓ tests/codegen-plain-types.test.ts (67 tests) 54ms
- ✓ tests/codegen-server.test.ts (39 tests) 147ms
- ✓ tests/pipeline.test.ts (34 tests) 433ms
- ✓ tests/codegen-mcp.test.ts (33 tests) 29ms
- ✓ tests/codegen-operation-framework.test.ts (8 tests) 6ms
- ✓ tests/server-framework-koa.test.ts (19 tests) 18ms
+ ✓ tests/codegen-operation.test.ts (166 tests) 190ms
+ ✓ tests/codegen-contract.test.ts (147 tests) 182ms
+ ✓ tests/codegen-sdk.test.ts (173 tests) 228ms
+ ✓ tests/codegen-plain-types.test.ts (67 tests) 39ms
+ ✓ tests/codegen-server.test.ts (39 tests) 129ms
+ ✓ tests/pipeline.test.ts (34 tests) 542ms
+ ✓ tests/codegen-mcp.test.ts (33 tests) 52ms
+ ✓ tests/server-framework-fastify.test.ts (25 tests) 11ms
+ ✓ tests/codegen-operation-framework.test.ts (14 tests) 9ms
+ ✓ tests/server-framework-koa.test.ts (19 tests) 22ms
  ✓ tests/ts-render.test.ts (5 tests) 10ms
- ✓ tests/escaping-security.test.ts (18 tests) 22ms
- ✓ tests/server-framework.test.ts (4 tests) 7ms
+ ✓ tests/server-framework.test.ts (4 tests) 13ms
+ ✓ tests/escaping-security.test.ts (18 tests) 20ms
 
- Test Files  12 passed (12)
-      Tests  708 passed (708)
-   Start at  18:00:17
-   Duration  7.85s (transform 4.21s, setup 0ms, import 14.10s, tests 1.34s, environment 1ms)
+ Test Files  13 passed (13)
+      Tests  744 passed (744)
+   Start at  19:51:10
+   Duration  9.04s (transform 3.75s, setup 0ms, import 16.64s, tests 1.45s, environment 3ms)
 
  % Coverage report from v8
 -------------------|---------|----------|---------|---------|-------------------
 File               | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s 
 -------------------|---------|----------|---------|---------|-------------------
-All files          |   84.59 |    78.42 |   87.93 |    87.3 |                   
- src               |   84.42 |    78.12 |   87.61 |   87.16 |                   
+All files          |   84.73 |    78.53 |   88.26 |   87.45 |                   
+ src               |   84.57 |    78.23 |   87.97 |    87.3 |                   
   ...n-contract.ts |   90.13 |    85.89 |   90.51 |    90.9 | ...1166,1171-1172 
   codegen-mcp.ts   |   83.44 |    75.46 |   84.21 |   86.61 | ...01,306-307,392 
-  ...-operation.ts |   83.27 |    80.62 |   80.82 |   85.33 | ...1070,1075-1076 
+  ...-operation.ts |   83.68 |    80.85 |   81.08 |   85.74 | ...1114,1119-1120 
   ...lain-types.ts |    91.7 |     83.8 |   96.96 |   94.57 | ...79,204,316,322 
   ...gen-revive.ts |   59.23 |    52.54 |   78.37 |   65.28 | ...85-316,398-404 
   codegen-sdk.ts   |   88.46 |    80.47 |   90.55 |   91.36 | ...1891,1895-1896 
   ...al-runtime.ts |     100 |      100 |     100 |     100 |                   
-  index.ts         |   77.23 |    65.81 |    83.6 |   81.28 | ...1152,1168-1187 
+  index.ts         |   77.23 |    65.81 |    83.6 |   81.28 | ...1153,1169-1188 
   path-utils.ts    |    70.5 |    52.27 |     100 |   73.72 | ...75-178,226-241 
+  ...rk-fastify.ts |     100 |      100 |     100 |     100 |                   
   ...mework-koa.ts |     100 |      100 |     100 |     100 |                   
   ...-framework.ts |     100 |      100 |     100 |     100 |                   
   ts-render.ts     |   86.04 |    88.23 |      80 |   90.14 | 103,191,224-232   

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @contractkit/contractkit-plugin-typescript
 
+## 0.36.0
+
+### Minor Changes
+
+- 18263e2: Generate Fastify routers with `server.framework: "fastify"`.
+
+    ```json
+    "server": { "framework": "fastify", "baseDir": "apps/api/" }
+    ```
+
+    Output targets `@maroonedsoftware/fastify`, whose exported surface mirrors the Koa one, so a contract compiles to the same handlers either way:
+
+    ```ts
+    BillingRouter.post('/payments', requirePolicy(), bodyParserMiddleware(['json']), async (request, reply) => {
+        const body = await parseAndValidate(request.parsedBody, PaymentInput);
+
+        const service = request.container.get(PaymentService);
+        const result: Payment = await service.create(body);
+
+        reply.status(200);
+        reply.type('application/json');
+        return reply.send(result);
+    });
+    ```
+
+    Three differences are worth knowing before you switch:
+    - **The request is the context.** Handlers take `(request, reply)`, and params, query, headers, the DI container and the parsed body all hang off `request`. Fastify's own `request.body` is never populated, because ServerKit parses lazily per route.
+    - **Responses are returned, not assigned.** A handler that neither returns a body nor calls `send` leaves the request hanging, so a bodyless 204 emits an explicit `return reply.send();` where Koa emits nothing at all.
+    - **Content type comes from `requestMediaType(request)`.** Fastify has no accessor that strips the parameters off the header, and a raw `application/json; charset=utf-8` matches none of the MIME literals an operation declares.
+
+    `koa` remains the default and its output is unchanged. The generated `mcp.router.ts` follows the setting, using `reply.hijack()` where the Koa mount sets `ctx.respond = false`.
+
+    Separately, a path parameter whose name collides with an identifier the handler already binds is now renamed. `/threads/{reply}` emitted `const { reply } = ...` inside `async (request, reply) => {`, a redeclaration under `tsc` and a temporal-dead-zone `ReferenceError` at runtime; the same held on Koa for a parameter named `ctx`, and on both for one named after a generator local such as `body` or `query`. Only the local binding moves, so the wire name, the schema key and the route placeholder are untouched.
+
 ## 0.35.0
 
 ### Minor Changes

package/README.md

@@ -57,7 +57,7 @@ Generates server router files from `operation` declarations and optionally type
 | Option | Type | Default | Description |
 |---|---|---|---|
 | `baseDir` | `string` | `rootDir` | Base directory for output files |
-| `framework` | `string` | `"koa"` | HTTP framework the routers target. Only `koa` is supported today. |
+| `framework` | `string` | `"koa"` | HTTP framework the routers target: `"koa"` or `"fastify"`. Also selects the `mcp.router.ts` flavour. |
 | `zod` | `boolean` | `false` | Emit Zod schemas in `output.types` instead of plain interfaces |
 | `output.routes` | `string` | — | Path template for router files |
 | `output.types` | `string` | — | Path template for type/schema files |
@@ -132,7 +132,7 @@ Contracts without visibility modifiers generate a single `Model` schema.
 
 ### Router shape (from `operation`)
 
-Each operation file generates one router, targeting the framework named by `framework` (`koa` today). Request bodies and path/query params are validated against the Zod schemas (when `zod: true`) or plain types. Handlers are expected to be exported from the service module specified by `servicePathTemplate`.
+Each operation file generates one router, targeting the framework named by `framework`. On Koa a handler is `async ctx => {}` writing `ctx.status` / `ctx.type` / `ctx.body`; on Fastify it is `async (request, reply) => {}` reading `request.parsedBody` and returning `reply.send(...)`. Validation, service dispatch and the response shape are identical either way. Request bodies and path/query params are validated against the Zod schemas (when `zod: true`) or plain types. Handlers are expected to be exported from the service module specified by `servicePathTemplate`.
 
 Responses are only type-annotated by default. With `validateResponses: true` (which requires `zod: true`) the service's return value is re-parsed against its declared response schema and the parsed value is written to `ctx.body`, so a service returning a shape the contract does not allow fails with a 500 instead of shipping it. See [docs/config.md](../../docs/config.md#validateresponses) for the caveats — notably that models using `format(input=…)`/`format(output=…)` are skipped.
 

package/dist/codegen-operation.d.ts

@@ -74,7 +74,7 @@ export declare function inferService(op: OpOperationNode, route: OpRouteNode, fi
  *
  * @returns The rendered argument list, or an empty string when the method takes no arguments.
  */
-export declare function buildArgs(route: OpRouteNode, op: OpOperationNode): string;
+export declare function buildArgs(route: OpRouteNode, op: OpOperationNode, bindings?: Map<string, string>): string;
 /**
  * Derive the PascalCase base name used for router, service, and type names from a contract file path.
  *

package/dist/codegen-operation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codegen-operation.d.ts","sourceRoot":"","sources":["../src/codegen-operation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,UAAU,EACV,WAAW,EACX,eAAe,EAGf,gBAAgB,EAInB,MAAM,mBAAmB,CAAC;AAa3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,sGAAsG;AACtG,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC;AA0BvD;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,gBAAgB,GAAG,OAAO,CA0E5F;AAID,iFAAiF;AACjF,MAAM,WAAW,gBAAgB;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sFAAsF;IACtF,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,qFAAqF;IACrF,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9B,oFAAoF;IACpF,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAClC;;;OAGG;IACH,SAAS,CAAC,EAAE,eAAe,CAAC;CAC/B;AAKD;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,GAAE,gBAAqB,GAAG,MAAM,CAgHnF;AAuTD;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAY7H;AAoBD;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,eAAe,GAAG,MAAM,CAqBzE;AAgbD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAWnD;AAMD;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAQ/E"}
+{"version":3,"file":"codegen-operation.d.ts","sourceRoot":"","sources":["../src/codegen-operation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,UAAU,EACV,WAAW,EACX,eAAe,EAGf,gBAAgB,EAInB,MAAM,mBAAmB,CAAC;AAa3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,sGAAsG;AACtG,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC;AAsDvD;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,gBAAgB,GAAG,OAAO,CA0E5F;AAID,iFAAiF;AACjF,MAAM,WAAW,gBAAgB;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sFAAsF;IACtF,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,qFAAqF;IACrF,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9B,oFAAoF;IACpF,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAClC;;;OAGG;IACH,SAAS,CAAC,EAAE,eAAe,CAAC;CAC/B;AAKD;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,GAAE,gBAAqB,GAAG,MAAM,CAgHnF;AA0TD;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAY7H;AAoBD;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAuBzG;AA2bD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAWnD;AAMD;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAQ/E"}

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import type { ContractKitPlugin } from '@contractkit/core';
 import { type ServerFrameworkName } from './server-framework.js';
 export { SERVER_FRAMEWORK_NAMES, DEFAULT_SERVER_FRAMEWORK_NAME, resolveServerFramework, SERVER_FRAMEWORKS, type ServerFramework, type ServerFrameworkName, } from './server-framework.js';
 export { KOA_SERVER_FRAMEWORK } from './server-framework-koa.js';
+export { FASTIFY_SERVER_FRAMEWORK } from './server-framework-fastify.js';
 /** Server output: routers, and the type or Zod schema files they import. */
 export interface ServerConfig {
     /** Directory (relative to rootDir) where server files are written. Default: rootDir. */

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -1476,6 +1476,9 @@ var KOA_SERVER_FRAMEWORK = {
   pathParam(identifier) {
     return `:${identifier}`;
   },
+  handlerLocals: [
+    "ctx"
+  ],
   routeOpen(routerName, method, path, middlewares) {
     const middlewareStr = middlewares.length > 0 ? `, ${middlewares.join(", ")},` : ",";
     return `${routerName}.${method}('${path}'${middlewareStr} async ctx => {`;
@@ -1557,6 +1560,31 @@ export function mountMcp(router: ReturnType<typeof ServerKitRouter>): void {
 };
 
 // src/codegen-operation.ts
+var GENERATOR_HANDLER_LOCALS = [
+  "service",
+  "result",
+  "body",
+  "multipartBody",
+  "params",
+  "query",
+  "headers"
+];
+function bindPathParams(nodes, handlerLocals) {
+  const reserved = /* @__PURE__ */ new Set([
+    ...handlerLocals,
+    ...GENERATOR_HANDLER_LOCALS
+  ]);
+  const taken = /* @__PURE__ */ new Set();
+  const bindings = /* @__PURE__ */ new Map();
+  for (const node of nodes) {
+    let local = toIdentifier(node.name);
+    while (reserved.has(local) || taken.has(local)) local += "_";
+    taken.add(local);
+    bindings.set(node.name, local);
+  }
+  return bindings;
+}
+__name(bindPathParams, "bindPathParams");
 function bodyParserToken(contentType) {
   switch (classifyContentType(contentType)) {
     case "urlencoded":
@@ -1763,7 +1791,8 @@ function generateHandler(route, op, root, options) {
     middlewares.push(framework.middleware.signature(sigArgs));
   }
   lines.push(framework.routeOpen(deriveRouterName(file), method, path, middlewares));
-  lines.push(...generateParamValidation(route.params, "params", framework.request.params, route.paramsMode ?? "strict", "", modelsWithInput));
+  const pathBindings = route.params?.kind === "params" ? bindPathParams(route.params.nodes, framework.handlerLocals) : void 0;
+  lines.push(...generateParamValidation(route.params, "params", framework.request.params, route.paramsMode ?? "strict", "", modelsWithInput, pathBindings));
   lines.push(...generateParamValidation(op.query, "query", framework.request.query, op.queryMode ?? "strict", "", modelsWithInput));
   lines.push(...generateParamValidation(op.headers, "headers", framework.request.headers, op.headersMode ?? "strip", "", modelsWithInput));
   if (hasBody && op.request) {
@@ -1795,7 +1824,7 @@ function generateHandler(route, op, root, options) {
   }
   const emitted = emittedResponses(op);
   const serviceParts = inferService(op, route, file);
-  const call = `await service.${serviceParts.methodName}(${buildArgs(route, op)})`;
+  const call = `await service.${serviceParts.methodName}(${buildArgs(route, op, pathBindings)})`;
   if (emitted.length > 1) {
     lines.push(...generateMultiStatusResult(emitted, serviceParts.className, call, options));
   } else {
@@ -2002,11 +2031,11 @@ function inferMethodName(method, path) {
   }
 }
 __name(inferMethodName, "inferMethodName");
-function buildArgs(route, op) {
+function buildArgs(route, op, bindings) {
   const args = [];
   if (route.params) {
     if (route.params.kind === "params") {
-      args.push(...route.params.nodes.map((p) => toIdentifier(p.name)));
+      args.push(...route.params.nodes.map((p) => bindings?.get(p.name) ?? toIdentifier(p.name)));
     } else {
       args.push("params");
     }
@@ -2126,7 +2155,7 @@ function responseBodyExpr(value, schema) {
   return schema ? `await parseAndValidate(${value}, ${schema}, 500)` : value;
 }
 __name(responseBodyExpr, "responseBodyExpr");
-function generateParamValidation(source, kind, sourceExpr, mode, suffix = "", modelsWithInput) {
+function generateParamValidation(source, kind, sourceExpr, mode, suffix = "", modelsWithInput, bindings) {
   if (!source) return [];
   const lines = [];
   const isQuery = kind === "query";
@@ -2138,7 +2167,11 @@ function generateParamValidation(source, kind, sourceExpr, mode, suffix = "", mo
   } else if (source.kind === "params") {
     if (source.nodes.length > 0) {
       const bind = /* @__PURE__ */ __name((name) => isPathParams ? toIdentifier(name) : name, "bind");
-      const lhs = isPathParams ? `{ ${source.nodes.map((p) => bind(p.name)).join(", ")} }` : kind;
+      const lhs = isPathParams ? `{ ${source.nodes.map((p) => {
+        const wire = bind(p.name);
+        const local = bindings?.get(p.name) ?? wire;
+        return wire === local ? wire : `${wire}: ${local}`;
+      }).join(", ")} }` : kind;
       lines.push(`    const ${lhs} = await parseAndValidate(`);
       lines.push(`        ${sourceExpr},`);
       lines.push(`        ${modeToWrapper(mode)}({`);
@@ -4215,13 +4248,131 @@ function renderOutputField(field, outputCase, modelsWithOutput, target) {
 }
 __name(renderOutputField, "renderOutputField");
 
+// src/server-framework-fastify.ts
+var FASTIFY_RUNTIME_MODULE = "@maroonedsoftware/fastify";
+var FASTIFY_RUNTIME_SYMBOLS = [
+  "ServerKitRouter",
+  "bodyParserMiddleware",
+  "requirePolicy",
+  "requireSignature",
+  "requestMediaType"
+];
+var FASTIFY_SERVER_FRAMEWORK = {
+  name: "fastify",
+  imports(uses) {
+    const symbols = FASTIFY_RUNTIME_SYMBOLS.filter(uses);
+    return symbols.length > 0 ? [
+      `import { ${symbols.join(", ")} } from '${FASTIFY_RUNTIME_MODULE}';`
+    ] : [];
+  },
+  routerDeclaration(routerName) {
+    return `export const ${routerName} = ServerKitRouter();`;
+  },
+  pathParam(identifier) {
+    return `:${identifier}`;
+  },
+  handlerLocals: [
+    "request",
+    "reply"
+  ],
+  routeOpen(routerName, method, path, middlewares) {
+    const middlewareStr = middlewares.length > 0 ? `, ${middlewares.join(", ")},` : ",";
+    return `${routerName}.${method}('${path}'${middlewareStr} async (request, reply) => {`;
+  },
+  routeClose() {
+    return [
+      "});"
+    ];
+  },
+  middleware: {
+    policy(args) {
+      return `requirePolicy(${args})`;
+    },
+    bodyParser(tokensExpr) {
+      return `bodyParserMiddleware([${tokensExpr}])`;
+    },
+    signature(args) {
+      return `requireSignature(${args})`;
+    }
+  },
+  request: {
+    params: "request.params",
+    query: "request.query",
+    headers: "request.headers",
+    // ServerKit parses lazily per route, so Fastify's own `request.body` is never populated.
+    parsedBody: "request.parsedBody",
+    // A call, not a property: the raw header carries `; charset=utf-8`, which would match none of
+    // the declared MIME literals the generated switch compares against.
+    contentType: "requestMediaType(request)"
+  },
+  resolveService(className) {
+    return `request.container.get(${className})`;
+  },
+  response: {
+    status(expr) {
+      return `reply.status(${expr});`;
+    },
+    header(name, valueExpr) {
+      return `reply.header('${name}', ${valueExpr});`;
+    },
+    type(expr) {
+      return `reply.type(${expr});`;
+    },
+    send(bodyExpr) {
+      return bodyExpr === void 0 ? [
+        "return reply.send();"
+      ] : [
+        `return reply.send(${bodyExpr});`
+      ];
+    },
+    caseEnd() {
+      return [];
+    }
+  },
+  mcpRouter({ path }) {
+    return `import { type ServerKitRouterType, bodyParserMiddleware, requireSignature, requestHeader } from '${FASTIFY_RUNTIME_MODULE}';
+import { McpDispatcher, createMcpRequestContext, MCP_AUTH_POLICY } from '@maroonedsoftware/mcp';
+
+/** Mount the MCP endpoint onto a ServerKit router. Bind \`registerMcpTools\` to the \`McpToolHandlerMap\` token. */
+export function mountMcp(router: ServerKitRouterType): void {
+    router.post('${path}', bodyParserMiddleware(['json']), requireSignature('mcp', { policy: MCP_AUTH_POLICY }), async (request, reply) => {
+        const dispatcher = request.container.get(McpDispatcher);
+        const context = createMcpRequestContext({ requestId: request.requestId, logger: request.logger });
+        if (dispatcher.sessionMode === 'stateful') {
+            // Fastify's equivalent of Koa's \`ctx.respond = false\`: the dispatcher writes the raw
+            // response itself, and the request scope is disposed on the raw socket close instead.
+            reply.hijack();
+            await dispatcher.dispatchStateful(
+                {
+                    req: request.raw,
+                    res: reply.raw,
+                    body: request.parsedBody,
+                    // \`requestHeader\` returns '' for an absent header; the session id is optional.
+                    sessionId: requestHeader(request, 'mcp-session-id') || undefined,
+                },
+                context,
+            );
+            return;
+        }
+        const response = await dispatcher.dispatch(JSON.parse(String(request.rawBody)), context);
+        if (response) return reply.send(response);
+        reply.status(202); // a notification \u2014 nothing to return
+        return reply.send();
+    });
+}
+`;
+  }
+};
+
 // src/server-framework.ts
 var SERVER_FRAMEWORK_NAMES = [
-  "koa"
+  "koa",
+  "fastify"
 ];
 var DEFAULT_SERVER_FRAMEWORK_NAME = "koa";
 var SERVER_FRAMEWORKS = {
-  koa: KOA_SERVER_FRAMEWORK
+  koa: KOA_SERVER_FRAMEWORK,
+  fastify: FASTIFY_SERVER_FRAMEWORK
 };
 function resolveServerFramework(name) {
   const resolved = name ?? DEFAULT_SERVER_FRAMEWORK_NAME;
@@ -5809,6 +5960,7 @@ function stableSubConfig(config) {
 __name(stableSubConfig, "stableSubConfig");
 export {
   DEFAULT_SERVER_FRAMEWORK_NAME,
+  FASTIFY_SERVER_FRAMEWORK,
   KOA_SERVER_FRAMEWORK,
   SERVER_FRAMEWORKS,
   SERVER_FRAMEWORK_NAMES,