@ampless/runtime 1.0.0-alpha.13 → 1.0.0-alpha.15

package/README.ja.md

@@ -34,10 +34,10 @@ export const ampless = createAmpless({
 })
 ```
 
-`app/site/[siteId]/` 以下のルートとディスパッチャーはワンライナーのファクトリー呼び出しになります：
+`app/` 直下のルートとディスパッチャーはワンライナーのファクトリー呼び出しになります：
 
 ```ts
-// app/site/[siteId]/page.tsx
+// app/page.tsx
 import { ampless } from '@/lib/ampless'
 import {
   createThemeHomeDispatcher,
@@ -50,7 +50,7 @@ export default createThemeHomeDispatcher(ampless)
 ```
 
 ```ts
-// app/site/[siteId]/og/[slug]/route.ts
+// app/og/[slug]/route.ts
 import { ampless } from '@/lib/ampless'
 import { createOgRouteHandler } from '@ampless/runtime/routes'
 
@@ -59,17 +59,43 @@ export const dynamic = 'force-dynamic'
 export const GET = createOgRouteHandler(ampless)
 ```
 
-ミドルウェア：
+ミドルウェア（proxy）：
 
 ```ts
-// middleware.ts
+// proxy.ts （Next.js 16 で middleware.ts から改名）
 import cmsConfig from './cms.config'
-import { createAmplessMiddleware, defaultMatcherConfig } from '@ampless/runtime/middleware'
+import outputs from './amplify_outputs.json'
+import { createAmplessMiddleware } from '@ampless/runtime/middleware'
 
-export const middleware = createAmplessMiddleware({ cmsConfig })
-export const config = defaultMatcherConfig
+export const proxy = createAmplessMiddleware({
+  cmsConfig,
+  appsyncUrl: outputs.data.url,
+  apiKey: outputs.data.api_key!,
+})
+
+// matcher はインライン定義 — Next.js 16 の Turbopack は `export const config`
+// が静的オブジェクトリテラルであることを要求します。
+export const config = {
+  matcher: [
+    '/((?!admin|api|login|_next/static|_next/image|favicon\\.ico|amplify_outputs\\.json).*)',
+  ],
+}
 ```
 
+middleware はリクエストごとに AppSync から `post.format` /
+`post.metadata` / `post.updatedAt` を取得（apiKey 認証）し、slug をキー
+にした 200 エントリの LRU（60 秒 TTL、Lambda モジュールスコープ）で
+キャッシュした上で、適切な内部ハンドラーにリクエストを書き換えます。
+
+- 通常の投稿 → 書き換えなし、`app/[slug]/page.tsx` で配信
+- `metadata.no_layout: true` HTML / `format: 'static'` → `/r/<slug>(/<path>)`、
+  `app/r/[slug]/[[...path]]/route.ts` で配信
+
+また、`post.metadata.cache`（auto / deep / hot）+ `post.updatedAt` +
+`cms.config.cache.{cooldownMs, freshTtlSeconds, deepTtlSeconds}` から
+`Cache-Control` を算出してレスポンスに付与します。キャッシュ戦略の
+契約については `docs/CONTENT.md` を参照してください。
+
 ## サブパス
 
 - `@ampless/runtime` — `createAmpless`、ランタイム型、`renderBody`・`renderThemeCss`・フォーマットコンバーターの再エクスポート

package/README.md

@@ -34,10 +34,10 @@ export const ampless = createAmpless({
 })
 ```
 
-Routes and dispatchers under `app/site/[siteId]/` become one-line factory invocations:
+Routes and dispatchers under `app/` become one-line factory invocations:
 
 ```ts
-// app/site/[siteId]/page.tsx
+// app/page.tsx
 import { ampless } from '@/lib/ampless'
 import {
   createThemeHomeDispatcher,
@@ -50,7 +50,7 @@ export default createThemeHomeDispatcher(ampless)
 ```
 
 ```ts
-// app/site/[siteId]/og/[slug]/route.ts
+// app/og/[slug]/route.ts
 import { ampless } from '@/lib/ampless'
 import { createOgRouteHandler } from '@ampless/runtime/routes'
 
@@ -59,17 +59,43 @@ export const dynamic = 'force-dynamic'
 export const GET = createOgRouteHandler(ampless)
 ```
 
-Middleware:
+Middleware (proxy):
 
 ```ts
-// middleware.ts
+// proxy.ts (Next.js 16 rename of middleware.ts)
 import cmsConfig from './cms.config'
-import { createAmplessMiddleware, defaultMatcherConfig } from '@ampless/runtime/middleware'
+import outputs from './amplify_outputs.json'
+import { createAmplessMiddleware } from '@ampless/runtime/middleware'
 
-export const middleware = createAmplessMiddleware({ cmsConfig })
-export const config = defaultMatcherConfig
+export const proxy = createAmplessMiddleware({
+  cmsConfig,
+  appsyncUrl: outputs.data.url,
+  apiKey: outputs.data.api_key!,
+})
+
+// Inline the matcher — Next.js 16's Turbopack requires
+// `export const config` to be a static object literal.
+export const config = {
+  matcher: [
+    '/((?!admin|api|login|_next/static|_next/image|favicon\\.ico|amplify_outputs\\.json).*)',
+  ],
+}
 ```
 
+The middleware fetches `post.format` / `post.metadata` / `post.updatedAt`
+from AppSync (apiKey auth) on each request, caches the result in a
+200-entry LRU keyed by slug (60-second TTL, Lambda module scope), and
+rewrites the request to the right internal handler:
+
+- themed post → no rewrite, served by `app/[slug]/page.tsx`
+- `metadata.no_layout: true` HTML / `format: 'static'` → `/r/<slug>(/<path>)`,
+  served by `app/r/[slug]/[[...path]]/route.ts`
+
+It also computes `Cache-Control` from `post.metadata.cache` (auto /
+deep / hot) + `post.updatedAt` + `cms.config.cache.{cooldownMs,
+freshTtlSeconds, deepTtlSeconds}` and sets the header on the response.
+See `docs/CONTENT.md` for the cache strategy contract.
+
 ## Sub-paths
 
 - `@ampless/runtime` — `createAmpless`, runtime types, and re-exports of `renderBody`, `renderThemeCss`, format converters

package/dist/dispatchers/index.d.ts

@@ -4,9 +4,7 @@ import { Ampless } from '../index.js';
 import 'ampless';
 
 interface Props$2 {
-    params: Promise<{
-        siteId: string;
-    }>;
+    params: Promise<Record<string, never>>;
 }
 type ThemeHomeDispatcher = (props: Props$2) => Promise<ReactNode>;
 type ThemeHomeMetadata = (props: Props$2) => Promise<Metadata>;
@@ -21,39 +19,23 @@ declare function createThemeHomeMetadata(ampless: Ampless): ThemeHomeMetadata;
 
 interface Props$1 {
     params: Promise<{
-        siteId: string;
         slug: string;
     }>;
 }
 type ThemePostDispatcher = (props: Props$1) => Promise<ReactNode>;
 type ThemePostMetadata = (props: Props$1) => Promise<Metadata>;
 /**
- * Post page dispatcher. Resolves the active theme and renders the
- * theme's `components.Post` server component.
- *
- * Before delegating, the dispatcher peeks at the post's data and
- * 308-redirects to `/_/<slug>` for both formats that need to bypass
- * the theme's post page:
- *
- *  - `metadata.no_layout === true` — the body is its own complete
- *    HTML document and ships as the entire response. The unified
- *    route handler at `/_/<slug>` emits the body verbatim.
- *  - `format === 'static'` — the body is a manifest pointing at a
- *    bundle of files in S3. The unified route handler then 308s
- *    again to `/_/<slug>/` (trailing slash) so relative paths inside
- *    the bundle resolve correctly.
- *
- * Why the redirect lands on `/_/<slug>` rather than `/_/<slug>/` for
- * static posts: trailing-slash anchoring is the unified route
- * handler's responsibility — keeps the dispatcher format-agnostic
- * and the public URL pattern symmetric (no_layout and static both
- * settle on `/_/<slug>(/...)`). One extra 308 round-trip is cheap;
- * it deduplicates the trailing-slash branch into a single place.
+ * Themed post page dispatcher. Resolves the active theme and renders
+ * the theme's `components.Post` server component.
  *
- * The metadata peek is an extra AppSync call before theme resolve,
- * but it's the same query the theme's Post component would make
- * anyway; AppSync's query-level dedupe within a single request keeps
- * the wire cost flat in practice.
+ * Routing decision (no_layout HTML vs static bundle vs themed) lives
+ * in middleware. Middleware fetches `post.format` / `post.metadata` /
+ * `post.updatedAt` from AppSync once per slug (Lambda-memory LRU, 60s
+ * TTL) and rewrites the request to either this dispatcher (themed
+ * render) or the unified route handler at `/r/<slug>(/...)` (no_layout
+ * HTML or static bundle). That keeps the decision in one place and
+ * avoids the dispatcher's extra AppSync round-trip when the post is a
+ * themed render.
  *
  * If the theme doesn't declare a Post component at all, returns
  * Next.js's notFound() (404).
@@ -64,7 +46,6 @@ declare function createThemePostMetadata(ampless: Ampless): ThemePostMetadata;
 
 interface Props {
     params: Promise<{
-        siteId: string;
         tag: string;
     }>;
 }

package/dist/dispatchers/index.js

@@ -15,14 +15,9 @@ function createThemeHomeMetadata(ampless) {
 }
 
 // src/dispatchers/post.ts
-import { notFound, redirect } from "next/navigation";
+import { notFound } from "next/navigation";
 function createThemePostDispatcher(ampless) {
   return async function SitePostDispatcher({ params }) {
-    const { slug } = await params;
-    const post = await ampless.getPublishedPost(slug);
-    if (post?.metadata?.no_layout === true || post?.format === "static") {
-      redirect(`/_/${slug}`);
-    }
     const { module } = await ampless.resolveActiveTheme();
     const Post = module.components.Post;
     if (!Post) notFound();

package/dist/index.d.ts

@@ -34,6 +34,12 @@ interface PublicPostShape {
     publishedAt?: string | null;
     tags?: Array<string | null> | null;
     metadata?: unknown;
+    /**
+     * ISO 8601 timestamp from DynamoDB's auto-managed `updatedAt`.
+     * Surfaced through the `PublicPost` projection so middleware can
+     * compute the `metadata.cache='auto'` cooldown.
+     */
+    updatedAt?: string | null;
 }
 interface PublicPostConnectionShape {
     items?: Array<PublicPostShape | null> | null;

package/dist/index.js

@@ -37,7 +37,8 @@ function toCorePost(p) {
     status: p.status ?? "draft",
     publishedAt: p.publishedAt ?? void 0,
     tags: (p.tags ?? []).filter((t) => typeof t === "string"),
-    metadata: decodeMetadata(p.metadata)
+    metadata: decodeMetadata(p.metadata),
+    updatedAt: p.updatedAt ?? void 0
   };
 }
 function createPostsApi(outputs) {

package/dist/middleware.d.ts

@@ -1,37 +1,47 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { Config } from 'ampless';
+import { Config, PostMetadata } from 'ampless';
 
+declare const runtime = "nodejs";
 interface CreateMiddlewareOpts {
     cmsConfig: Config;
+    /** AppSync GraphQL endpoint URL (from `amplify_outputs.json` `data.url`). */
+    appsyncUrl: string;
+    /** Public API key for the AppSync endpoint (from `amplify_outputs.json` `data.api_key`). */
+    apiKey: string;
 }
-type MiddlewareFn = (request: NextRequest) => NextResponse;
+type MiddlewareFn = (request: NextRequest) => Promise<NextResponse>;
+declare function _resetFlagCache(): void;
+/**
+ * Compute the `Cache-Control` header for a post response. The
+ * strategy lives on `post.metadata.cache`; absent (or 'auto') falls
+ * back to cooldown-by-edit-time logic. See `CacheStrategy` /
+ * `CacheConfig` in ampless types for the semantic contract.
+ */
+declare function computeCacheControl(flags: {
+    metadata: PostMetadata | null;
+    updatedAt: string;
+}, cmsConfig: Config): string;
 /**
  * Build the ampless public-site middleware. Performs:
  *
- *  - `/path` → `/site/default/path` internal rewrite
- *  - `/_/<slug>(/...)` → `/site/default/r/<slug>(/...)` rewrite for
- *    the unified bare-HTML / static-bundle route
- *  - `?previewTheme=<name>` → `x-preview-theme` header forwarding
- *
- * Bare-HTML / static routing is data-driven: the theme post dispatcher
- * redirects `metadata.no_layout` and `format='static'` posts to
- * `/_/<slug>`. The middleware rewrites the public `_` prefix to the
- * routable internal folder name `r/`, because Next.js's App Router
- * excludes any path part starting with `_` during route discovery
- * (see `recursive-readdir` + `ignorePartFilter` in
- * `next/dist/build/route-discovery.js`). The browser URL stays
- * `/_/<slug>(/...)`; only the rewrite target uses `r/`.
- *
- * Single site per Amplify deployment: the rewritten internal path uses
- * the fixed `default` segment. The internal `/site/[siteId]/` routing
- * tree is retained as an implementation detail; a follow-up PR
- * flattens the URL structure further.
+ *  - AppSync flag fetch (`format` / `metadata` / `updatedAt`) per
+ *    slug, with a 200-entry LRU keyed by slug, 60s TTL. Hot slugs
+ *    cost zero queries for the cache lifetime.
+ *  - Rewrite to `/r/<slug>(/<path>)` when the post is no_layout HTML
+ *    (`format=html` + `metadata.no_layout=true`) or a static bundle
+ *    (`format='static'`). Themed posts (default) get no rewrite —
+ *    `app/[slug]/page.tsx` serves them directly.
+ *  - `Cache-Control` header computed from `post.metadata.cache` +
+ *    `post.updatedAt` + `cms.config.cache.*` and set on the response.
+ *  - `?previewTheme` / `?previewColorScheme` → `x-preview-theme` /
+ *    `x-preview-color-scheme` header forwarding for the admin's
+ *    iframe-based theme preview.
  */
-declare function createAmplessMiddleware(_opts: CreateMiddlewareOpts): MiddlewareFn;
+declare function createAmplessMiddleware(opts: CreateMiddlewareOpts): MiddlewareFn;
 /**
  * Reference matcher config — admin / api / login / static assets /
  * amplify_outputs.json are excluded so middleware doesn't rewrite
- * legitimate non-blog routes into the public site tree.
+ * legitimate non-blog routes.
  *
  * **You can't re-export this directly.** Next.js 16's Turbopack
  * requires `export const config` in `proxy.ts` (or `middleware.ts`)
@@ -48,4 +58,4 @@ declare const defaultMatcherConfig: {
     matcher: string[];
 };
 
-export { type CreateMiddlewareOpts, type MiddlewareFn, createAmplessMiddleware, defaultMatcherConfig };
+export { type CreateMiddlewareOpts, type MiddlewareFn, _resetFlagCache, computeCacheControl, createAmplessMiddleware, defaultMatcherConfig, runtime };

package/dist/middleware.js

@@ -1,22 +1,190 @@
 // src/middleware.ts
 import { NextResponse } from "next/server";
-var INTERNAL_SITE_SEGMENT = "default";
-function createAmplessMiddleware(_opts) {
-  return function middleware(request) {
-    const url = request.nextUrl.clone();
-    if (!url.pathname.startsWith("/site/")) {
-      let tail = url.pathname === "/" ? "" : url.pathname;
-      if (tail === "/_" || tail.startsWith("/_/")) {
-        tail = `/r${tail.slice(2)}`;
+var runtime = "nodejs";
+var FLAG_CACHE_MAX = 200;
+var FLAG_CACHE_TTL_MS = 6e4;
+var FLAG_CACHE = /* @__PURE__ */ new Map();
+function cacheGet(slug) {
+  const hit = FLAG_CACHE.get(slug);
+  if (!hit) return void 0;
+  if (hit.expires < Date.now()) {
+    FLAG_CACHE.delete(slug);
+    return void 0;
+  }
+  FLAG_CACHE.delete(slug);
+  FLAG_CACHE.set(slug, hit);
+  return hit.value;
+}
+function cacheSet(slug, value) {
+  if (FLAG_CACHE.size >= FLAG_CACHE_MAX) {
+    const oldest = FLAG_CACHE.keys().next().value;
+    if (oldest !== void 0) FLAG_CACHE.delete(oldest);
+  }
+  FLAG_CACHE.set(slug, { value, expires: Date.now() + FLAG_CACHE_TTL_MS });
+}
+function _resetFlagCache() {
+  FLAG_CACHE.clear();
+}
+async function fetchFlags(opts, slug) {
+  const query = `query MiddlewareFlags($slug: String!) {
+    getPublishedPost(slug: $slug) { format metadata updatedAt }
+  }`;
+  let res;
+  try {
+    res = await fetch(opts.appsyncUrl, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "x-api-key": opts.apiKey
+      },
+      body: JSON.stringify({ query, variables: { slug } })
+    });
+  } catch (err) {
+    console.error("[ampless-middleware] AppSync fetch failed", err);
+    return null;
+  }
+  if (!res.ok) {
+    console.error(
+      `[ampless-middleware] AppSync returned ${res.status} for slug=${slug}`
+    );
+    return null;
+  }
+  let body;
+  try {
+    body = await res.json();
+  } catch (err) {
+    console.error("[ampless-middleware] AppSync JSON parse failed", err);
+    return null;
+  }
+  if (body.errors && body.errors.length > 0) {
+    console.error(
+      "[ampless-middleware] AppSync errors",
+      body.errors.map((e) => e.message)
+    );
+    return null;
+  }
+  const post = body.data?.getPublishedPost;
+  if (!post) return null;
+  let metadata = null;
+  if (post.metadata) {
+    try {
+      const parsed = typeof post.metadata === "string" ? JSON.parse(post.metadata) : post.metadata;
+      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+        metadata = parsed;
       }
-      url.pathname = `/site/${INTERNAL_SITE_SEGMENT}${tail}`;
+    } catch (err) {
+      console.error(
+        `[ampless-middleware] metadata parse failed for slug=${slug}`,
+        err
+      );
+      metadata = null;
     }
