@farming-labs/next 0.2.59 → 0.2.61

package/dist/config.d.mts

@@ -1,6 +1,7 @@
+import { DocsConfig } from "@farming-labs/docs";
 import { NextConfig } from "next";
 
 //#region src/config.d.ts
-declare function withDocs(nextConfig?: NextConfig): NextConfig;
+declare function withDocs(nextConfig?: NextConfig, docsConfig?: Pick<DocsConfig, "mcp">): NextConfig;
 //#endregion
 export { withDocs };

package/dist/config.mjs

@@ -1,7 +1,7 @@
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, statSync, writeFileSync } from "node:fs";
-import { dirname, isAbsolute, join, relative } from "node:path";
+import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
-import { DEFAULT_AGENT_SKILLS_INDEX_ROUTE, DEFAULT_AGENT_SKILLS_ROUTE_PREFIX, DEFAULT_API_CATALOG_ROUTE, DOCS_AI_AGENT_USER_AGENT_HEADER_PATTERN, DOCS_BOT_LIKE_USER_AGENT_HEADER_PATTERN, DOCS_TRADITIONAL_BOT_USER_AGENT_HEADER_PATTERN } from "@farming-labs/docs";
+import { DEFAULT_A2A_AGENT_CARD_ROUTE, DEFAULT_AGENT_SKILLS_INDEX_ROUTE, DEFAULT_AGENT_SKILLS_ROUTE_PREFIX, DEFAULT_AGENT_SKILL_ARCHIVE_FORMAT, DEFAULT_API_CATALOG_ROUTE, DEFAULT_LEGACY_SKILLS_INDEX_ROUTE, DEFAULT_LEGACY_SKILLS_ROUTE_PREFIX, DOCS_AI_AGENT_USER_AGENT_HEADER_PATTERN, DOCS_BOT_LIKE_USER_AGENT_HEADER_PATTERN, DOCS_TRADITIONAL_BOT_USER_AGENT_HEADER_PATTERN } from "@farming-labs/docs";
 import { ensureDocsReviewWorkflow } from "@farming-labs/docs/server";
 import matter from "gray-matter";
 import createMDX from "@next/mdx";
@@ -152,6 +152,7 @@ const DEFAULT_AGENT_FEEDBACK_ROUTE = "/api/docs/agent/feedback";
 const DEFAULT_MCP_ROUTE = "/api/docs/mcp";
 const DEFAULT_MCP_PUBLIC_ROUTE = "/mcp";
 const DEFAULT_MCP_WELL_KNOWN_ROUTE = "/.well-known/mcp";
+const DEFAULT_MCP_PROTECTED_RESOURCE_METADATA_ROUTE = "/.well-known/oauth-protected-resource";
 const DEFAULT_LLMS_TXT_ROUTE = "/llms.txt";
 const DEFAULT_LLMS_FULL_TXT_ROUTE = "/llms-full.txt";
 const DEFAULT_LLMS_TXT_WELL_KNOWN_ROUTE = "/.well-known/llms.txt";
@@ -544,6 +545,44 @@ function readDocsConfigPath(root) {
 	}
 	return "docs.config.ts";
 }
