@kubb/plugin-mcp 5.0.0-beta.4 → 5.0.0-beta.56

package/dist/index.cjs

@@ -47,36 +47,45 @@ let _kubb_plugin_client_templates_config_source = require("@kubb/plugin-client/t
 function toCamelOrPascal(text, pascal) {
 	return text.trim().replace(/([a-z\d])([A-Z])/g, "$1 $2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").replace(/(\d)([a-z])/g, "$1 $2").split(/[\s\-_./\\:]+/).filter(Boolean).map((word, i) => {
 		if (word.length > 1 && word === word.toUpperCase()) return word;
-		if (i === 0 && !pascal) return word.charAt(0).toLowerCase() + word.slice(1);
-		return word.charAt(0).toUpperCase() + word.slice(1);
+		return (i === 0 && !pascal ? word.charAt(0).toLowerCase() : word.charAt(0).toUpperCase()) + word.slice(1);
 	}).join("").replace(/[^a-zA-Z0-9]/g, "");
 }
 /**
-* Splits `text` on `.` and applies `transformPart` to each segment.
-* The last segment receives `isLast = true`, all earlier segments receive `false`.
-* Segments are joined with `/` to form a file path.
+* Converts `text` to camelCase.
+*
+* @example Word boundaries
+* `camelCase('hello-world') // 'helloWorld'`
 *
-* Only splits on dots followed by a letter so that version numbers
-* embedded in operationIds (e.g. `v2025.0`) are kept intact.
+* @example With a prefix
+* `camelCase('tag', { prefix: 'create' }) // 'createTag'`
 */
-function applyToFileParts(text, transformPart) {
-	const parts = text.split(/\.(?=[a-zA-Z])/);
-	return parts.map((part, i) => transformPart(part, i === parts.length - 1)).join("/");
+function camelCase(text, { prefix = "", suffix = "" } = {}) {
+	return toCamelOrPascal(`${prefix} ${text} ${suffix}`, false);
 }
+//#endregion
+//#region ../../internals/utils/src/fs.ts
 /**
-* Converts `text` to camelCase.
-* When `isFile` is `true`, dot-separated segments are each cased independently and joined with `/`.
+* Builds a nested file path from a dotted name. Splits on dots that precede a letter
+* (so version numbers embedded in operationIds like `v2025.0` stay intact), camelCases
+* every earlier segment, applies `caseLast` to the final segment, and joins with `/`.
 *
-* @example
-* camelCase('hello-world')                   // 'helloWorld'
-* camelCase('pet.petId', { isFile: true })   // 'pet/petId'
+* Empty segments are dropped before joining. They arise when the name starts with a dot
+* followed by a letter (e.g. `..Schema` splits into `['..', 'Schema']` and `'..'` cases to
+* an empty string). Without this a leading `/` would form, which `path.resolve` reads as an
+* absolute path, letting generated files escape the configured output directory.
+*
+* @example Nested path from a dotted name
+* `toFilePath('pet.petId') // 'pet/petId'`
+*
+* @example PascalCase the final segment
+* `toFilePath('pet.Pet', pascalCase) // 'pet/Pet'`
+*
+* @example Suffix applied to the final segment only
+* `toFilePath('tag.tag', (part) => camelCase(part, { suffix: 'schema' })) // 'tag/tagSchema'`
 */
-function camelCase(text, { isFile, prefix = "", suffix = "" } = {}) {
-	if (isFile) return applyToFileParts(text, (part, isLast) => camelCase(part, isLast ? {
-		prefix,
-		suffix
-	} : {}));
-	return toCamelOrPascal(`${prefix} ${text} ${suffix}`, false);
+function toFilePath(name, caseLast = camelCase) {
+	const parts = name.split(/\.(?=[a-zA-Z])/);
+	return parts.map((part, i) => i === parts.length - 1 ? caseLast(part) : camelCase(part)).filter(Boolean).join("/");
 }
 //#endregion
 //#region ../../internals/utils/src/reserved.ts
@@ -182,99 +191,80 @@ function isValidVarName(name) {
 	return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name);
 }
 //#endregion
-//#region ../../internals/utils/src/urlPath.ts
+//#region ../../internals/utils/src/url.ts
+function transformParam(raw, casing) {
+	const param = isValidVarName(raw) ? raw : camelCase(raw);
+	return casing === "camelcase" ? camelCase(param) : param;
+}
+function toParamsObject(path, { replacer, casing } = {}) {
+	const params = {};
+	for (const match of path.matchAll(/\{([^}]+)\}/g)) {
+		const param = transformParam(match[1], casing);
+		const key = replacer ? replacer(param) : param;
+		params[key] = key;
+	}
+	return Object.keys(params).length > 0 ? params : null;
+}
 /**
-* Parses and transforms an OpenAPI/Swagger path string into various URL formats.
-*
-* @example
-* const p = new URLPath('/pet/{petId}')
-* p.URL      // '/pet/:petId'
-* p.template // '`/pet/${petId}`'
+* Helpers for OpenAPI/Swagger paths, plus a thin wrapper over the native `URL`.
 */
-var URLPath = class {
+var Url = class Url {
 	/**
-	* The raw OpenAPI/Swagger path string, e.g. `/pet/{petId}`.
-	*/
-	path;
-	#options;
-	constructor(path, options = {}) {
-		this.path = path;
-		this.#options = options;
-	}
-	/** Converts the OpenAPI path to Express-style colon syntax, e.g. `/pet/{petId}` → `/pet/:petId`.
+	* Reports whether `url` is a parseable absolute URL. Delegates to the native `URL.canParse`.
 	*
 	* @example
-	* ```ts
-	* new URLPath('/pet/{petId}').URL // '/pet/:petId'
-	* ```
+	* Url.canParse('https://petstore.swagger.io/v2') // true
+	* Url.canParse('/pet/{petId}')                   // false
 	*/
-	get URL() {
-		return this.toURLPath();
+	static canParse(url, base) {
+		return URL.canParse(url, base);
 	}
-	/** Returns `true` when `path` is a fully-qualified URL (e.g. starts with `https://`).
+	/**
+	* Converts an OpenAPI/Swagger path to Express-style colon syntax.
 	*
 	* @example
-	* ```ts
-	* new URLPath('https://petstore.swagger.io/v2/pet').isURL // true
-	* new URLPath('/pet/{petId}').isURL                       // false
-	* ```
+	* Url.toPath('/pet/{petId}') // '/pet/:petId'
 	*/
-	get isURL() {
-		try {
-			return !!new URL(this.path).href;
-		} catch {
-			return false;
-		}
+	static toPath(path) {
+		return path.replace(/\{([^}]+)\}/g, ":$1");
 	}
 	/**
-	* Converts the OpenAPI path to a TypeScript template literal string.
+	* Converts an OpenAPI/Swagger path to a TypeScript template literal string.
+	* `prefix` is prepended inside the literal, `replacer` transforms each parameter name,
+	* and `casing` controls parameter identifier casing.
 	*
 	* @example
-	* new URLPath('/pet/{petId}').template              // '`/pet/${petId}`'
-	* new URLPath('/account/monetary-accountID').template // '`/account/${monetaryAccountId}`'
-	*/
-	get template() {
-		return this.toTemplateString();
-	}
-	/** Returns the path and its extracted params as a structured `URLObject`, or as a stringified expression when `stringify` is set.
+	* Url.toTemplateString('/pet/{petId}') // '`/pet/${petId}`'
 	*
 	* @example
-	* ```ts
-	* new URLPath('/pet/{petId}').object
-	* // { url: '/pet/:petId', params: { petId: 'petId' } }
-	* ```
+	* Url.toTemplateString('/pet/{petId}', { prefix: 'https://api' }) // '`https://api/pet/${petId}`'
 	*/
-	get object() {
-		return this.toObject();
+	static toTemplateString(path, { prefix, replacer, casing } = {}) {
+		const result = path.split(/\{([^}]+)\}/).map((part, i) => {
+			if (i % 2 === 0) return part;
+			const param = transformParam(part, casing);
+			return `\${${replacer ? replacer(param) : param}}`;
+		}).join("");
+		return `\`${prefix ?? ""}${result}\``;
 	}
-	/** Returns a map of path parameter names, or `undefined` when the path has no parameters.
+	/**
+	* Returns the path and its extracted params as a structured `URLObject`, or as a stringified
+	* expression when `stringify` is set.
 	*
 	* @example
-	* ```ts
-	* new URLPath('/pet/{petId}').params // { petId: 'petId' }
-	* new URLPath('/pet').params         // undefined
-	* ```
-	*/
-	get params() {
-		return this.getParams();
-	}
-	#transformParam(raw) {
-		const param = isValidVarName(raw) ? raw : camelCase(raw);
-		return this.#options.casing === "camelcase" ? camelCase(param) : param;
-	}
-	/**
-	* Iterates over every `{param}` token in `path`, calling `fn` with the raw token and transformed name.
+	* Url.toObject('/pet/{petId}')
+	* // { url: '/pet/:petId', params: { petId: 'petId' } }
 	*/
-	#eachParam(fn) {
-		for (const match of this.path.matchAll(/\{([^}]+)\}/g)) {
-			const raw = match[1];
-			fn(raw, this.#transformParam(raw));
-		}
-	}
-	toObject({ type = "path", replacer, stringify } = {}) {
+	static toObject(path, { type = "path", replacer, stringify, casing } = {}) {
 		const object = {
-			url: type === "path" ? this.toURLPath() : this.toTemplateString({ replacer }),
-			params: this.getParams()
+			url: type === "path" ? Url.toPath(path) : Url.toTemplateString(path, {
+				replacer,
+				casing
+			}),
+			params: toParamsObject(path, {
+				replacer,
+				casing
+			})
 		};
 		if (stringify) {
 			if (type === "template") return JSON.stringify(object).replaceAll("'", "").replaceAll(`"`, "");
@@ -283,127 +273,144 @@ var URLPath = class {
 		}
 		return object;
 	}
-	/**
-	* Converts the OpenAPI path to a TypeScript template literal string.
-	* An optional `replacer` can transform each extracted parameter name before interpolation.
-	*
-	* @example
-	* new URLPath('/pet/{petId}').toTemplateString() // '`/pet/${petId}`'
-	*/
-	toTemplateString({ prefix = "", replacer } = {}) {
-		return `\`${prefix}${this.path.split(/\{([^}]+)\}/).map((part, i) => {
-			if (i % 2 === 0) return part;
-			const param = this.#transformParam(part);
-			return `\${${replacer ? replacer(param) : param}}`;
-		}).join("")}\``;
-	}
-	/**
-	* Extracts all `{param}` segments from the path and returns them as a key-value map.
-	* An optional `replacer` transforms each parameter name in both key and value positions.
-	* Returns `undefined` when no path parameters are found.
-	*
-	* @example
-	* ```ts
-	* new URLPath('/pet/{petId}/tag/{tagId}').getParams()
-	* // { petId: 'petId', tagId: 'tagId' }
-	* ```
-	*/
-	getParams(replacer) {
-		const params = {};
-		this.#eachParam((_raw, param) => {
-			const key = replacer ? replacer(param) : param;
-			params[key] = key;
-		});
-		return Object.keys(params).length > 0 ? params : void 0;
-	}
-	/** Converts the OpenAPI path to Express-style colon syntax.
-	*
-	* @example
-	* ```ts
-	* new URLPath('/pet/{petId}').toURLPath() // '/pet/:petId'
-	* ```
-	*/
-	toURLPath() {
-		return this.path.replace(/\{([^}]+)\}/g, ":$1");
-	}
 };
 //#endregion