+  }
+  return {
+    format: post.format ?? "markdown",
+    metadata,
+    updatedAt: post.updatedAt ?? ""
+  };
+}
+async function getCachedFlags(opts, slug) {
+  const cached = cacheGet(slug);
+  if (cached !== void 0) return cached;
+  const fresh = await fetchFlags(opts, slug);
+  cacheSet(slug, fresh);
+  return fresh;
+}
+var DEFAULT_COOLDOWN_MS = 60 * 60 * 1e3;
+var DEFAULT_FRESH_TTL_SECONDS = 300;
+var DEFAULT_DEEP_TTL_SECONDS = 60 * 60;
+var NO_STORE = "public, max-age=0, must-revalidate, s-maxage=0";
+function computeCacheControl(flags, cmsConfig) {
+  const cache = cmsConfig.cache ?? {};
+  const strategy = flags.metadata?.cache ?? "auto";
+  if (strategy === "hot") return NO_STORE;
+  if (strategy === "deep") {
+    const ttl = cache.deepTtlSeconds ?? DEFAULT_DEEP_TTL_SECONDS;
+    return `public, max-age=${ttl}, s-maxage=${ttl}`;
+  }
+  const cooldownMs = cache.cooldownMs ?? DEFAULT_COOLDOWN_MS;
+  const freshTtl = cache.freshTtlSeconds ?? DEFAULT_FRESH_TTL_SECONDS;
+  const updatedMs = flags.updatedAt ? Date.parse(flags.updatedAt) : NaN;
+  if (Number.isFinite(updatedMs)) {
+    const ageMs = Date.now() - updatedMs;
+    if (ageMs < cooldownMs) return NO_STORE;
+  }
+  return `public, max-age=${freshTtl}, s-maxage=${freshTtl}`;
+}
+var RESERVED_PREFIXES = /* @__PURE__ */ new Set([
+  "admin",
+  "api",
+  "login",
+  "_next",
+  "favicon.ico",
+  "robots.txt",
+  "amplify_outputs.json",
+  // route handler folders that live alongside `app/[slug]/page.tsx`
+  "feed.xml",
+  "sitemap.xml",
+  "og",
+  "tag",
+  // internal rewrite target — direct hits should not be middleware-driven
+  "r"
+]);
+function createAmplessMiddleware(opts) {
+  return async function middleware(request) {
+    const url = request.nextUrl.clone();
     const previewTheme = url.searchParams.get("previewTheme");
     const previewColorScheme = url.searchParams.get("previewColorScheme");
     const requestHeaders = new Headers(request.headers);
     if (previewTheme) requestHeaders.set("x-preview-theme", previewTheme);
-    if (previewColorScheme) requestHeaders.set("x-preview-color-scheme", previewColorScheme);
-    return NextResponse.rewrite(url, { request: { headers: requestHeaders } });
+    if (previewColorScheme) {
+      requestHeaders.set("x-preview-color-scheme", previewColorScheme);
+    }
+    const passthrough = () => NextResponse.next({ request: { headers: requestHeaders } });
+    const segments = url.pathname.split("/").filter(Boolean);
+    if (segments.length === 0) {
+      return passthrough();
+    }
+    const slug = segments[0];
+    if (RESERVED_PREFIXES.has(slug)) {
+      return passthrough();
+    }
+    const restPath = segments.slice(1);
+    const flags = await getCachedFlags(opts, slug);
+    if (!flags) {
+      if (restPath.length > 0) {
+        return new NextResponse("Not Found", { status: 404 });
+      }
+      return passthrough();
+    }
+    const cacheControl = computeCacheControl(flags, opts.cmsConfig);
+    let response;
+    if (restPath.length === 0) {
+      if (flags.format === "html" && flags.metadata?.no_layout === true) {
+        url.pathname = `/r/${slug}`;
+        response = NextResponse.rewrite(url, {
+          request: { headers: requestHeaders }
+        });
+      } else if (flags.format === "static") {
+        url.pathname = `/r/${slug}`;
+        response = NextResponse.rewrite(url, {
+          request: { headers: requestHeaders }
+        });
+      } else {
+        response = passthrough();
+      }
+    } else {
+      if (flags.format === "static") {
+        url.pathname = `/r/${slug}/${restPath.join("/")}`;
+        response = NextResponse.rewrite(url, {
+          request: { headers: requestHeaders }
+        });
+      } else {
+        return new NextResponse("Not Found", { status: 404 });
+      }
+    }
+    response.headers.set("Cache-Control", cacheControl);
+    return response;
   };
 }
 var defaultMatcherConfig = {
@@ -25,6 +193,9 @@ var defaultMatcherConfig = {
   ]
 };
 export {
+  _resetFlagCache,
+  computeCacheControl,
   createAmplessMiddleware,
-  defaultMatcherConfig
+  defaultMatcherConfig,
+  runtime
 };

