@contractkit/plugin-typescript 0.34.0 → 0.35.0

package/dist/index.js

@@ -1453,6 +1453,110 @@ __name(pascalToDotCase, "pascalToDotCase");
 // src/codegen-operation.ts
 import { resolveModifiers, resolveSecurity, SECURITY_NONE, classifyContentType, emittedResponses, PATH_PARAM_RE_G, toIdentifier } from "@contractkit/core";
 import { basename, dirname as dirname3, relative as relative3 } from "path";
+
+// src/server-framework-koa.ts
+var KOA_RUNTIME_MODULE = "@maroonedsoftware/koa";
+var KOA_RUNTIME_SYMBOLS = [
+  "ServerKitRouter",
+  "bodyParserMiddleware",
+  "requirePolicy",
+  "requireSignature"
+];
+var KOA_SERVER_FRAMEWORK = {
+  name: "koa",
+  imports(uses) {
+    const symbols = KOA_RUNTIME_SYMBOLS.filter(uses);
+    return symbols.length > 0 ? [
+      `import { ${symbols.join(", ")} } from '${KOA_RUNTIME_MODULE}';`
+    ] : [];
+  },
+  routerDeclaration(routerName) {
+    return `export const ${routerName} = ServerKitRouter();`;
+  },
+  pathParam(identifier) {
+    return `:${identifier}`;
+  },
+  routeOpen(routerName, method, path, middlewares) {
+    const middlewareStr = middlewares.length > 0 ? `, ${middlewares.join(", ")},` : ",";
+    return `${routerName}.${method}('${path}'${middlewareStr} async ctx => {`;
+  },
+  routeClose() {
+    return [
+      "});"
+    ];
+  },
+  middleware: {
+    policy(args) {
+      return `requirePolicy(${args})`;
+    },
+    bodyParser(tokensExpr) {
+      return `bodyParserMiddleware([${tokensExpr}])`;
+    },
+    signature(args) {
+      return `requireSignature(${args})`;
+    }
+  },
+  request: {
+    params: "ctx.params",
+    query: "ctx.query",
+    headers: "ctx.headers",
+    // Not `ctx.request.body`: the ServerKit body parser drains the stream and writes its result
+    // here, and in Koa `ctx.body` is the *response* body.
+    parsedBody: "ctx.parsedBody",
+    // Koa strips the parameters off `Content-Type` for this accessor already.
+    contentType: "ctx.request.type"
+  },
+  resolveService(className) {
+    return `ctx.container.get(${className})`;
+  },
+  response: {
+    status(expr) {
+      return `ctx.status = ${expr};`;
+    },
+    header(name, valueExpr) {
+      return `ctx.set('${name}', ${valueExpr});`;
+    },
+    type(expr) {
+      return `ctx.type = ${expr};`;
+    },
+    send(bodyExpr) {
+      return bodyExpr === void 0 ? [] : [
+        `ctx.body = ${bodyExpr};`
+      ];
+    },
+    caseEnd() {
+      return [
+        "break;"
+      ];
+    }
+  },
+  mcpRouter({ path }) {
+    return `import { ServerKitRouter, bodyParserMiddleware, requireSignature } from '${KOA_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: ReturnType<typeof ServerKitRouter>): void {
+    router.post('${path}', bodyParserMiddleware(['json']), requireSignature('mcp', { policy: MCP_AUTH_POLICY }), async (ctx) => {
+        const dispatcher = ctx.container.get(McpDispatcher);
+        const context = createMcpRequestContext({ requestId: ctx.requestId, logger: ctx.logger });
+        if (dispatcher.sessionMode === 'stateful') {
+            ctx.respond = false;
+            await dispatcher.dispatchStateful(
+                { req: ctx.req, res: ctx.res, body: ctx.parsedBody, sessionId: ctx.get('mcp-session-id') },
+                context,
+            );
+        } else {
+            const response = await dispatcher.dispatch(JSON.parse(String(ctx.rawBody)), context);
+            if (response) ctx.body = response;
+            else ctx.status = 202; // a notification \u2014 nothing to return
+        }
+    });
+}
+`;
+  }
+};
+
+// src/codegen-operation.ts
 function bodyParserToken(contentType) {
   switch (classifyContentType(contentType)) {
     case "urlencoded":
@@ -1525,6 +1629,11 @@ function bodyTypesStructurallyEqual(a, b) {
 }
 __name(bodyTypesStructurallyEqual, "bodyTypesStructurallyEqual");
 function generateOp(root, options = {}) {
+  const resolved = {
+    ...options,
+    framework: options.framework ?? KOA_SERVER_FRAMEWORK
+  };
+  const framework = resolved.framework;
   const types = collectTypes(root, options.modelsWithInput, options.modelsWithOutput);
   const services = collectServices(root);
   const routerName = deriveRouterName(root.file);
@@ -1533,13 +1642,13 @@ function generateOp(root, options = {}) {
   lines.push("/**");
   lines.push(` * generated from ${sourceLink(basename(root.file), options.outPath, root.file)}`);
   lines.push("*/");
-  lines.push(`export const ${routerName} = ServerKitRouter();`);
+  lines.push(framework.routerDeclaration(routerName));
   lines.push("");
   const includeInternal = options.includeInternal ?? true;
   for (const route of root.routes) {
     for (const op of route.operations) {
       if (!includeInternal && resolveModifiers(route, op).includes("internal")) continue;
-      lines.push(...generateHandler(route, op, root, options));
+      lines.push(...generateHandler(route, op, root, resolved));
       lines.push("");
     }
   }
@@ -1574,15 +1683,7 @@ function generateOp(root, options = {}) {
   ].join("\n");
   const uses = /* @__PURE__ */ __name((symbol) => new RegExp(`\\b${symbol}\\b`).test(generated), "uses");
   const body = [];
-  const koaImports = [
-    "ServerKitRouter",
-    "bodyParserMiddleware",
-    "requirePolicy",
-    "requireSignature"
-  ].filter(uses);
-  if (koaImports.length > 0) {
-    body.push(`import { ${koaImports.join(", ")} } from '@maroonedsoftware/koa';`);
-  }
+  body.push(...framework.imports(uses));
   for (const svc of services.filter(uses)) {
     const modulePath = root.services?.[svc] ?? root.meta[svc] ?? deriveModulePath(svc, options.servicePathTemplate);
     body.push(`import { ${svc} } from '${modulePath}';`);
@@ -1626,6 +1727,7 @@ function generateHandler(route, op, root, options) {
   const file = root.file;
   const outPath = options.outPath;
   const modelsWithInput = options.modelsWithInput;
+  const framework = options.framework;
   lines.push("/**");
   const desc = op.description ?? route.description;
   if (desc) {
@@ -1641,7 +1743,7 @@ function generateHandler(route, op, root, options) {
   if (mods.includes("deprecated")) lines.push(` * @deprecated`);
   lines.push("*/");
   const method = op.method;
-  const path = route.path.replace(PATH_PARAM_RE_G, (_m, name) => `:${toIdentifier(name)}`);
+  const path = route.path.replace(PATH_PARAM_RE_G, (_m, name) => framework.pathParam(toIdentifier(name)));
   const bodies = op.request?.bodies ?? [];
   const hasBody = bodies.length > 0;
   const isSingleMultipart = bodies.length === 1 && bodies[0].contentType === "multipart/form-data";
@@ -1649,42 +1751,41 @@ function generateHandler(route, op, root, options) {
   if (effectiveSecurity !== SECURITY_NONE) {
     const policy = effectiveSecurity?.policy;
     const args = policy === void 0 ? "" : policy === false ? "{ policy: false }" : `{ policy: '${policy}' }`;
-    middlewares.push(`requirePolicy(${args})`);
+    middlewares.push(framework.middleware.policy(args));
   }
   if (hasBody) {
     const parserTokens = Array.from(new Set(bodies.map((b) => bodyParserToken(b.contentType))));
     const tokensExpr = parserTokens.map((t) => `'${t}'`).join(", ");
-    middlewares.push(`bodyParserMiddleware([${tokensExpr}])`);
+    middlewares.push(framework.middleware.bodyParser(tokensExpr));
   }
   if (op.signature) {
     const sigArgs = op.signaturePolicy ? `'${escapeSingleQuoted(op.signature)}', { policy: '${escapeSingleQuoted(op.signaturePolicy)}' }` : `'${escapeSingleQuoted(op.signature)}'`;
-    middlewares.push(`requireSignature(${sigArgs})`);
+    middlewares.push(framework.middleware.signature(sigArgs));
   }
-  const middlewareStr = middlewares.length > 0 ? `, ${middlewares.join(", ")},` : ",";
-  lines.push(`${deriveRouterName(file)}.${method}('${path}'${middlewareStr} async ctx => {`);
-  lines.push(...generateParamValidation(route.params, "ctx.params", "params", route.paramsMode ?? "strict", "", modelsWithInput));
-  lines.push(...generateParamValidation(op.query, "ctx.query", "query", op.queryMode ?? "strict", "", modelsWithInput));
-  lines.push(...generateParamValidation(op.headers, "ctx.headers", "headers", op.headersMode ?? "strip", "", modelsWithInput));
+  lines.push(framework.routeOpen(deriveRouterName(file), method, path, middlewares));
+  lines.push(...generateParamValidation(route.params, "params", framework.request.params, route.paramsMode ?? "strict", "", modelsWithInput));
+  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) {
     if (isSingleMultipart) {
-      lines.push(`    const multipartBody = ctx.parsedBody as MultipartBody;`);
+      lines.push(`    const multipartBody = ${framework.request.parsedBody} as MultipartBody;`);
       lines.push("");
     } else if (bodies.length === 1) {
-      lines.push(`    const body = await parseAndValidate(ctx.parsedBody, ${renderInputType(bodies[0].bodyType, modelsWithInput)});`);
+      lines.push(`    const body = await parseAndValidate(${framework.request.parsedBody}, ${renderInputType(bodies[0].bodyType, modelsWithInput)});`);
       lines.push("");
     } else if (bodies.every((b) => bodyTypesStructurallyEqual(b.bodyType, bodies[0].bodyType))) {
-      lines.push(`    const body = await parseAndValidate(ctx.parsedBody, ${renderInputType(bodies[0].bodyType, modelsWithInput)});`);
+      lines.push(`    const body = await parseAndValidate(${framework.request.parsedBody}, ${renderInputType(bodies[0].bodyType, modelsWithInput)});`);
       lines.push("");
     } else {
       const annotation = bodies.map((b) => b.contentType === "multipart/form-data" ? "MultipartBody" : `z.infer<typeof ${renderInputType(b.bodyType, modelsWithInput)}>`).join(" | ");
       lines.push(`    let body!: ${annotation};`);
-      lines.push(`    switch (ctx.request.type) {`);
+      lines.push(`    switch (${framework.request.contentType}) {`);
       for (const b of bodies) {
         lines.push(`        case '${b.contentType}':`);
         if (b.contentType === "multipart/form-data") {
-          lines.push(`            body = ctx.parsedBody as MultipartBody;`);
+          lines.push(`            body = ${framework.request.parsedBody} as MultipartBody;`);
         } else {
-          lines.push(`            body = await parseAndValidate(ctx.parsedBody, ${renderInputType(b.bodyType, modelsWithInput)});`);
+          lines.push(`            body = await parseAndValidate(${framework.request.parsedBody}, ${renderInputType(b.bodyType, modelsWithInput)});`);
         }
         lines.push(`            break;`);
       }
@@ -1700,11 +1801,12 @@ function generateHandler(route, op, root, options) {
   } else {
     lines.push(...generateSingleStatusResult(emitted[0], op, serviceParts.className, call, options));
   }
-  lines.push(`});`);
+  lines.push(...framework.routeClose());
   return lines;
 }
 __name(generateHandler, "generateHandler");
 function generateSingleStatusResult(resp, op, className, call, options) {
+  const framework = options.framework;
   const lines = [];
   const bodies = resp ? resp.bodies : [];
   const respHeaders = resp?.headers ?? [];
@@ -1715,7 +1817,7 @@ function generateSingleStatusResult(resp, op, className, call, options) {
     const { annotation, prelude } = formatTypeAnnotation(bodies[0].bodyType, options.modelsWithOutput);
     if (prelude) lines.push(`    ${prelude}`);
     bodySchema = responseBodySchema(bodies[0].bodyType, options, prelude ? "resultType" : void 0);
-    lines.push(`    const service = ctx.container.get(${className});`);
+    lines.push(`    const service = ${framework.resolveService(className)};`);
     if (hasRespHeaders) {
       lines.push(`    const result: { body: ${annotation}; headers: ${headersAnnotation} } = ${call};`);
     } else {
@@ -1729,10 +1831,10 @@ function generateSingleStatusResult(resp, op, className, call, options) {
     const { members, preludes } = rendered;
     bodySchema = rendered.bodySchema;
     for (const prelude of preludes) lines.push(`    ${prelude}`);
-    lines.push(`    const service = ctx.container.get(${className});`);
+    lines.push(`    const service = ${framework.resolveService(className)};`);
     lines.push(`    const result: ${members.join(" | ")} = ${call};`);
   } else {
-    lines.push(`    const service = ctx.container.get(${className});`);
+    lines.push(`    const service = ${framework.resolveService(className)};`);
     if (hasRespHeaders) {
       lines.push(`    const result: { headers: ${headersAnnotation} } = ${call};`);
     } else {
@@ -1740,19 +1842,22 @@ function generateSingleStatusResult(resp, op, className, call, options) {
     }
   }
   lines.push("");
-  lines.push(`    ctx.status = ${resp?.statusCode ?? 204};`);
-  lines.push(...headerSetLines(respHeaders, "    "));
+  lines.push(`    ${framework.response.status(String(resp?.statusCode ?? 204))}`);
+  lines.push(...headerSetLines(respHeaders, "    ", framework));
   if (bodies.length === 1) {
-    lines.push(`    ctx.type = '${bodies[0].contentType}';`);
-    lines.push(`    ctx.body = ${responseBodyExpr(hasRespHeaders ? "result.body" : "result", bodySchema)};`);
+    lines.push(`    ${framework.response.type(`'${bodies[0].contentType}'`)}`);
+    lines.push(...indent(framework.response.send(responseBodyExpr(hasRespHeaders ? "result.body" : "result", bodySchema)), "    "));
   } else if (bodies.length > 1) {
-    lines.push(`    ctx.type = result.contentType;`);
-    lines.push(`    ctx.body = ${responseBodyExpr("result.body", bodySchema)};`);
+    lines.push(`    ${framework.response.type("result.contentType")}`);
+    lines.push(...indent(framework.response.send(responseBodyExpr("result.body", bodySchema)), "    "));
+  } else {
+    lines.push(...indent(framework.response.send(void 0), "    "));
   }
   return lines;
 }
 __name(generateSingleStatusResult, "generateSingleStatusResult");
 function generateMultiStatusResult(emitted, className, call, options) {
+  const framework = options.framework;
   const lines = [];
   const members = [];
   const preludes = [];
@@ -1767,21 +1872,23 @@ function generateMultiStatusResult(emitted, className, call, options) {
     bodySchemas.set(resp.statusCode, rendered.bodySchema);
   }
   for (const prelude of preludes) lines.push(`    ${prelude}`);
-  lines.push(`    const service = ctx.container.get(${className});`);
+  lines.push(`    const service = ${framework.resolveService(className)};`);
   lines.push(`    const result:`);
   for (const member of members) lines.push(`        | ${member}`);
   lines.push(`        = ${call};`);
   lines.push("");
-  lines.push(`    ctx.status = result.status;`);
+  lines.push(`    ${framework.response.status("result.status")}`);
   lines.push(`    switch (result.status) {`);
   for (const resp of emitted) {
     lines.push(`        case ${resp.statusCode}:`);
-    lines.push(...headerSetLines(resp.headers ?? [], "            "));
+    lines.push(...headerSetLines(resp.headers ?? [], "            ", framework));
     if (resp.bodies.length > 0) {
-      lines.push(`            ctx.type = result.contentType;`);
-      lines.push(`            ctx.body = ${responseBodyExpr("result.body", bodySchemas.get(resp.statusCode))};`);
+      lines.push(`            ${framework.response.type("result.contentType")}`);
+      lines.push(...indent(framework.response.send(responseBodyExpr("result.body", bodySchemas.get(resp.statusCode))), "            "));
+    } else {
+      lines.push(...indent(framework.response.send(void 0), "            "));
     }
-    lines.push(`            break;`);
+    lines.push(...indent(framework.response.caseEnd(), "            "));
   }
   lines.push(`    }`);
   return lines;
@@ -1848,13 +1955,18 @@ function renderHeadersAnnotation(headers, modelsWithOutput) {
   return `{ ${fields.join("; ")} }`;
 }
 __name(renderHeadersAnnotation, "renderHeadersAnnotation");
-function headerSetLines(headers, indent) {
+function headerSetLines(headers, pad, framework) {
   return headers.map((h) => {
     const accessor = `result.headers[${JSON.stringify(headerNameToProperty(h.name))}]`;
-    return h.optional ? `${indent}if (${accessor} !== undefined) ctx.set('${h.name}', String(${accessor}));` : `${indent}ctx.set('${h.name}', String(${accessor}));`;
+    const write = framework.response.header(h.name, `String(${accessor})`);
+    return h.optional ? `${pad}if (${accessor} !== undefined) ${write}` : `${pad}${write}`;
   });
 }
 __name(headerSetLines, "headerSetLines");
+function indent(lines, pad) {
+  return lines.map((line) => `${pad}${line}`);
+}
+__name(indent, "indent");
 function inferService(op, route, file) {
   if (op.service) {
     const [cls = "", method] = op.service.split(".");
@@ -2014,21 +2126,21 @@ function responseBodyExpr(value, schema) {
   return schema ? `await parseAndValidate(${value}, ${schema}, 500)` : value;
 }
 __name(responseBodyExpr, "responseBodyExpr");
-function generateParamValidation(source, ctxExpr, varName, mode, suffix = "", modelsWithInput) {
+function generateParamValidation(source, kind, sourceExpr, mode, suffix = "", modelsWithInput) {
   if (!source) return [];
   const lines = [];
-  const isQuery = ctxExpr === "ctx.query";
+  const isQuery = kind === "query";
+  const isPathParams = kind === "params";
   if (source.kind === "ref") {
     const typeName = modelsWithInput?.has(source.name) ? `${source.name}Input` : source.name;
-    lines.push(`    const ${varName} = await parseAndValidate(${ctxExpr}, ${typeName}.${mode}());`);
+    lines.push(`    const ${kind} = await parseAndValidate(${sourceExpr}, ${typeName}.${mode}());`);
     lines.push("");
   } else if (source.kind === "params") {
     if (source.nodes.length > 0) {
-      const isPathParams = ctxExpr === "ctx.params";
       const bind = /* @__PURE__ */ __name((name) => isPathParams ? toIdentifier(name) : name, "bind");
-      const lhs = varName === "params" ? `{ ${source.nodes.map((p) => bind(p.name)).join(", ")} }` : varName;
+      const lhs = isPathParams ? `{ ${source.nodes.map((p) => bind(p.name)).join(", ")} }` : kind;
       lines.push(`    const ${lhs} = await parseAndValidate(`);
-      lines.push(`        ${ctxExpr},`);
+      lines.push(`        ${sourceExpr},`);
       lines.push(`        ${modeToWrapper(mode)}({`);
       for (const param of source.nodes) {
         const bound = bind(param.name);
@@ -2042,7 +2154,7 @@ function generateParamValidation(source, ctxExpr, varName, mode, suffix = "", mo
     }
   } else {
     const schema = isQuery ? renderQueryType(source.node, modelsWithInput) : renderInputType(source.node, modelsWithInput);
-    lines.push(`    const ${varName} = await parseAndValidate(${ctxExpr}, (${schema}).${mode}());`);
+    lines.push(`    const ${kind} = await parseAndValidate(${sourceExpr}, (${schema}).${mode}());`);
     lines.push("");
   }
   return lines;
@@ -2896,7 +3008,7 @@ function sdkResponseMembers(resp, modelsWithOutput, includeStatus) {
   ].join("; ")} }`);
 }
 __name(sdkResponseMembers, "sdkResponseMembers");
-function sdkReturnLines(resp, modelsWithOutput, indent, includeStatus, revive, where) {
+function sdkReturnLines(resp, modelsWithOutput, indent2, includeStatus, revive, where) {
   const bodies = resp.bodies;
   const headers = resp.headers ?? [];
   const leading = includeStatus ? [
@@ -2907,7 +3019,7 @@ function sdkReturnLines(resp, modelsWithOutput, indent, includeStatus, revive, w
   ] : [];
   if (bodies.length === 0) {
     return [
-      `${indent}return { ${[
+      `${indent2}return { ${[
         ...leading,
         ...trailing
       ].join(", ")} };`
@@ -2921,7 +3033,7 @@ function sdkReturnLines(resp, modelsWithOutput, indent, includeStatus, revive, w
       ...trailing
     ];
     return [
-      `${indent}return { ${fields.join(", ")} };`
+      `${indent2}return { ${fields.join(", ")} };`
     ];
   }
   const dataTypes = bodies.map((b) => sdkDataType(b, modelsWithOutput));
@@ -2934,11 +3046,11 @@ function sdkReturnLines(resp, modelsWithOutput, indent, includeStatus, revive, w
       ...trailing
     ];
     return [
-      `${indent}return { ${fields.join(", ")} };`
+      `${indent2}return { ${fields.join(", ")} };`
     ];
   }
   const lines = [
-    `${indent}switch (readContentType(result)) {`
+    `${indent2}switch (readContentType(result)) {`
   ];
   for (const [i, body] of bodies.slice(1).entries()) {
     const fields = [
@@ -2947,8 +3059,8 @@ function sdkReturnLines(resp, modelsWithOutput, indent, includeStatus, revive, w
       `data: ${sdkReadExpr(body, modelsWithOutput, hint(revive, `${resp.statusCode}_${i + 1}`))}`,
       ...trailing
     ];
-    lines.push(`${indent}    case '${body.contentType}':`);
-    lines.push(`${indent}        return { ${fields.join(", ")} };`);
+    lines.push(`${indent2}    case '${body.contentType}':`);
+    lines.push(`${indent2}        return { ${fields.join(", ")} };`);
   }
   const first = bodies[0];
   const fallbackFields = [
@@ -2957,9 +3069,9 @@ function sdkReturnLines(resp, modelsWithOutput, indent, includeStatus, revive, w
     `data: ${sdkReadExpr(first, modelsWithOutput, hint(revive, `${resp.statusCode}_0`))}`,
     ...trailing
   ];
-  lines.push(`${indent}    default:`);
-  lines.push(`${indent}        return { ${fallbackFields.join(", ")} };`);
-  lines.push(`${indent}}`);
+  lines.push(`${indent2}    default:`);
+  lines.push(`${indent2}        return { ${fallbackFields.join(", ")} };`);
+  lines.push(`${indent2}}`);
   return lines;
 }
 __name(sdkReturnLines, "sdkReturnLines");
@@ -4103,6 +4215,24 @@ function renderOutputField(field, outputCase, modelsWithOutput, target) {
 }
 __name(renderOutputField, "renderOutputField");
 
+// src/server-framework.ts
+var SERVER_FRAMEWORK_NAMES = [
+  "koa"
+];
+var DEFAULT_SERVER_FRAMEWORK_NAME = "koa";
+var SERVER_FRAMEWORKS = {
+  koa: KOA_SERVER_FRAMEWORK
+};
+function resolveServerFramework(name) {
+  const resolved = name ?? DEFAULT_SERVER_FRAMEWORK_NAME;
+  const framework = SERVER_FRAMEWORKS[resolved];
+  if (!framework) {
+    throw new Error(`plugin-typescript: server.framework '${resolved}' is not supported \u2014 expected one of: ${SERVER_FRAMEWORK_NAMES.join(", ")}.`);
+  }
+  return framework;
+}
+__name(resolveServerFramework, "resolveServerFramework");
+
 // src/codegen-mcp.ts
 import { resolveModifiers as resolveModifiers3, emittedResponses as emittedResponses2, toIdentifier as toIdentifier3 } from "@contractkit/core";
 import { basename as basename3, dirname as dirname5, relative as relative5 } from "path";
@@ -4415,7 +4545,8 @@ function renderToolClass(plan, file, options) {
   const callArgs = buildArgs(route, op);
   const isVoid = !primaryResponseBody(op);
   const structured = !!outExpr;
-  lines.push("    async handle(args: Record<string, unknown>, _context: McpToolContext): Promise<CallToolResult> {");
+  const argsParam = destructure.length > 0 ? "args" : "_args";
+  lines.push(`    async handle(${argsParam}: Record<string, unknown>, _context: McpToolContext): Promise<CallToolResult> {`);
   if (destructure.length > 0) {
     lines.push(`        const { ${destructure.join(", ")} } = await parseAndValidate(args, ${argsConstName});`);
   }
@@ -4503,40 +4634,29 @@ function generateMcpAggregator(entries) {
   lines.push(`import { McpToolHandlerMap } from '@maroonedsoftware/mcp';`);
   for (const e of sorted) lines.push(`import { ${e.registerFn} } from '${e.importPath}';`);
   lines.push("");
-  lines.push("/** Build + register the MCP tool catalog. Call once at startup. */");
+  lines.push("/**");
+  lines.push(" * Build the MCP tool catalog.");
+  lines.push(" *");
+  lines.push(" * Bind it to the `McpToolHandlerMap` token from a factory, which is what supplies the");
+  lines.push(" * `Container` needed to resolve each handler:");
+  lines.push(" *");
+  lines.push(" * ```ts");
+  lines.push(" * registry.register(McpToolHandlerMap).useFactory(registerMcpTools).asSingleton();");
+  lines.push(" * ```");
+  lines.push(" */");
   lines.push("export function registerMcpTools(container: Container): McpToolHandlerMap {");
   lines.push("    const map = new McpToolHandlerMap();");
   for (const e of sorted) lines.push(`    ${e.registerFn}(map, container);`);
-  lines.push("    container.register(McpToolHandlerMap, { useValue: map });");
   lines.push("    return map;");
   lines.push("}");
   return lines.join("\n") + "\n";
 }
 __name(generateMcpAggregator, "generateMcpAggregator");
 function generateMcpRouter(options = {}) {
-  const path = options.path ?? "/mcp";
-  return `import { ServerKitRouter, bodyParserMiddleware, requireSignature } from '@maroonedsoftware/koa';
-import { McpDispatcher, createMcpRequestContext, MCP_AUTH_POLICY } from '@maroonedsoftware/mcp';
-
-/** Mount the MCP endpoint onto a ServerKit router. Call \`registerMcpTools(container)\` at startup. */
-export function mountMcp(router: ReturnType<typeof ServerKitRouter>): void {
-    router.post('${path}', bodyParserMiddleware(['json']), requireSignature('mcp', { policy: MCP_AUTH_POLICY }), async (ctx) => {
-        const dispatcher = ctx.container.get(McpDispatcher);
-        const context = createMcpRequestContext({ requestId: ctx.requestId, logger: ctx.logger });
-        if (dispatcher.sessionMode === 'stateful') {
-            ctx.respond = false;
-            await dispatcher.dispatchStateful(
-                { req: ctx.req, res: ctx.res, body: ctx.parsedBody, sessionId: ctx.get('mcp-session-id') },
-                context,
-            );
-        } else {
-            const response = await dispatcher.dispatch(JSON.parse(String(ctx.rawBody)), context);
-            if (response) ctx.body = response;
-            else ctx.status = 202; // a notification \u2014 nothing to return
-        }
-    });
-}
-`;
+  const framework = options.framework ?? KOA_SERVER_FRAMEWORK;
+  return framework.mcpRouter({
+    path: options.path ?? "/mcp"
+  });
 }
 __name(generateMcpRouter, "generateMcpRouter");
 
@@ -4770,6 +4890,10 @@ function createTypescriptPlugin(config, rootDir) {
 }
 __name(createTypescriptPlugin, "createTypescriptPlugin");
 function assertValidConfig(config) {
+  const framework = config.server?.framework;
+  if (framework !== void 0 && !SERVER_FRAMEWORK_NAMES.includes(framework)) {
+    throw new Error(`plugin-typescript: server.framework '${String(framework)}' is not supported \u2014 expected one of: ${SERVER_FRAMEWORK_NAMES.join(", ")}.`);
+  }
   if (config.server?.validateResponses && !config.server.zod) {
     throw new Error("plugin-typescript: server.validateResponses requires server.zod: true \u2014 without it output.types emits plain TypeScript interfaces, which are types with no runtime schema value for the router to validate against.");
   }
@@ -4899,6 +5023,7 @@ function sliceModelSet(refs, ownNames, set) {
 __name(sliceModelSet, "sliceModelSet");
 function collectServerOutput(config, rootDir, inputs, units) {
   const serverBase = resolve2(rootDir, config.baseDir ?? ".");
+  const framework = resolveServerFramework(config.framework);
   const modelsWithInput = inputs.modelsWithInput;
   const modelsWithOutput = inputs.modelsWithOutput;
   const modelsWithTransform = computeModelsWithCaseTransform(inputs.contractRoots.flatMap((r) => r.models));
@@ -4947,7 +5072,7 @@ function collectServerOutput(config, rootDir, inputs, units) {
           currentOutPath: typeOutPath,
           modelsWithInput,
           modelsWithOutput,
-          // These types are consumed by Koa handlers, so `binary` is a Buffer, not a Blob.
+          // These types are consumed by server handlers, so `binary` is a Buffer, not a Blob.
           target: "server"
         };
         const content = config.zod ? generateContract(ast, renderCtx) : generatePlainTypes(ast, renderCtx);
@@ -4978,6 +5103,9 @@ function collectServerOutput(config, rootDir, inputs, units) {
       // this router's output with no change to `root` or the config.
       modelsWithTransform: sliceModelSet(refs, /* @__PURE__ */ new Set(), modelsWithTransform),
       validateResponses: config.validateResponses ?? false,
+      // Covered by `sub` already, which is the whole sub-config; explicit for the same reason
+      // `validateResponses` is — the inputs that change a router's text read at a glance.
+      framework: framework.name,
       sub: subConfigKey
     });
     units.push({
@@ -4994,7 +5122,8 @@ function collectServerOutput(config, rootDir, inputs, units) {
             modelsWithOutput,
             modelsWithTransform,
             includeInternal: config.includeInternal,
-            validateResponses: config.validateResponses
+            validateResponses: config.validateResponses,
+            framework
           })
         }
       ], "render")
@@ -5616,10 +5745,12 @@ function collectMcpOutput(config, fullConfig, rootDir, inputs, units, globalFile
   });
   if (config.emitRouter !== false) {
     const routerPath = join2(mcpBase, config.output?.router ?? "mcp.router.ts");
+    const framework = resolveServerFramework(fullConfig.server?.framework);
     globalFiles.push({
       relativePath: routerPath,
       content: generateMcpRouter({
-        path: config.path
+        path: config.path,
+        framework
       })
     });
   }
@@ -5677,8 +5808,13 @@ function stableSubConfig(config) {
 }
 __name(stableSubConfig, "stableSubConfig");
 export {
+  DEFAULT_SERVER_FRAMEWORK_NAME,
+  KOA_SERVER_FRAMEWORK,
+  SERVER_FRAMEWORKS,
+  SERVER_FRAMEWORK_NAMES,
   TYPESCRIPT_CODEGEN_VERSION,
   createTypescriptPlugin,
-  index_default as default
+  index_default as default,
+  resolveServerFramework
 };
 //# sourceMappingURL=index.js.map