-//#region src/utils.ts
-/**
-* Find the first 2xx response status code from an operation's responses.
-*/
-function findSuccessStatusCode(responses) {
-	for (const res of responses) {
-		const code = Number(res.statusCode);
-		if (code >= 200 && code < 300) return res.statusCode;
-	}
+//#region ../../internals/shared/src/operation.ts
+function getOperationLink(node, link) {
+	if (!link) return null;
+	if (typeof link === "function") return link(node) ?? null;
+	if (link === "urlPath") return node.path ? `{@link ${Url.toPath(node.path)}}` : null;
+	return node.path ? `{@link ${node.path.replaceAll("{", ":").replaceAll("}", "")}}` : null;
 }
-/**
-* Render a group param value — compose individual schemas into `z.object({ ... })`,
-* or use a schema name string directly.
-*/
-function zodGroupExpr(entry) {
-	if (typeof entry === "string") return entry;
-	return `z.object({ ${entry.map((p) => `${JSON.stringify(p.name)}: ${p.schemaName}`).join(", ")} })`;
-}
-/**
-* Build JSDoc comment lines from an OperationNode.
-*/
-function getComments(node) {
-	return [
+function buildOperationComments(node, options = {}) {
+	const { link = "pathTemplate", linkPosition = "afterDeprecated", splitLines = false } = options;
+	const linkComment = getOperationLink(node, link);
+	const filteredComments = (linkPosition === "beforeDeprecated" ? [
+		node.description && `@description ${node.description}`,
+		node.summary && `@summary ${node.summary}`,
+		linkComment,
+		node.deprecated && "@deprecated"
+	] : [
 		node.description && `@description ${node.description}`,
 		node.summary && `@summary ${node.summary}`,
 		node.deprecated && "@deprecated",
-		`{@link ${node.path.replaceAll("{", ":").replaceAll("}", "")}}`
-	].filter((x) => Boolean(x));
+		linkComment
+	]).filter((comment) => Boolean(comment));
+	if (!splitLines) return filteredComments;
+	return filteredComments.flatMap((text) => text.split(/\r?\n/).map((line) => line.trim())).filter((comment) => Boolean(comment));
 }
-/**
-* Build a mapping of original param names → camelCase names.
-* Returns `undefined` when no names actually change (no remapping needed).
-*/
-function getParamsMapping(params) {
-	if (!params.length) return;
-	const mapping = {};
-	let hasDifference = false;
-	for (const p of params) {
-		const camelName = camelCase(p.name);
-		mapping[p.name] = camelName;
-		if (p.name !== camelName) hasDifference = true;
+function getOperationParameters(node, options = {}) {
+	const params = _kubb_core.ast.caseParams(node.parameters, options.paramsCasing);
+	return {
+		path: params.filter((param) => param.in === "path"),
+		query: params.filter((param) => param.in === "query"),
+		header: params.filter((param) => param.in === "header"),
+		cookie: params.filter((param) => param.in === "cookie")
+	};
+}
+function getStatusCodeNumber(statusCode) {
+	const code = Number(statusCode);
+	return Number.isNaN(code) ? null : code;
+}
+function isSuccessStatusCode(statusCode) {
+	const code = getStatusCodeNumber(statusCode);
+	return code !== null && code >= 200 && code < 300;
+}
+function isErrorStatusCode(statusCode) {
+	const code = getStatusCodeNumber(statusCode);
+	return code !== null && code >= 400;
+}
+function resolveErrorNames(node, resolver) {
+	return node.responses.filter((response) => isErrorStatusCode(response.statusCode)).map((response) => resolver.resolveResponseStatusName(node, response.statusCode));
+}
+function resolveStatusCodeNames(node, resolver) {
+	return node.responses.map((response) => resolver.resolveResponseStatusName(node, response.statusCode));
+}
+const typeNamesByResolver = /* @__PURE__ */ new WeakMap();
+function resolveOperationTypeNames(node, resolver, options = {}) {
+	const cacheKey = `${node.operationId}\0${options.paramsCasing ?? ""}\0${options.order ?? ""}\0${options.responseStatusNames ?? ""}\0${(options.exclude ?? []).join(",")}`;
+	let byResolver = typeNamesByResolver.get(resolver);
+	if (byResolver) {
+		const cached = byResolver.get(cacheKey);
+		if (cached) return cached;
+	} else {
+		byResolver = /* @__PURE__ */ new Map();
+		typeNamesByResolver.set(resolver, byResolver);
 	}
-	return hasDifference ? mapping : void 0;
+	const { path, query, header } = getOperationParameters(node, { paramsCasing: options.paramsCasing });
+	const responseStatusNames = options.responseStatusNames === "error" ? resolveErrorNames(node, resolver) : options.responseStatusNames === false ? [] : resolveStatusCodeNames(node, resolver);
+	const exclude = new Set(options.exclude ?? []);
+	const paramNames = [
+		...path.map((param) => resolver.resolvePathParamsName(node, param)),
+		...query.map((param) => resolver.resolveQueryParamsName(node, param)),
+		...header.map((param) => resolver.resolveHeaderParamsName(node, param))
+	];
+	const bodyAndResponseNames = [node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : null, resolver.resolveResponseName(node)];
+	const result = (options.order === "body-response-first" ? [
+		...bodyAndResponseNames,
+		...paramNames,
+		...responseStatusNames
+	] : [
+		...paramNames,
+		...bodyAndResponseNames,
+		...responseStatusNames
+	]).filter((name) => Boolean(name) && !exclude.has(name));
+	byResolver.set(cacheKey, result);
+	return result;
+}
+function findSuccessStatusCode(responses) {
+	for (const response of responses) if (isSuccessStatusCode(response.statusCode)) return response.statusCode;
+	return null;
 }
+//#endregion
+//#region ../../internals/shared/src/group.ts
 /**
-* Convert a SchemaNode type to an inline Zod expression string.
-* Used as fallback when no named zod schema is available for a path parameter.
+* Builds the `group` config a Kubb plugin passes to `ctx.setOptions`, applying the
+* shared default naming so every plugin groups output consistently:
+*
+* - `path` groups use the second path segment (`/pet/findByStatus` → `pet`).
+* - other groups use the camelCased group (`pet store` → `petStore`).
+*
+* A user-provided `group.name` always wins over the default namer, so callers stay in
+* control of their output folders. Returns `null` when grouping is disabled, matching the
+* per-plugin convention.
+*
+* @param group - The user-supplied group option, or `undefined` to disable grouping.
+*
+* @example
+* ```ts
+* createGroupConfig(group) // shared across every plugin
+* ```
 */
-function zodExprFromSchemaNode(schema) {
-	let expr;
-	switch (schema.type) {
-		case "enum": {
-			const rawValues = schema.namedEnumValues?.length ? schema.namedEnumValues.map((v) => v.value) : (schema.enumValues ?? []).filter((v) => v !== null);
-			if (rawValues.length > 0 && rawValues.every((v) => typeof v === "string")) expr = `z.enum([${rawValues.map((v) => JSON.stringify(v)).join(", ")}])`;
-			else if (rawValues.length > 0) {
-				const literals = rawValues.map((v) => `z.literal(${JSON.stringify(v)})`);
-				expr = literals.length === 1 ? literals[0] : `z.union([${literals.join(", ")}])`;
-			} else expr = "z.string()";
-			break;
-		}
-		case "integer":
-			expr = "z.coerce.number()";
-			break;
-		case "number":
-			expr = "z.number()";
-			break;
-		case "boolean":
-			expr = "z.boolean()";
-			break;
-		case "array":
-			expr = "z.array(z.unknown())";
-			break;
-		default: expr = "z.string()";
-	}
-	if (schema.nullable) expr = `${expr}.nullable()`;
-	return expr;
+function createGroupConfig(group) {
+	if (!group) return null;
+	const defaultName = (ctx) => {
+		if (group.type === "path") return `${ctx.group.split("/")[1]}`;
+		return camelCase(ctx.group);
+	};
+	return {
+		...group,
+		name: group.name ? group.name : defaultName
+	};
+}
+//#endregion
+//#region ../../internals/shared/src/params.ts
+function buildParamsMapping(originalParams, mappedParams) {
+	const mapping = {};
+	let hasChanged = false;
+	originalParams.forEach((param, i) => {
+		const mappedName = mappedParams[i]?.name ?? param.name;
+		mapping[param.name] = mappedName;
+		if (param.name !== mappedName) hasChanged = true;
+	});
+	return hasChanged ? mapping : null;
+}
+function buildTransformedParamsMapping(params, transformName) {
+	if (!params.length) return null;
+	return buildParamsMapping(params, params.map((param) => ({
+		...param,
+		name: transformName(param.name)
+	})));
 }
 //#endregion
 //#region src/components/McpHandler.tsx
@@ -415,16 +422,12 @@ function buildRemappingCode(mapping, varName, sourceName) {
 }
 const declarationPrinter = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 function McpHandler({ name, node, resolver, baseURL, dataReturnType, paramsCasing }) {
-	const urlPath = new URLPath(node.path);
+	if (!_kubb_core.ast.isHttpOperationNode(node)) return null;
 	const contentType = node.requestBody?.content?.[0]?.contentType;
 	const isFormData = contentType === "multipart/form-data";
-	const casedParams = _kubb_core.ast.caseParams(node.parameters, paramsCasing);
-	const queryParams = casedParams.filter((p) => p.in === "query");
-	const headerParams = casedParams.filter((p) => p.in === "header");
-	const originalPathParams = node.parameters.filter((p) => p.in === "path");
-	const originalQueryParams = node.parameters.filter((p) => p.in === "query");
-	const originalHeaderParams = node.parameters.filter((p) => p.in === "header");
-	const requestName = node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : void 0;
+	const { query: queryParams, header: headerParams } = getOperationParameters(node, { paramsCasing });
+	const { path: originalPathParams, query: originalQueryParams, header: originalHeaderParams } = getOperationParameters(node);
+	const requestName = node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : null;
 	const responseName = resolver.resolveResponseName(node);
 	const errorResponses = node.responses.filter((r) => Number(r.statusCode) >= 400).map((r) => resolver.resolveResponseStatusName(node, r.statusCode));
 	const generics = [
@@ -440,35 +443,27 @@ function McpHandler({ name, node, resolver, baseURL, dataReturnType, paramsCasin
 	});
 	const baseParamsSignature = declarationPrinter.print(paramsNode) ?? "";
 	const paramsSignature = baseParamsSignature ? `${baseParamsSignature}, request: RequestHandlerExtra<ServerRequest, ServerNotification>` : "request: RequestHandlerExtra<ServerRequest, ServerNotification>";
-	const pathParamsMapping = paramsCasing ? getParamsMapping(originalPathParams) : void 0;
-	const queryParamsMapping = paramsCasing ? getParamsMapping(originalQueryParams) : void 0;
-	const headerParamsMapping = paramsCasing ? getParamsMapping(originalHeaderParams) : void 0;
-	const contentTypeHeader = contentType && contentType !== "application/json" && contentType !== "multipart/form-data" ? `'Content-Type': '${contentType}'` : void 0;
-	const headers = [headerParams.length ? headerParamsMapping ? "...mappedHeaders" : "...headers" : void 0, contentTypeHeader].filter(Boolean);
+	const pathParamsMapping = paramsCasing ? buildTransformedParamsMapping(originalPathParams, camelCase) : null;
+	const queryParamsMapping = paramsCasing ? buildTransformedParamsMapping(originalQueryParams, camelCase) : null;
+	const headerParamsMapping = paramsCasing ? buildTransformedParamsMapping(originalHeaderParams, camelCase) : null;
+	const contentTypeHeader = contentType && contentType !== "application/json" && contentType !== "multipart/form-data" ? `'Content-Type': '${contentType}'` : null;
+	const headers = [headerParams.length ? headerParamsMapping ? "...mappedHeaders" : "...headers" : null, contentTypeHeader].filter(Boolean);
 	const fetchConfig = [];
 	fetchConfig.push(`method: ${JSON.stringify(node.method.toUpperCase())}`);
-	fetchConfig.push(`url: ${urlPath.template}`);
+	fetchConfig.push(`url: ${Url.toTemplateString(node.path)}`);
 	if (baseURL) fetchConfig.push(`baseURL: \`${baseURL}\``);
 	if (queryParams.length) fetchConfig.push(queryParamsMapping ? "params: mappedParams" : "params");
 	if (requestName) fetchConfig.push(`data: ${isFormData ? "formData as FormData" : "requestData"}`);
 	if (headers.length) fetchConfig.push(`headers: { ${headers.join(", ")} }`);
-	const callToolResult = dataReturnType === "data" ? `return {
-            content: [
-              {
-                type: 'text',
-                text: JSON.stringify(res.data)
-              }
-            ],
-            structuredContent: { data: res.data }
-           }` : `return {
-            content: [
-              {
-                type: 'text',
-                text: JSON.stringify(res)
-              }
-            ],
-            structuredContent: { data: res.data }
-           }`;
+	const callToolResult = `return {
+  content: [
+    {
+      type: 'text',
+      text: JSON.stringify(${dataReturnType === "data" ? "res.data" : "res"})
+    }
+  ],
+  structuredContent: { data: res.data }
+}`;
 	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
 		name,
 		isExportable: true,
@@ -478,7 +473,7 @@ function McpHandler({ name, node, resolver, baseURL, dataReturnType, paramsCasin
 			async: true,
 			export: true,
 			params: paramsSignature,
-			JSDoc: { comments: getComments(node) },
+			JSDoc: { comments: buildOperationComments(node) },
 			returnType: "Promise<CallToolResult>",
 			children: [
 				"",
@@ -500,7 +495,7 @@ function McpHandler({ name, node, resolver, baseURL, dataReturnType, paramsCasin
 				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)("br", {}),
 				isFormData && requestName && "const formData = buildFormData(requestData)",
 				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)("br", {}),
-				`const res = await fetch<${generics.join(", ")}>({ ${fetchConfig.join(", ")} }, request)`,
+				`const res = await client<${generics.join(", ")}>({ ${fetchConfig.join(", ")} }, request)`,
 				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)("br", {}),
 				callToolResult
 			]
@@ -508,62 +503,80 @@ function McpHandler({ name, node, resolver, baseURL, dataReturnType, paramsCasin
 	});
 }
 //#endregion
+//#region src/utils.ts
+/**
+* Render a group param value — compose individual schemas into `z.object({ ... })`,
+* or use a schema name string directly.
+*/
+function zodGroupExpr(entry) {
+	if (typeof entry === "string") return entry;
+	return `z.object({ ${entry.map((p) => `${JSON.stringify(p.name)}: ${p.schemaName}`).join(", ")} })`;
+}
+/**
+* Convert a SchemaNode type to an inline Zod expression string.
+* Used as fallback when no named zod schema is available for a path parameter.
+*/
+function zodExprFromSchemaNode(schema) {
+	const baseExpr = (() => {
+		if (schema.type === "enum") {
+			const rawValues = schema.namedEnumValues?.length ? schema.namedEnumValues.map((v) => v.value) : (schema.enumValues ?? []).filter((v) => v !== null);
+			if (rawValues.length > 0 && rawValues.every((v) => typeof v === "string")) return `z.enum([${rawValues.map((v) => JSON.stringify(v)).join(", ")}])`;
+			if (rawValues.length > 0) {
+				const literals = rawValues.map((v) => `z.literal(${JSON.stringify(v)})`);
+				return literals.length === 1 ? literals[0] : `z.union([${literals.join(", ")}])`;
+			}
+			return "z.string()";
+		}
+		if (schema.type === "integer") return "z.coerce.number()";
+		if (schema.type === "number") return "z.number()";
+		if (schema.type === "boolean") return "z.boolean()";
+		if (schema.type === "array") return "z.array(z.unknown())";
+		return "z.string()";
+	})();
+	return schema.nullable ? `${baseExpr}.nullable()` : baseExpr;
+}
+//#endregion
 //#region src/components/Server.tsx
 const keysPrinter = (0, _kubb_plugin_ts.functionPrinter)({ mode: "keys" });
 function Server({ name, serverName, serverVersion, paramsCasing, operations }) {
-	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File.Source, {
-		name,
-		isExportable: true,
-		isIndexable: true,
-		children: [
-			/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Const, {
-				name: "server",
-				export: true,
-				children: `
-          new McpServer({
-  name: '${serverName}',
-  version: '${serverVersion}',
-})
-          `
-			}),
-			operations.map(({ tool, mcp, zod, node }) => {
-				const pathParams = _kubb_core.ast.caseParams(node.parameters, paramsCasing).filter((p) => p.in === "path");
-				const pathEntries = [];
-				const otherEntries = [];
-				for (const p of pathParams) {
-					const zodParam = zod.pathParams.find((zp) => zp.name === p.name);
-					pathEntries.push({
-						key: p.name,
-						value: zodParam ? zodParam.schemaName : zodExprFromSchemaNode(p.schema)
-					});
-				}
-				if (zod.requestName) otherEntries.push({
-					key: "data",
-					value: zod.requestName
-				});
-				if (zod.queryParams) otherEntries.push({
-					key: "params",
-					value: zodGroupExpr(zod.queryParams)
-				});
-				if (zod.headerParams) otherEntries.push({
-					key: "headers",
-					value: zodGroupExpr(zod.headerParams)
-				});
-				otherEntries.sort((a, b) => a.key.localeCompare(b.key));
-				const entries = [...pathEntries, ...otherEntries];
-				const paramsNode = entries.length ? _kubb_core.ast.createFunctionParameters({ params: [_kubb_core.ast.createParameterGroup({ properties: entries.map((e) => _kubb_core.ast.createFunctionParameter({
-					name: e.key,
-					optional: false
-				})) })] }) : void 0;
-				const destructured = paramsNode ? keysPrinter.print(paramsNode) ?? "" : "";
-				const inputSchema = entries.length ? `{ ${entries.map((e) => `${e.key}: ${e.value}`).join(", ")} }` : void 0;
-				const outputSchema = zod.responseName;
-				const config = [
-					tool.title ? `title: ${JSON.stringify(tool.title)}` : null,
-					`description: ${JSON.stringify(tool.description)}`,
-					outputSchema ? `outputSchema: { data: ${outputSchema} }` : null
-				].filter(Boolean).join(",\n  ");
-				if (inputSchema) return `
+	const registrations = operations.map(({ tool, mcp, zod, node }) => {
+		const { path: pathParams } = getOperationParameters(node, { paramsCasing });
+		const pathEntries = [];
+		const otherEntries = [];
+		for (const p of pathParams) {
+			const zodParam = zod.pathParams.find((zp) => zp.name === p.name);
+			pathEntries.push({
+				key: p.name,
+				value: zodParam ? zodParam.schemaName : zodExprFromSchemaNode(p.schema)
+			});
+		}
+		if (zod.requestName) otherEntries.push({
+			key: "data",
+			value: zod.requestName
+		});
+		if (zod.queryParams) otherEntries.push({
+			key: "params",
+			value: zodGroupExpr(zod.queryParams)
+		});
+		if (zod.headerParams) otherEntries.push({
+			key: "headers",
+			value: zodGroupExpr(zod.headerParams)
+		});
+		otherEntries.sort((a, b) => a.key.localeCompare(b.key));
+		const entries = [...pathEntries, ...otherEntries];
+		const paramsNode = entries.length ? _kubb_core.ast.createFunctionParameters({ params: [_kubb_core.ast.createParameterGroup({ properties: entries.map((e) => _kubb_core.ast.createFunctionParameter({
+			name: e.key,
+			optional: false
+		})) })] }) : null;
+		const destructured = paramsNode ? keysPrinter.print(paramsNode) ?? "" : "";
+		const inputSchema = entries.length ? `{ ${entries.map((e) => `${e.key}: ${e.value}`).join(", ")} }` : null;
+		const outputSchema = zod.responseName;
+		const config = [
+			tool.title ? `title: ${JSON.stringify(tool.title)}` : null,
+			`description: ${JSON.stringify(tool.description)}`,
+			outputSchema ? `outputSchema: { data: ${outputSchema} }` : null
+		].filter(Boolean).join(",\n  ");
+		if (inputSchema) return `
 server.registerTool(${JSON.stringify(tool.name)}, {
   ${config},
   inputSchema: ${inputSchema},
@@ -571,14 +584,34 @@ server.registerTool(${JSON.stringify(tool.name)}, {
   return ${mcp.name}(${destructured}, request)
 })
           `;
-				return `
+		return `
 server.registerTool(${JSON.stringify(tool.name)}, {
   ${config},
 }, async (request) => {
   return ${mcp.name}(request)
 })
           `;
-			}).filter(Boolean),
+	}).filter(Boolean).join("\n");
+	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File.Source, {
+		name,
+		isExportable: true,
+		isIndexable: true,
+		children: [
+			/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Function, {
+				name: "getServer",
+				export: true,
+				children: `const server = new McpServer({
+  name: '${serverName}',
+  version: '${serverVersion}',
+})
+${registrations}
+return server`
+			}),
+			/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Const, {
+				name: "server",
+				export: true,
+				children: "getServer()"
+			}),
 			/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Function, {
 				name: "startServer",
 				async: true,
@@ -597,29 +630,28 @@ server.registerTool(${JSON.stringify(tool.name)}, {
 }
 //#endregion
 //#region src/generators/mcpGenerator.tsx
+/**
+* Built-in operation generator for `@kubb/plugin-mcp`. Emits one MCP tool
+* handler per OpenAPI operation, wiring the input Zod schema, the HTTP call,
+* and the response shape into a single function that an MCP server can
+* register as a callable tool.
+*/
 const mcpGenerator = (0, _kubb_core.defineGenerator)({
 	name: "mcp",
 	renderer: _kubb_renderer_jsx.jsxRenderer,
 	operation(node, ctx) {
+		if (!_kubb_core.ast.isHttpOperationNode(node)) return null;
 		const { resolver, driver, root } = ctx;
 		const { output, client, paramsCasing, group } = ctx.options;
 		const pluginTs = driver.getPlugin(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(_kubb_plugin_ts.pluginTsName);
-		const casedParams = _kubb_core.ast.caseParams(node.parameters, paramsCasing);
-		const pathParams = casedParams.filter((p) => p.in === "path");
-		const queryParams = casedParams.filter((p) => p.in === "query");
-		const headerParams = casedParams.filter((p) => p.in === "header");
-		const importedTypeNames = [
-			...pathParams.map((p) => tsResolver.resolvePathParamsName(node, p)),
-			...queryParams.map((p) => tsResolver.resolveQueryParamsName(node, p)),
-			...headerParams.map((p) => tsResolver.resolveHeaderParamsName(node, p)),
-			node.requestBody?.content?.[0]?.schema ? tsResolver.resolveDataName(node) : void 0,
-			tsResolver.resolveResponseName(node),
-			...node.responses.filter((r) => Number(r.statusCode) >= 400).map((r) => tsResolver.resolveResponseStatusName(node, r.statusCode))
-		].filter(Boolean);
+		const importedTypeNames = resolveOperationTypeNames(node, tsResolver, {
+			paramsCasing,
+			responseStatusNames: "error"
+		});
 		const meta = {
-			name: resolver.resolveName(node.operationId),
+			name: resolver.resolveHandlerName(node),
 			file: resolver.resolveFile({
 				name: node.operationId,
 				extname: ".ts",
@@ -628,7 +660,7 @@ const mcpGenerator = (0, _kubb_core.defineGenerator)({
 			}, {
 				root,
 				output,
-				group
+				group: group ?? void 0
 			}),
 			fileTs: tsResolver.resolveFile({
 				name: node.operationId,
@@ -638,7 +670,7 @@ const mcpGenerator = (0, _kubb_core.defineGenerator)({
 			}, {
 				root,
 				output: pluginTs.options?.output ?? output,
-				group: pluginTs.options?.group
+				group: pluginTs.options?.group ?? void 0
 			})
 		};
 		return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File, {
@@ -682,7 +714,7 @@ const mcpGenerator = (0, _kubb_core.defineGenerator)({
 						isTypeOnly: true
 					}),
 					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
-						name: "fetch",
+						name: "client",
 						path: client.importPath
 					}),
 					client.dataReturnType === "full" && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
@@ -698,18 +730,18 @@ const mcpGenerator = (0, _kubb_core.defineGenerator)({
 							"ResponseErrorConfig"
 						],
 						root: meta.file.path,
-						path: node_path.default.resolve(root, ".kubb/fetch.ts"),
+						path: node_path.default.resolve(root, ".kubb/client.ts"),
 						isTypeOnly: true
 					}),
 					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
-						name: ["fetch"],
+						name: ["client"],
 						root: meta.file.path,
-						path: node_path.default.resolve(root, ".kubb/fetch.ts")
+						path: node_path.default.resolve(root, ".kubb/client.ts")
 					}),
 					client.dataReturnType === "full" && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
 						name: ["ResponseConfig"],
 						root: meta.file.path,
-						path: node_path.default.resolve(root, ".kubb/fetch.ts"),
+						path: node_path.default.resolve(root, ".kubb/client.ts"),
 						isTypeOnly: true
 					})
 				] }),
@@ -738,7 +770,7 @@ const serverGenerator = (0, _kubb_core.defineGenerator)({
 	name: "operations",
 	renderer: _kubb_renderer_jsx.jsxRenderer,
 	operations(nodes, ctx) {
-		const { adapter, config, resolver, plugin, driver, root } = ctx;
+		const { config, resolver, plugin, driver, root } = ctx;
 		const { output, paramsCasing, group } = ctx.options;
 		const pluginZod = driver.getPlugin(_kubb_plugin_zod.pluginZodName);
 		if (!pluginZod) return;
@@ -754,11 +786,8 @@ const serverGenerator = (0, _kubb_core.defineGenerator)({
 			path: node_path.default.resolve(root, output.path, ".mcp.json"),
 			meta: { pluginName: plugin.name }
 		};
-		const operationsMapped = nodes.map((node) => {
-			const casedParams = _kubb_core.ast.caseParams(node.parameters, paramsCasing);
-			const pathParams = casedParams.filter((p) => p.in === "path");
-			const queryParams = casedParams.filter((p) => p.in === "query");
-			const headerParams = casedParams.filter((p) => p.in === "header");
+		const operationsMapped = nodes.filter(_kubb_core.ast.isHttpOperationNode).map((node) => {
+			const { path: pathParams, query: queryParams, header: headerParams } = getOperationParameters(node, { paramsCasing });
 			const mcpFile = resolver.resolveFile({
 				name: node.operationId,
 				extname: ".ts",
@@ -767,7 +796,7 @@ const serverGenerator = (0, _kubb_core.defineGenerator)({
 			}, {
 				root,
 				output,
-				group
+				group: group ?? void 0
 			});
 			const zodFile = zodResolver.resolveFile({
 				name: node.operationId,
@@ -777,11 +806,11 @@ const serverGenerator = (0, _kubb_core.defineGenerator)({
 			}, {
 				root,
 				output: pluginZod.options?.output ?? output,
-				group: pluginZod.options?.group
+				group: pluginZod.options?.group ?? void 0
 			});
-			const requestName = node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName(node) : void 0;
+			const requestName = node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName(node) : null;
 			const successStatus = findSuccessStatusCode(node.responses);
-			const responseName = successStatus ? zodResolver.resolveResponseStatusName(node, successStatus) : void 0;
+			const responseName = successStatus ? zodResolver.resolveResponseStatusName(node, successStatus) : null;
 			const resolveParams = (params) => params.map((p) => ({
 				name: p.name,
 				schemaName: zodResolver.resolveParamName(node, p)
@@ -793,13 +822,13 @@ const serverGenerator = (0, _kubb_core.defineGenerator)({
 					description: node.description || `Make a ${node.method.toUpperCase()} request to ${node.path}`
 				},
 				mcp: {
-					name: resolver.resolveName(node.operationId),
+					name: resolver.resolveHandlerName(node),
 					file: mcpFile
 				},
 				zod: {
 					pathParams: resolveParams(pathParams),
-					queryParams: queryParams.length ? resolveParams(queryParams) : void 0,
-					headerParams: headerParams.length ? resolveParams(headerParams) : void 0,
+					queryParams: queryParams.length ? resolveParams(queryParams) : null,
+					headerParams: headerParams.length ? resolveParams(headerParams) : null,
 					requestName,
 					responseName,
 					file: zodFile
@@ -814,7 +843,7 @@ const serverGenerator = (0, _kubb_core.defineGenerator)({
 				...(zod.headerParams ?? []).map((p) => p.schemaName),
 				zod.requestName,
 				zod.responseName
-			].filter(Boolean);
+			].filter((name) => Boolean(name));
 			const uniqueNames = [...new Set(zodNames)].sort();
 			return [/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
 				name: [mcp.name],
@@ -830,13 +859,21 @@ const serverGenerator = (0, _kubb_core.defineGenerator)({
 			baseName: serverFile.baseName,
 			path: serverFile.path,
 			meta: serverFile.meta,
-			banner: resolver.resolveBanner(adapter.inputNode, {
+			banner: resolver.resolveBanner(ctx.meta, {
 				output,
-				config
+				config,
+				file: {
+					path: serverFile.path,
+					baseName: serverFile.baseName
+				}
 			}),
-			footer: resolver.resolveFooter(adapter.inputNode, {
+			footer: resolver.resolveFooter(ctx.meta, {
 				output,
-				config
+				config,
+				file: {
+					path: serverFile.path,
+					baseName: serverFile.baseName
+				}
 			}),
 			children: [
 				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
@@ -854,8 +891,8 @@ const serverGenerator = (0, _kubb_core.defineGenerator)({
 				imports,
 				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(Server, {
 					name,
-					serverName: adapter.inputNode?.meta?.title ?? "server",
-					serverVersion: adapter.inputNode?.meta?.version ?? "0.0.0",
+					serverName: ctx.meta.title ?? "server",
+					serverVersion: ctx.meta.version ?? "0.0.0",
 					paramsCasing,
 					operations: operationsMapped
 				})
@@ -869,7 +906,7 @@ const serverGenerator = (0, _kubb_core.defineGenerator)({
 				children: `
           {
             "mcpServers": {
-              "${adapter.inputNode?.meta?.title || "server"}": {
+              "${ctx.meta.title || "server"}": {
                 "type": "stdio",
                 "command": "npx",
                 "args": ["tsx", "${node_path.default.relative(node_path.default.dirname(jsonFile.path), serverFile.path)}"]
@@ -884,41 +921,77 @@ const serverGenerator = (0, _kubb_core.defineGenerator)({
 //#endregion
 //#region src/resolvers/resolverMcp.ts
 /**
-* Naming convention resolver for MCP plugin.
+* Default resolver used by `@kubb/plugin-mcp`. Decides the names and file
+* paths for every generated MCP tool handler. Function names get a `Handler`
+* suffix so an operation `addPet` becomes `addPetHandler`.
 *
-* Provides default naming helpers using camelCase with a `handler` suffix for functions.
+* @example Resolve a handler name
+* ```ts
+* import { resolverMcp } from '@kubb/plugin-mcp'
 *
-* @example
-* `resolverMcp.default('addPet', 'function')  // → 'addPetHandler'`
+* resolverMcp.default('addPet', 'function') // 'addPetHandler'
+* ```
 */
-const resolverMcp = (0, _kubb_core.defineResolver)((ctx) => ({
+const resolverMcp = (0, _kubb_core.defineResolver)(() => ({
 	name: "default",
 	pluginName: "plugin-mcp",
 	default(name, type) {
-		if (type === "file") return camelCase(name, { isFile: true });
+		if (type === "file") return toFilePath(name);
 		return camelCase(name, { suffix: "handler" });
 	},
 	resolveName(name) {
-		return ctx.default(name, "function");
+		return this.default(name, "function");
+	},
+	resolvePathName(name, type) {
+		return this.default(name, type);
+	},
+	resolveHandlerName(node) {
+		return this.resolveName(node.operationId);
 	}
 }));
 //#endregion
 //#region src/plugin.ts
+/**
+* Canonical plugin name for `@kubb/plugin-mcp`. Used for driver lookups and
+* cross-plugin dependency references.
+*/
 const pluginMcpName = "plugin-mcp";
+/**
+* Generates a Model Context Protocol (MCP) server from an OpenAPI spec. Every
+* operation becomes a typed MCP tool that AI assistants (Claude Desktop, Claude
+* Code, MCP-compatible clients) can call directly.
+*
+* @example
+* ```ts
+* import { defineConfig } from 'kubb'
+* import { pluginTs } from '@kubb/plugin-ts'
+* import { pluginClient } from '@kubb/plugin-client'
+* import { pluginZod } from '@kubb/plugin-zod'
+* import { pluginMcp } from '@kubb/plugin-mcp'
+*
+* export default defineConfig({
+*   input: { path: './petStore.yaml' },
+*   output: { path: './src/gen' },
+*   plugins: [
+*     pluginTs(),
+*     pluginClient(),
+*     pluginZod(),
+*     pluginMcp({
+*       output: { path: './mcp' },
+*       client: { baseURL: 'https://petstore.swagger.io/v2' },
+*     }),
+*   ],
+* })
+* ```
+*/
 const pluginMcp = (0, _kubb_core.definePlugin)((options) => {
 	const { output = {
 		path: "mcp",
-		barrelType: "named"
+		barrel: { type: "named" }
 	}, group, exclude = [], include, override = [], paramsCasing, client, resolver: userResolver, transformer: userTransformer, generators: userGenerators = [] } = options;
 	const clientName = client?.client ?? "axios";
 	const clientImportPath = client?.importPath ?? (!client?.bundle ? `@kubb/plugin-client/clients/${clientName}` : void 0);
-	const groupConfig = group ? {
-		...group,
-		name: group.name ? group.name : (ctx) => {
-			if (group.type === "path") return `${ctx.group.split("/")[1]}`;
-			return `${camelCase(ctx.group)}Requests`;
-		}
-	} : void 0;
+	const groupConfig = createGroupConfig(group);
 	return {
 		name: pluginMcpName,
 		options,
@@ -954,10 +1027,10 @@ const pluginMcp = (0, _kubb_core.definePlugin)((options) => {
 			const root = node_path$1.default.resolve(ctx.config.root, ctx.config.output.path);
 			const hasClientPlugin = ctx.config.plugins?.some((p) => p.name === _kubb_plugin_client.pluginClientName);
 			if (client?.bundle && !hasClientPlugin && !clientImportPath) ctx.injectFile({
-				baseName: "fetch.ts",
-				path: node_path$1.default.resolve(root, ".kubb/fetch.ts"),
+				baseName: "client.ts",
+				path: node_path$1.default.resolve(root, ".kubb/client.ts"),
 				sources: [_kubb_core.ast.createSource({
-					name: "fetch",
+					name: "client",
 					nodes: [_kubb_core.ast.createText(clientName === "fetch" ? _kubb_plugin_client_templates_clients_fetch_source.source : _kubb_plugin_client_templates_clients_axios_source.source)],
 					isExportable: true,
 					isIndexable: true