package/dist/routes/index.d.ts

@@ -4,7 +4,6 @@ import 'next';
 
 interface Ctx$3 {
     params: Promise<{
-        siteId: string;
         slug: string;
     }>;
 }
@@ -12,9 +11,7 @@ type OgRouteHandler = (req: Request, ctx: Ctx$3) => Promise<Response>;
 declare function createOgRouteHandler(ampless: Ampless): OgRouteHandler;
 
 interface Ctx$2 {
-    params: Promise<{
-        siteId: string;
-    }>;
+    params: Promise<Record<string, never>>;
 }
 type SitemapRouteHandler = (req: Request, ctx: Ctx$2) => Promise<Response>;
 /**
@@ -25,9 +22,7 @@ type SitemapRouteHandler = (req: Request, ctx: Ctx$2) => Promise<Response>;
 declare function createSitemapRouteHandler(ampless: Ampless): SitemapRouteHandler;
 
 interface Ctx$1 {
-    params: Promise<{
-        siteId: string;
-    }>;
+    params: Promise<Record<string, never>>;
 }
 type FeedRouteHandler = (req: Request, ctx: Ctx$1) => Promise<Response>;
 /**
@@ -45,42 +40,46 @@ interface Ctx {
 }
 type UnderscoreRouteHandler = (req: Request, ctx: Ctx) => Promise<Response>;
 /**
- * Unified `/_/<slug>(/...)` route handler.
+ * Unified internal route handler for no_layout HTML and static bundle
+ * posts. Mounted at `app/r/[slug]/[[...path]]/route.ts`; reached via
+ * middleware rewrite from the public `/<slug>(/<path>)` URL, never
+ * directly.
  *
- * The public URL prefix `/_/` is reserved for two related cases that
- * both need to bypass the theme's post page:
+ * Two cases that both need to bypass the themed post page:
  *
  *  1. `format: 'html'` posts with `metadata.no_layout === true` — the
  *     body is its own complete HTML document and ships as the entire
- *     response. URL: `/_/<slug>` (no trailing slash, no extra path).
+ *     response. Reached via middleware rewrite of `/<slug>`.
  *  2. `format: 'static'` posts — the body is a manifest describing a
  *     bundle of files in S3 at `public/static/<slug>/`. The bundle's
- *     entrypoint is served at `/_/<slug>/`, every internal file at
- *     `/_/<slug>/<relative-path>`.
+ *     entrypoint is served at `/<slug>/`, every internal file at
+ *     `/<slug>/<relative-path>` (middleware rewrites both to
+ *     `/r/<slug>/...`).
  *
  * Routing model:
- *   - File location: `app/site/[siteId]/r/[slug]/[[...path]]/route.ts`.
- *     The literal folder is `r/` (not `_/`) because Next.js's App
- *     Router skips any path part starting with `_` during route
- *     discovery (see `recursive-readdir` + `ignorePartFilter` in
- *     next/dist/build/route-discovery.js). Middleware rewrites the
- *     public `/_/` prefix to `/r/` internally; the public URL stays
- *     `/_/<slug>(/...)`.
+ *   - File location: `app/r/[slug]/[[...path]]/route.ts`. The literal
+ *     folder is `r/` (not `_/` etc.) because Next.js's App Router
+ *     skips any path part starting with `_` during route discovery
+ *     (see `recursive-readdir` + `ignorePartFilter` in
+ *     next/dist/build/route-discovery.js). The `r/` prefix is an
+ *     internal filesystem detail — the public URL stays `/<slug>(/...)`.
  *   - `params.path` is `undefined` (or `[]`) for single-segment
- *     requests `/_/<slug>`, an array of remaining segments otherwise.
+ *     requests, an array of remaining segments otherwise.
  *
- * Trailing-slash responsibility lives here, not in the dispatcher:
- * the dispatcher redirects `format='static'` posts to `/_/<slug>`,
- * and this handler then 308-redirects to `/_/<slug>/` to anchor
- * relative paths inside the bundle. Same anchoring reason as the
- * legacy static route's behaviour — `<img src="img.png">` must resolve
- * to `/_/<slug>/img.png`, not the site root.
+ * Trailing-slash responsibility lives here. For static bundles the
+ * handler 308-redirects `/<slug>` to `/<slug>/` so relative asset
+ * paths inside the bundle resolve correctly — `<img src="img.png">`
+ * must resolve to `/<slug>/img.png`, not the site root.
  *
  * Trust model: no_layout HTML bodies are emitted verbatim, same trust
  * shape as `format: 'html'` post bodies on the regular path. Static
  * bundle assets are served via short-lived S3 presigned URLs; the
  * bucket stays private. See docs/architecture/04-access-layer-mcp.md
  * §"editor の信頼モデル".
+ *
+ * Cache-Control: deliberately omitted from the responses here.
+ * Middleware computes the strategy from `metadata.cache` +
+ * `post.updatedAt` and sets the header on the rewritten response.
  */
 declare function createUnderscoreRouteHandler(ampless: Ampless): UnderscoreRouteHandler;
 

package/dist/routes/index.js

@@ -85,8 +85,9 @@ function createUnderscoreRouteHandler(ampless) {
         return new Response(ampless.renderBody(post), {
           status: 200,
           headers: {
-            "Content-Type": "text/html; charset=utf-8",
-            "Cache-Control": "public, max-age=300"
+            "Content-Type": "text/html; charset=utf-8"
+            // Cache-Control set by middleware (cache strategy depends on
+            // post.metadata.cache + post.updatedAt).
           }
         });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampless/runtime",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.15",
   "description": "Public-side runtime for ampless: post fetching, theme dispatch, middleware, public route handlers",
   "license": "MIT",
   "type": "module",
@@ -49,8 +49,8 @@
     "lucide-react": "^1.16.0",
     "marked": "^14.1.4",
     "tailwind-merge": "^3.6.0",
-    "ampless": "1.0.0-alpha.9",
-    "@ampless/plugin-og-image": "0.2.0-alpha.9"
+    "ampless": "1.0.0-alpha.11",
+    "@ampless/plugin-og-image": "0.2.0-alpha.11"
   },
   "peerDependencies": {
     "next": "^15 || ^16",