@publish.os/nextjs 0.0.1-alpha.91 → 0.0.1-alpha.92

package/compiler-assets/nextjs/shims/proxy.ts

@@ -1,3 +1,4 @@
+import { isMarkdownClient } from "@app/agent-user-agents";
 import {
   createNotFoundTextResponse,
   resolveNotFoundScope,
@@ -6,8 +7,6 @@ import { agentRouteConfig } from "@source/.publishos/agent-route-config.generate
 import type { NextRequest } from "next/server";
 import { NextResponse } from "next/server";
 
-const AGENT_USER_AGENT_PATTERN =
-  /\b(?:axios|got|node-fetch|undici|curl|wget|python-requests|httpx|aiohttp|claude-code|claudebot|claude|cursor|chatgpt|openai|perplexity|anthropic-ai)\b/i;
 const INTERNAL_MARKDOWN_PREFIX = "/__publishos/md";
 const FRAMEWORK_PREFIX = "__PUBLISHOS_FRAMEWORK_PREFIX__";
 const TEXT_METHODS = new Set(["GET", "HEAD"]);
@@ -36,11 +35,15 @@ function normalizePagePath(pathname: string): string {
   return pathname.replace(/\/+$/, "");
 }
 
-function markdownRoutePath(pathname: string): string {
+function markdownRoutePath(
+  pathname: string,
+  reason: "accept" | "extension",
+): string {
   const normalized = normalizePagePath(pathname);
-  const pagePath = normalized.endsWith(".md")
-    ? normalized.slice(0, -".md".length)
-    : normalized;
+  const pagePath =
+    reason === "extension" && normalized.endsWith(".md")
+      ? normalized.slice(0, -".md".length)
+      : normalized;
   return pagePath === "/"
     ? INTERNAL_MARKDOWN_PREFIX
     : `${INTERNAL_MARKDOWN_PREFIX}${pagePath}`;
@@ -51,13 +54,21 @@ function markdownAlternatePath(pathname: string): string {
   if (normalized === "/") {
     return agentRouteConfig.discoveryLinks.sitemap ?? "/sitemap.md";
   }
-  return normalized.endsWith(".md") ? normalized : `${normalized}.md`;
+  return `${normalized}.md`;
+}
+
+function rootMarkdownSitemapPath(requestUrl: URL): string {
+  return new URL(
+    agentRouteConfig.discoveryLinks.sitemap ?? "/sitemap.md",
+    requestUrl,
+  ).pathname;
 }
 
 function explicitAcceptQuality(accept: string, mimeType: string): number {
-  if (!accept) return 0;
+  if (!accept.trim()) return 1;
 
   const [targetType, targetSubtype] = mimeType.toLowerCase().split("/");
+  let bestSpecificity = -1;
   let bestQuality = 0;
 
   for (const entry of accept.split(",")) {
@@ -69,17 +80,31 @@ function explicitAcceptQuality(accept: string, mimeType: string): number {
     if (!rawType) continue;
 
     const [type, subtype] = rawType.split("/");
-    if (type !== targetType || subtype !== targetSubtype) continue;
+    const specificity =
+      type === targetType && subtype === targetSubtype
+        ? 2
+        : type === targetType && subtype === "*"
+          ? 1
+          : type === "*" && subtype === "*"
+            ? 0
+            : -1;
+    if (specificity < 0) continue;
 
     let quality = 1;
     for (const param of rawParams) {
       const [key, value] = param.split("=").map((part) => part.trim());
       if (key !== "q") continue;
-      const parsed = Number.parseFloat(value);
-      quality = Number.isFinite(parsed) ? parsed : 0;
+      const parsed = Number(value);
+      quality =
+        Number.isFinite(parsed) && parsed >= 0 && parsed <= 1 ? parsed : 0;
     }
 
-    if (quality > bestQuality) bestQuality = quality;
+    if (specificity > bestSpecificity) {
+      bestSpecificity = specificity;
+      bestQuality = quality;
+    } else if (specificity === bestSpecificity) {
+      bestQuality = Math.max(bestQuality, quality);
+    }
   }
 
   return bestQuality;
@@ -87,48 +112,99 @@ function explicitAcceptQuality(accept: string, mimeType: string): number {
 
 function negotiatedTextType(
   request: NextRequest,
-): "text/markdown; charset=utf-8" | "text/plain; charset=utf-8" | undefined {
-  if (!TEXT_METHODS.has(request.method)) return undefined;
-
+): "text/markdown; charset=utf-8" | "text/html; charset=utf-8" | undefined {
   const accept = request.headers.get("accept") ?? "";
   const markdownQuality = agentRouteConfig.markdownAccept
     ? explicitAcceptQuality(accept, "text/markdown")
     : 0;
-  const plainQuality = agentRouteConfig.plainTextAccept
-    ? explicitAcceptQuality(accept, "text/plain")
+  const htmlQuality = explicitAcceptQuality(accept, "text/html");
+
+  if (markdownQuality === 0 && htmlQuality === 0) return undefined;
+  if (markdownQuality > htmlQuality) return "text/markdown; charset=utf-8";
+  if (markdownQuality < htmlQuality) return "text/html; charset=utf-8";
+  if (looksLikeAgent(request)) return "text/markdown; charset=utf-8";
+  return htmlQuality > 0 && markdownQuality > 0
+    ? "text/html; charset=utf-8"
+    : undefined;
+}
+
+function negotiatedPlainNotFound(request: NextRequest): boolean {
+  if (!TEXT_METHODS.has(request.method)) return false;
+
+  const accept = request.headers.get("accept") ?? "";
+  const plainQuality = explicitAcceptQuality(accept, "text/plain");
+  const markdownQuality = agentRouteConfig.markdownAccept
+    ? explicitAcceptQuality(accept, "text/markdown")
     : 0;
   const htmlQuality = explicitAcceptQuality(accept, "text/html");
 
-  if (markdownQuality > 0 && markdownQuality >= htmlQuality) {
-    return "text/markdown; charset=utf-8";
-  }
-  if (plainQuality > 0 && htmlQuality === 0 && markdownQuality === 0) {
-    return "text/plain; charset=utf-8";
+  return plainQuality > Math.max(markdownQuality, htmlQuality);
+}
+
+function removeDisabledDiscoveryHeaders(response: Response): Response {
+  if (!agentRouteConfig.enabled || !agentRouteConfig.discoveryHeaders) {
+    for (const name of ["link", "x-publishos-llms", "x-publishos-sitemap"])
+      response.headers.delete(name);
   }
-  return undefined;
+  return response;
 }
 
 function looksLikeAgent(request: NextRequest): boolean {
   if (!TEXT_METHODS.has(request.method)) return false;
   if (!agentRouteConfig.agentDetection) return false;
-  if (explicitAcceptQuality(request.headers.get("accept") ?? "", "text/html")) {
-    return false;
+  return isMarkdownClient(request.headers.get("user-agent") ?? "");
+}
+
+function mergeVary(response: Response, values: string[]): void {
+  const existing = (response.headers.get("vary") ?? "")
+    .split(",")
+    .map((value) => value.trim())
+    .filter(Boolean);
+  if (existing.some((value) => value === "*")) return;
+  const merged = [...existing];
+  for (const value of values) {
+    if (!merged.some((item) => item.toLowerCase() === value.toLowerCase()))
+      merged.push(value);
   }
-  return AGENT_USER_AGENT_PATTERN.test(request.headers.get("user-agent") ?? "");
+  if (merged.length) response.headers.set("vary", merged.join(", "));
+}
+
+function negotiationVary(): string[] {
+  if (!agentRouteConfig.enabled || !agentRouteConfig.markdownAccept) return [];
+  return ["Accept", ...(agentRouteConfig.agentDetection ? ["User-Agent"] : [])];
+}
+
+function isNextNavigationRequest(request: NextRequest): boolean {
+  return [
+    "rsc",
+    "next-router-prefetch",
+    "next-router-state-tree",
+    "next-router-segment-prefetch",
+  ].some((name) => request.headers.has(name));
 }
 
 function markdownRequestReason(
   request: NextRequest,
-): "accept" | "agent" | "extension" | undefined {
+): "accept" | "extension" | undefined {
   if (!agentRouteConfig.enabled) return undefined;
+  if (!TEXT_METHODS.has(request.method) || isNextNavigationRequest(request))
+    return undefined;
   if (
     agentRouteConfig.markdownRoutes &&
     request.nextUrl.pathname.endsWith(".md")
   ) {
-    return "extension";
+    let decoded: string;
+    try {
+      decoded = normalizePagePath(
+        decodeURIComponent(request.nextUrl.pathname),
+      ).normalize("NFC");
+    } catch {
+      decoded = request.nextUrl.pathname;
+    }
+    if (!PUBLIC_PATHS.has(decoded)) return "extension";
   }
-  if (negotiatedTextType(request)) return "accept";
-  if (looksLikeAgent(request)) return "agent";
+  const selectedType = negotiatedTextType(request);
+  if (selectedType === "text/markdown; charset=utf-8") return "accept";
   return undefined;
 }
 
@@ -171,14 +247,14 @@ function rewriteToMarkdown({
   requestHeaders,
 }: {
   request: NextRequest;
-  reason: "accept" | "agent" | "extension";
+  reason: "accept" | "extension";
   requestHeaders: Headers;
 }): NextResponse {
   const url = new URL(request.url);
   url.pathname =
     normalizePagePath(url.pathname) === "/"
-      ? "/sitemap.md"
-      : markdownRoutePath(url.pathname);
+      ? rootMarkdownSitemapPath(url)
+      : markdownRoutePath(url.pathname, reason);
   const revision = request.nextUrl.searchParams.get("publishos_revision");
   url.search = "";
   url.hash = "";
@@ -195,20 +271,25 @@ function rewriteToMarkdown({
     userAgent: request.headers.get("user-agent") ?? undefined,
   });
 
-  return NextResponse.rewrite(url, {
+  const response = NextResponse.rewrite(url, {
     request: {
       headers: requestHeaders,
     },
   });
+  if (reason !== "extension") mergeVary(response, negotiationVary());
+  return response;
 }
 
 function withDiscoveryHeaders(
   response: NextResponse,
   pathname: string,
 ): NextResponse {
+  mergeVary(response, negotiationVary());
   const markdownUrl = markdownAlternatePath(pathname);
   const links = [
-    `<${markdownUrl}>; rel="alternate"; type="text/markdown"`,
+    agentRouteConfig.markdownRoutes
+      ? `<${markdownUrl}>; rel="alternate"; type="text/markdown"`
+      : undefined,
     agentRouteConfig.discoveryLinks.llms
       ? `<${agentRouteConfig.discoveryLinks.llms}>; rel="llms-txt"; type="text/plain"`
       : undefined,
@@ -216,8 +297,9 @@ function withDiscoveryHeaders(
       ? `<${agentRouteConfig.discoveryLinks.sitemap}>; rel="alternate"; type="text/markdown"; title="Markdown sitemap"`
       : undefined,
   ].filter((link): link is string => Boolean(link));
-  response.headers.set("link", links.join(", "));
-  response.headers.set("x-publishos-markdown", markdownUrl);
+  if (links.length) response.headers.set("link", links.join(", "));
+  if (agentRouteConfig.markdownRoutes)
+    response.headers.set("x-publishos-markdown", markdownUrl);
   if (agentRouteConfig.discoveryLinks.llms) {
     response.headers.set(
       "x-publishos-llms",
@@ -283,10 +365,13 @@ export function proxy(request: NextRequest) {
   if (markdownReason) {
     let htmlPath: string | undefined;
     try {
-      const decoded = normalizePagePath(decodeURIComponent(pathname));
-      htmlPath = decoded.endsWith(".md")
-        ? decoded.slice(0, -3) || "/"
-        : decoded;
+      const decoded = normalizePagePath(decodeURIComponent(pathname)).normalize(
+        "NFC",
+      );
+      htmlPath =
+        markdownReason === "extension" && decoded.endsWith(".md")
+          ? decoded.slice(0, -3) || "/"
+          : decoded;
     } catch {
       htmlPath = undefined;
     }
@@ -296,7 +381,7 @@ export function proxy(request: NextRequest) {
     });
     const hasArtifact =
       htmlPath === "/"
-        ? OUTPUT_PATHS.has("/sitemap.md")
+        ? OUTPUT_PATHS.has(rootMarkdownSitemapPath(new URL(request.url)))
         : htmlPath !== undefined && MARKDOWN_PATHS.has(htmlPath);
     if (!scope || !hasArtifact) {
       const response = createNotFoundTextResponse({
@@ -307,16 +392,7 @@ export function proxy(request: NextRequest) {
           markdownReason === "accept" ? negotiatedTextType(request) : undefined,
         vary: markdownReason !== "extension",
       });
-      if (!agentRouteConfig.enabled || !agentRouteConfig.discoveryHeaders) {
-        for (const name of [
-          "link",
-          "x-publishos-llms",
-          "x-publishos-sitemap",
-        ]) {
-          response.headers.delete(name);
-        }
-      }
-      return response;
+      return removeDisabledDiscoveryHeaders(response);
     }
     return rewriteToMarkdown({
       request,
@@ -327,7 +403,7 @@ export function proxy(request: NextRequest) {
 
   let pagePath: string;
   try {
-    pagePath = normalizePagePath(decodeURIComponent(pathname));
+    pagePath = normalizePagePath(decodeURIComponent(pathname)).normalize("NFC");
   } catch {
     pagePath = pathname;
   }
@@ -337,6 +413,17 @@ export function proxy(request: NextRequest) {
       scopes: agentRouteConfig.notFoundScopes,
       pathname,
     });
+    if (negotiatedPlainNotFound(request)) {
+      return removeDisabledDiscoveryHeaders(
+        createNotFoundTextResponse({
+          scope,
+          pathname,
+          method: request.method,
+          contentType: "text/plain; charset=utf-8",
+          vary: true,
+        }),
+      );
+    }
     requestHeaders.set(NOT_FOUND_SCOPE_HEADER, scope?.id ?? "none");
     const url = new URL(request.url);
     url.pathname = "/_not-found";
@@ -365,6 +452,17 @@ export function proxy(request: NextRequest) {
     return response;
   }
 
+  if (
+    agentRouteConfig.enabled &&
+    TEXT_METHODS.has(request.method) &&
+    !isNextNavigationRequest(request) &&
+    !negotiatedTextType(request)
+  ) {
+    const response = new NextResponse(null, { status: 406 });
+    mergeVary(response, negotiationVary());
+    return response;
+  }
+
   if (!agentRouteConfig.enabled || !agentRouteConfig.discoveryHeaders) {
     debugAgentRoute("pass", {
       method: request.method,
@@ -373,7 +471,11 @@ export function proxy(request: NextRequest) {
         ? "discovery-disabled"
         : "agent-routes-disabled",
     });
-    return NextResponse.next({ request: { headers: requestHeaders } });
+    const response = NextResponse.next({
+      request: { headers: requestHeaders },
+    });
+    mergeVary(response, negotiationVary());
+    return response;
   }
 
   debugAgentRoute("html", {

package/dist/{build-operation-5QMLXF7N.js → build-operation-CJDUL4OW.js}

@@ -7,18 +7,18 @@ import {
 } from "./chunk-IL4RJOKI.js";
 import {
   prepareIdeSupport
-} from "./chunk-GBPLER5H.js";
+} from "./chunk-3T4HVDSC.js";
 import "./chunk-6D2E6UMD.js";
 import {
   composeFrameworkSource
-} from "./chunk-OXOFRXEI.js";
+} from "./chunk-NHSLTARU.js";
 import {
   validateLocalSource
-} from "./chunk-ORIUWJBQ.js";
+} from "./chunk-SBMDONTV.js";
 import "./chunk-NNBJZPFM.js";
-import "./chunk-F3AGNDF4.js";
+import "./chunk-DZ3VWEV5.js";
 import "./chunk-7NY22B5U.js";
-import "./chunk-UYGCOWRF.js";
+import "./chunk-DX7PXFCM.js";
 import "./chunk-EFO6AWXN.js";
 import "./chunk-5KAD7W53.js";
 import "./chunk-WL75GQ5M.js";

package/dist/{chunk-GBPLER5H.js → chunk-3T4HVDSC.js}

@@ -5,14 +5,14 @@ import {
 } from "./chunk-6D2E6UMD.js";
 import {
   createIdeSourceArtifacts
-} from "./chunk-OXOFRXEI.js";
+} from "./chunk-NHSLTARU.js";
 import {
   assertFrameworkSelection,
   readCheckoutTypeScriptConfig
 } from "./chunk-NNBJZPFM.js";
 import {
   supportedNextjsSourceImports
-} from "./chunk-UYGCOWRF.js";
+} from "./chunk-DX7PXFCM.js";
 import {
   runtimePackageVersion
 } from "./chunk-AI2UULNX.js";