+function readLiteralStringList(block, key) {
+	const cursor = findTopLevelPropertyValueIndex(block, key);
+	if (cursor === void 0) return null;
+	const value = block.slice(cursor);
+	const quoted = value.match(/^(["'])(.*?)\1/s);
+	if (quoted) return [quoted[2]];
+	if (!value.startsWith("[")) return null;
+	const end = value.indexOf("]");
+	if (end === -1) return null;
+	return [...value.slice(1, end).matchAll(/(["'])(.*?)\1/g)].map((match) => match[2]);
+}
+function readAgentSkillTraceGlobs(root, configPath) {
+	const absoluteConfigPath = join(root, configPath);
+	if (!existsSync(absoluteConfigPath)) return [];
+	const agent = extractTopLevelObjectLiteral(readFileSync(absoluteConfigPath, "utf8"), "agent");
+	if (!agent) return [];
+	const skillsCursor = findTopLevelPropertyValueIndex(agent, "skills");
+	if (skillsCursor === void 0) return [];
+	const skillsObject = agent[skillsCursor] === "{" ? extractObjectLiteral(agent, "skills") : void 0;
+	const configured = skillsObject ? readLiteralStringList(skillsObject, "paths") : readLiteralStringList(agent, "skills");
+	if (!configured) throw new Error("withDocs could not statically trace agent.skills. Use a literal path, a literal path array, or { paths: [...] } so configured skills are included in production.");
+	return configured.map((configuredPath) => {
+		const normalized = configuredPath.replace(/\\/g, "/").replace(/\/$/, "");
+		return normalized.endsWith("/SKILL.md") || normalized === "SKILL.md" ? normalized : `${normalized}/**/*`;
+	});
+}
+function commonTracingRoot(root, globs) {
+	let common = resolve(root);
+	for (const glob of globs) {
+		const candidate = resolve(root, glob.replace(/\/\*\*\/\*$/, ""));
+		while (relative(common, candidate) === ".." || relative(common, candidate).startsWith(`..${sep}`)) {
+			const parent = dirname(common);
+			if (parent === common) break;
+			common = parent;
+		}
+	}
+	return common;
+}
 /** Read the OG endpoint from docs.config.ts[x] (returns undefined if not set). */
 function readOgEndpoint(root) {
 	for (const ext of FILE_EXTS) {
@@ -1025,6 +1064,23 @@ function resolveManagedChangelogSourceLayoutPath(root, appDir, entry, changelogC
 function removeManagedFile(filePath) {
 	if (isManagedGeneratedFile(filePath)) rmSync(filePath, { force: true });
 }
+function resolveMcpConfig(mcp) {
+	if (mcp === false) return {
+		enabled: false,
+		route: DEFAULT_MCP_ROUTE,
+		protectedResource: false
+	};
+	if (!mcp || mcp === true) return {
+		enabled: true,
+		route: DEFAULT_MCP_ROUTE,
+		protectedResource: false
+	};
+	return {
+		enabled: mcp.enabled ?? true,
+		route: normalizeRoutePath(mcp.route ?? DEFAULT_MCP_ROUTE),
+		protectedResource: Boolean(mcp.security?.authenticate && mcp.security.protectedResource)
+	};
+}
 function readMcpConfig(root) {
 	for (const ext of FILE_EXTS) {
 		const configPath = join(root, `docs.config.${ext}`);
@@ -1033,36 +1089,50 @@ function readMcpConfig(root) {
 			const content = readFileSync(configPath, "utf-8");
 			if (content.match(/mcp\s*:\s*false/)) return {
 				enabled: false,
-				route: DEFAULT_MCP_ROUTE
+				route: DEFAULT_MCP_ROUTE,
+				protectedResource: false
 			};
 			if (content.match(/mcp\s*:\s*true/)) return {
 				enabled: true,
-				route: DEFAULT_MCP_ROUTE
+				route: DEFAULT_MCP_ROUTE,
+				protectedResource: false
 			};
 			const block = extractObjectLiteral(content, "mcp");
 			if (!block) continue;
 			const enabledMatch = block.match(/enabled\s*:\s*(true|false)/);
 			const routeMatch = block.match(/route\s*:\s*["']([^"']+)["']/);
+			const securityBlock = extractObjectLiteral(block, "security");
+			const protectedResource = Boolean(securityBlock && /\bauthenticate\b/u.test(securityBlock) && extractObjectLiteral(securityBlock, "protectedResource"));
 			return {
 				enabled: enabledMatch ? enabledMatch[1] !== "false" : true,
-				route: normalizeRoutePath(routeMatch?.[1] ?? DEFAULT_MCP_ROUTE)
+				route: normalizeRoutePath(routeMatch?.[1] ?? DEFAULT_MCP_ROUTE),
+				protectedResource
 			};
 		} catch {
 			return {
 				enabled: true,
-				route: DEFAULT_MCP_ROUTE
+				route: DEFAULT_MCP_ROUTE,
+				protectedResource: false
 			};
 		}
 	}
 	return {
 		enabled: true,
-		route: DEFAULT_MCP_ROUTE
+		route: DEFAULT_MCP_ROUTE,
+		protectedResource: false
 	};
 }
 function normalizeRoutePath(route) {
 	const normalized = `/${route}`.replace(/\/+/g, "/");
 	return normalized !== "/" ? normalized.replace(/\/+$/, "") : DEFAULT_MCP_ROUTE;
 }
+function normalizeMcpResourcePath(route) {
+	return route.trim() === "/" ? "/" : normalizeRoutePath(route);
+}
+function buildMcpProtectedResourceMetadataRoute(resourcePath) {
+	const normalized = normalizeMcpResourcePath(resourcePath);
+	return normalized === "/" ? DEFAULT_MCP_PROTECTED_RESOURCE_METADATA_ROUTE : `${DEFAULT_MCP_PROTECTED_RESOURCE_METADATA_ROUTE}${normalized}`;
+}
 function normalizeRoutePrefix(prefix) {
 	if (!prefix) return "";
 	const normalized = `/${prefix.replace(/^\/+|\/+$/g, "")}`.replace(/\/+/g, "/");
@@ -1422,7 +1492,35 @@ function buildStandardsDiscoveryRewrites() {
 		},
 		{
 			source: `${DEFAULT_AGENT_SKILLS_ROUTE_PREFIX}/:name/SKILL.md`,
-			destination: "/api/docs?format=agent-skill&name=:name"
+			destination: "/api/docs?format=agent-skill-file&name=:name&path=SKILL.md"
+		},
+		{
+			source: `${DEFAULT_AGENT_SKILLS_ROUTE_PREFIX}/:name/skill.md`,
+			destination: "/api/docs?format=agent-skill-file&name=:name&path=SKILL.md"
+		},
+		{
+			source: `${DEFAULT_AGENT_SKILLS_ROUTE_PREFIX}/:name.tar.gz`,
+			destination: `/api/docs?format=${DEFAULT_AGENT_SKILL_ARCHIVE_FORMAT}&name=:name`
+		},
+		{
+			source: `${DEFAULT_AGENT_SKILLS_ROUTE_PREFIX}/:name/:path*`,
+			destination: "/api/docs?format=agent-skill-file&name=:name&path=:path*"
+		},
+		{
+			source: DEFAULT_LEGACY_SKILLS_INDEX_ROUTE,
+			destination: "/api/docs?format=legacy-skills"
+		},
+		{
+			source: `${DEFAULT_LEGACY_SKILLS_ROUTE_PREFIX}/:name/skill.md`,
+			destination: "/api/docs?format=agent-skill-file&name=:name&path=SKILL.md"
+		},
+		{
+			source: `${DEFAULT_LEGACY_SKILLS_ROUTE_PREFIX}/:name/:path*`,
+			destination: "/api/docs?format=agent-skill-file&name=:name&path=:path*"
+		},
+		{
+			source: DEFAULT_A2A_AGENT_CARD_ROUTE,
+			destination: "/api/docs?format=agent-card"
 		}
 	];
 }
@@ -1527,10 +1625,19 @@ function buildRobotsRewrites(config) {
 }
 function buildMcpRewrites(config) {
 	if (!config.enabled) return [];
-	return [DEFAULT_MCP_PUBLIC_ROUTE, DEFAULT_MCP_WELL_KNOWN_ROUTE].filter((source) => source !== config.route).map((source) => ({
+	const endpointRewrites = [DEFAULT_MCP_PUBLIC_ROUTE, DEFAULT_MCP_WELL_KNOWN_ROUTE].filter((source) => source !== config.route).map((source) => ({
 		source,
 		destination: config.route
 	}));
+	const metadataRewrites = config.protectedResource ? Array.from(new Set([
+		config.route,
+		DEFAULT_MCP_PUBLIC_ROUTE,
+		DEFAULT_MCP_WELL_KNOWN_ROUTE
+	])).map(buildMcpProtectedResourceMetadataRoute).map((source) => ({
+		source,
+		destination: config.route
+	})) : [];
+	return [...endpointRewrites, ...metadataRewrites];
 }
 function buildAgentFeedbackRewrites(config) {
 	if (!config.enabled) return [];
@@ -1694,11 +1801,16 @@ function mergeDocsMarkdownRewrites(entry, docsPath, mcp, sitemap, agentFeedback,
 function mergeDocsRedirects(autoRedirects, redirects) {
 	return dedupeRedirects([...redirects ?? [], ...autoRedirects]);
 }
-function withDocs(nextConfig = {}) {
+function withDocs(nextConfig = {}, docsConfig) {
 	const root = process.cwd();
 	const workspaceRoot = findDocsWorkspaceRoot(root);
 	const docsConfigPath = readDocsConfigPath(root);
 	const docsConfigAbsolutePath = join(root, docsConfigPath);
+	const mcp = docsConfig ? resolveMcpConfig(docsConfig.mcp) : readMcpConfig(root);
+	const nextBasePath = normalizeRoutePrefix(nextConfig.basePath);
+	if (mcp.enabled && mcp.protectedResource && nextBasePath) throw new Error(`@farming-labs/next: mcp.security.protectedResource cannot be combined with Next.js basePath ${JSON.stringify(nextBasePath)} because RFC 9728 metadata must be hosted at origin-root well-known URLs. Host the protected docs app at the origin root or publish the metadata and MCP proxy at the edge.`);
+	const agentSkillTraceGlobs = readAgentSkillTraceGlobs(root, docsConfigPath);
+	if (agentSkillTraceGlobs.some((glob) => glob.startsWith("../"))) nextConfig.outputFileTracingRoot ??= workspaceRoot ?? commonTracingRoot(root, agentSkillTraceGlobs);
 	const agentFeedback = readAgentFeedbackConfig(root);
 	const docsConfigRelativeAlias = docsConfigPath.startsWith("./") || docsConfigPath.startsWith("../") ? docsConfigPath : `./${docsConfigPath}`;
 	ensureDocsReviewWorkflow({
@@ -1725,7 +1837,6 @@ function withDocs(nextConfig = {}) {
 		mkdirSync(docsApiRouteDir, { recursive: true });
 		writeFileSync(docsApiRoutePath, DOCS_API_ROUTE_TEMPLATE);
 	}
-	const mcp = readMcpConfig(root);
 	const sitemap = readSitemapConfig(root);
 	const robots = readRobotsConfig(root);
 	const docsMcpRouteDir = join(root, appDir, "api", "docs", "mcp");
@@ -1917,9 +2028,15 @@ function withDocs(nextConfig = {}) {
 			skillTraceFile,
 			agentsTraceFile,
 			agentTraceFile,
-			sitemapManifestTraceFile
+			sitemapManifestTraceFile,
+			...agentSkillTraceGlobs
 		])],
-		[DEFAULT_MCP_ROUTE]: [...new Set([...existingTracingIncludes[DEFAULT_MCP_ROUTE] ?? [], docsTraceGlob])]
+		[DEFAULT_MCP_ROUTE]: [...new Set([
+			...existingTracingIncludes[DEFAULT_MCP_ROUTE] ?? [],
+			docsTraceGlob,
+			skillTraceFile,
+			...agentSkillTraceGlobs
+		])]
 	};
 	return withMDX(nextConfig);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farming-labs/next",
-  "version": "0.2.59",
+  "version": "0.2.61",
   "description": "Next.js adapter for @farming-labs/docs — MDX config wrapper",
   "keywords": [
     "docs",
@@ -106,8 +106,8 @@
     "tsdown": "^0.20.3",
     "typescript": "^5.9.3",
     "vitest": "^4.1.8",
-    "@farming-labs/docs": "0.2.59",
-    "@farming-labs/theme": "0.2.59"
+    "@farming-labs/theme": "0.2.61",
+    "@farming-labs/docs": "0.2.61"
   },
   "peerDependencies": {
     "@farming-labs/docs": ">=0.0.1",