@ampless/runtime 1.0.0-alpha.18 → 1.0.0-alpha.20

package/README.ja.md

@@ -88,8 +88,10 @@ middleware はリクエストごとに AppSync から `post.format` /
 キャッシュした上で、適切な内部ハンドラーにリクエストを書き換えます。
 
 - 通常の投稿 → 書き換えなし、`app/[slug]/page.tsx` で配信
-- `metadata.no_layout: true` HTML / `format: 'static'` → `/r/<slug>(/<path>)`、
-  `app/r/[slug]/[[...path]]/route.ts` で配信
+- `metadata.no_layout: true` HTML → `/raw/<slug>`、
+  `app/raw/[slug]/route.ts` で配信
+- `format: 'static'` → `/static/<slug>(/<path>)`、
+  `app/static/[slug]/[[...path]]/route.ts` で配信
 
 また、`post.metadata.cache`（auto / deep / hot）+ `post.updatedAt` +
 `cms.config.cache.{cooldownMs, freshTtlSeconds, deepTtlSeconds}` から
@@ -100,7 +102,7 @@ middleware はリクエストごとに AppSync から `post.format` /
 
 - `@ampless/runtime` — `createAmpless`、ランタイム型、`renderBody`・`renderThemeCss`・フォーマットコンバーターの再エクスポート
 - `@ampless/runtime/middleware` — `createAmplessMiddleware`、`defaultMatcherConfig`
-- `@ampless/runtime/routes` — `createOgRouteHandler`、`createSitemapRouteHandler`、`createFeedRouteHandler`、`createUnderscoreRouteHandler`
+- `@ampless/runtime/routes` — `createOgRouteHandler`、`createSitemapRouteHandler`、`createFeedRouteHandler`、`createRawRouteHandler`、`createStaticRouteHandler`
 - `@ampless/runtime/dispatchers` — `createThemeHomeDispatcher`、`createThemePostDispatcher`、`createThemeTagDispatcher`（それぞれ対応する `*Metadata` ファクトリーあり）
 
 ## テンプレートに残るもの

package/README.md

@@ -88,8 +88,10 @@ from AppSync (apiKey auth) on each request, caches the result in a
 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`
+- `metadata.no_layout: true` HTML → `/raw/<slug>`, served by
+  `app/raw/[slug]/route.ts`
+- `format: 'static'` → `/static/<slug>(/<path>)`, served by
+  `app/static/[slug]/[[...path]]/route.ts`
 
 It also computes `Cache-Control` from `post.metadata.cache` (auto /
 deep / hot) + `post.updatedAt` + `cms.config.cache.{cooldownMs,
@@ -100,7 +102,7 @@ See `docs/CONTENT.md` for the cache strategy contract.
 
 - `@ampless/runtime` — `createAmpless`, runtime types, and re-exports of `renderBody`, `renderThemeCss`, format converters
 - `@ampless/runtime/middleware` — `createAmplessMiddleware`, `defaultMatcherConfig`
-- `@ampless/runtime/routes` — `createOgRouteHandler`, `createSitemapRouteHandler`, `createFeedRouteHandler`, `createUnderscoreRouteHandler`
+- `@ampless/runtime/routes` — `createOgRouteHandler`, `createSitemapRouteHandler`, `createFeedRouteHandler`, `createRawRouteHandler`, `createStaticRouteHandler`
 - `@ampless/runtime/dispatchers` — `createThemeHomeDispatcher`, `createThemePostDispatcher`, `createThemeTagDispatcher` (each with a matching `*Metadata` factory)
 
 ## What's still in the template

package/dist/dispatchers/index.d.ts

@@ -32,10 +32,10 @@ type ThemePostMetadata = (props: Props$1) => Promise<Metadata>;
  * 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.
+ * render), `/raw/<slug>` (no_layout HTML), or `/static/<slug>(/...)`
+ * (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).

package/dist/index.d.ts

@@ -108,6 +108,18 @@ interface ResolvedTheme {
 }
 interface ThemeActiveApi {
     resolveActiveTheme(): Promise<ResolvedTheme>;
+    /**
+     * Read the stored `theme.active` value directly from the S3 cache
+     * with `cache: 'no-store'` — bypassing Next.js's fetch cache and
+     * any tag-based revalidation. Returns the raw stored name (which
+     * may be a theme that isn't in the registry) or `null` when the
+     * S3 file is missing / unreadable.
+     *
+     * Used by the admin theme-switch flow to poll until the trusted
+     * processor has propagated a KvStore write to S3, so the post-
+     * switch hard reload doesn't race the cache rebuild.
+     */
+    readStoredActiveThemeFresh(): Promise<string | null>;
 }
 
 type ColorScheme = 'auto' | 'light' | 'dark';
@@ -213,6 +225,13 @@ interface Ampless {
     listPostsByTag(tag: string, opts?: ListPostsByTagOptions): Promise<ListPostsResult>;
     loadSiteSettings(): Promise<EffectiveSiteSettings>;
     resolveActiveTheme(): Promise<ResolvedTheme>;
+    /**
+     * Fresh-read of the stored `theme.active` value from S3, bypassing
+     * the Next.js fetch cache. Returns the raw stored name (no fallback
+     * to defaultTheme) or `null` when the cache file is missing. Used
+     * by the admin to poll for processor propagation after a switch.
+     */
+    readStoredActiveThemeFresh(): Promise<string | null>;
     loadThemeConfig(): Promise<EffectiveThemeConfig>;
     postMetadata(post: Post): Promise<Metadata>;
     siteMetadata(): Promise<Metadata>;

package/dist/index.js

@@ -178,14 +178,17 @@ function createSeo(cmsConfig, settingsApi) {
 // src/theme-active.ts
 import { headers } from "next/headers";
 function createThemeActive(registry, storage) {
-  async function fetchActiveFromCache() {
+  function settingsUrl() {
     if (!storage.isStorageConfigured()) return null;
-    let url;
     try {
-      url = storage.publicAssetUrl("public/site-settings.json");
+      return storage.publicAssetUrl("public/site-settings.json");
     } catch {
       return null;
     }
+  }
+  async function fetchActiveFromCache() {
+    const url = settingsUrl();
+    if (!url) return null;
     const res = await fetch(url, {
       next: { revalidate: 60, tags: ["site-settings"] }
     });
@@ -194,7 +197,17 @@ function createThemeActive(registry, storage) {
     const v = flat["theme.active"];
     return typeof v === "string" ? v : null;
   }
+  async function fetchActiveFresh() {
+    const url = settingsUrl();
+    if (!url) return null;
+    const res = await fetch(url, { cache: "no-store" });
+    if (!res.ok) return null;
+    const flat = await res.json();
+    const v = flat["theme.active"];
+    return typeof v === "string" ? v : null;
+  }
   return {
+    readStoredActiveThemeFresh: () => fetchActiveFresh(),
     async resolveActiveTheme() {
       let previewOverride = null;
       try {
@@ -601,6 +614,7 @@ function createAmpless(opts) {
     listPostsByTag: (tag, o) => posts.listPostsByTag(tag, o),
     loadSiteSettings: () => settings.loadSiteSettings(),
     resolveActiveTheme: () => themeActive.resolveActiveTheme(),
+    readStoredActiveThemeFresh: () => themeActive.readStoredActiveThemeFresh(),
     loadThemeConfig: () => themeConfig.loadThemeConfig(),
     postMetadata: (post) => seo.postMetadata(post),
     siteMetadata: () => seo.siteMetadata(),

package/dist/middleware.d.ts

@@ -27,10 +27,11 @@ declare function computeCacheControl(flags: {
  *  - 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.
+ *  - Rewrite to `/raw/<slug>` when the post is no_layout HTML
+ *    (`format=html` + `metadata.no_layout=true`).
+ *  - Rewrite to `/static/<slug>(/<path>)` when the post is 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` /

package/dist/middleware.js

@@ -127,8 +127,9 @@ var RESERVED_PREFIXES = /* @__PURE__ */ new Set([
   "sitemap.xml",
   "og",
   "tag",
-  // internal rewrite target — direct hits should not be middleware-driven
-  "r"
+  // internal rewrite targets — direct hits should not be middleware-driven
+  "raw",
+  "static"
 ]);
 function createAmplessMiddleware(opts) {
   return async function middleware(request) {
@@ -161,12 +162,12 @@ function createAmplessMiddleware(opts) {
     let response;
     if (restPath.length === 0) {
       if (flags.format === "html" && flags.metadata?.no_layout === true) {
-        url.pathname = `/r/${slug}`;
+        url.pathname = `/raw/${slug}`;
         response = NextResponse.rewrite(url, {
           request: { headers: requestHeaders }
         });
       } else if (flags.format === "static") {
-        url.pathname = `/r/${slug}`;
+        url.pathname = `/static/${slug}`;
         response = NextResponse.rewrite(url, {
           request: { headers: requestHeaders }
         });
@@ -175,7 +176,7 @@ function createAmplessMiddleware(opts) {
       }
     } else {
       if (flags.format === "static") {
-        url.pathname = `/r/${slug}/${restPath.join("/")}`;
+        url.pathname = `/static/${slug}/${restPath.join("/")}`;
         response = NextResponse.rewrite(url, {
           request: { headers: requestHeaders }
         });

package/dist/routes/index.d.ts

@@ -2,18 +2,18 @@ import { Ampless } from '../index.js';
 import 'ampless';
 import 'next';
 
-interface Ctx$3 {
+interface Ctx$4 {
     params: Promise<{
         slug: string;
     }>;
 }
-type OgRouteHandler = (req: Request, ctx: Ctx$3) => Promise<Response>;
+type OgRouteHandler = (req: Request, ctx: Ctx$4) => Promise<Response>;
 declare function createOgRouteHandler(ampless: Ampless): OgRouteHandler;
 
-interface Ctx$2 {
+interface Ctx$3 {
     params: Promise<Record<string, never>>;
 }
-type SitemapRouteHandler = (req: Request, ctx: Ctx$2) => Promise<Response>;
+type SitemapRouteHandler = (req: Request, ctx: Ctx$3) => Promise<Response>;
 /**
  * Sitemap route delegate. Looks up the active theme and forwards to
  * whichever `routes.sitemap` handler the theme provides. Themes
@@ -21,10 +21,10 @@ type SitemapRouteHandler = (req: Request, ctx: Ctx$2) => Promise<Response>;
  */
 declare function createSitemapRouteHandler(ampless: Ampless): SitemapRouteHandler;
 
-interface Ctx$1 {
+interface Ctx$2 {
     params: Promise<Record<string, never>>;
 }
-type FeedRouteHandler = (req: Request, ctx: Ctx$1) => Promise<Response>;
+type FeedRouteHandler = (req: Request, ctx: Ctx$2) => Promise<Response>;
 /**
  * Feed route delegate. Looks up the active theme and forwards to
  * whichever `routes.feed` handler the theme provides. Themes without
@@ -32,55 +32,68 @@ type FeedRouteHandler = (req: Request, ctx: Ctx$1) => Promise<Response>;
  */
 declare function createFeedRouteHandler(ampless: Ampless): FeedRouteHandler;
 
-interface Ctx {
+interface Ctx$1 {
     params: Promise<{
         slug: string;
-        path?: string[];
     }>;
 }
-type UnderscoreRouteHandler = (req: Request, ctx: Ctx) => Promise<Response>;
+type RawRouteHandler = (req: Request, ctx: Ctx$1) => Promise<Response>;
 /**
- * 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.
+ * Internal route handler for `format: 'html'` posts whose
+ * `metadata.no_layout === true` — the body is its own complete HTML
+ * document and ships as the entire response (no Next.js root layout,
+ * no theme chrome).
+ *
+ * Mounted at `app/raw/[slug]/route.ts`; reached via middleware rewrite
+ * of `/<slug>` → `/raw/<slug>`. Never hit directly — middleware adds
+ * `raw` to its reserved-prefix list so a user post with slug `raw`
+ * passes through to a 404 rather than reaching this handler with the
+ * wrong content.
  *
- * Two cases that both need to bypass the themed post page:
+ * Trust model: the body is emitted verbatim, same trust shape as
+ * regular `format: 'html'` posts on the themed route. See
+ * docs/architecture/04-access-layer-mcp.md §"editor の信頼モデル".
  *
- *  1. `format: 'html'` posts with `metadata.no_layout === true` — the
- *     body is its own complete HTML document and ships as the entire
- *     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>` (middleware rewrites both to
- *     `/r/<slug>/...`).
+ * Cache-Control: deliberately omitted from the response. Middleware
+ * computes the strategy from `post.metadata.cache` + `post.updatedAt`
+ * and sets the header on the rewritten response.
+ */
+declare function createRawRouteHandler(ampless: Ampless): RawRouteHandler;
+
+interface Ctx {
+    params: Promise<{
+        slug: string;
+        path?: string[];
+    }>;
+}
+type StaticRouteHandler = (req: Request, ctx: Ctx) => Promise<Response>;
+/**
+ * Internal route handler for `format: 'static'` posts — the body is a
+ * manifest describing a bundle of files in S3 at
+ * `public/static/<slug>/`. The bundle entrypoint is served at
+ * `/<slug>/`, every internal file at `/<slug>/<relative-path>`.
  *
- * Routing model:
- *   - 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, an array of remaining segments otherwise.
+ * Mounted at `app/static/[slug]/[[...path]]/route.ts`; reached via
+ * middleware rewrite of `/<slug>(/<path>)` → `/static/<slug>(/<path>)`.
+ * Never hit directly — middleware adds `static` to its reserved-prefix
+ * list so a user post with slug `static` passes through to a 404
+ * rather than landing here with the wrong content.
  *
- * 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.
+ * Trailing-slash responsibility lives here: `/<slug>` (no trailing
+ * slash) 308-redirects 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 の信頼モデル".
+ * Trust model: assets are served via short-lived S3 presigned URLs;
+ * the bucket stays private.
  *
  * 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.
+ * `post.updatedAt` and sets it on the rewritten response. The 302
+ * presigned redirects also rely on S3's own headers for the actual
+ * asset bytes — adding a stale-while-revalidate window on the 302
+ * would risk serving an expired presign to repeat visitors.
  */
-declare function createUnderscoreRouteHandler(ampless: Ampless): UnderscoreRouteHandler;
+declare function createStaticRouteHandler(ampless: Ampless): StaticRouteHandler;
 
-export { type FeedRouteHandler, type OgRouteHandler, type SitemapRouteHandler, type UnderscoreRouteHandler, createFeedRouteHandler, createOgRouteHandler, createSitemapRouteHandler, createUnderscoreRouteHandler };
+export { type FeedRouteHandler, type OgRouteHandler, type RawRouteHandler, type SitemapRouteHandler, type StaticRouteHandler, createFeedRouteHandler, createOgRouteHandler, createRawRouteHandler, createSitemapRouteHandler, createStaticRouteHandler };

package/dist/routes/index.js

@@ -65,11 +65,32 @@ function createFeedRouteHandler(ampless) {
   };
 }
 
-// src/routes/underscore.ts
+// src/routes/raw.ts
+function createRawRouteHandler(ampless) {
+  return async function GET(_request, { params }) {
+    const { slug } = await params;
+    const post = await ampless.getPublishedPost(slug);
+    if (!post) {
+      return new Response("Not Found", { status: 404 });
+    }
+    if (post.format !== "html" || post.metadata?.no_layout !== true) {
+      return new Response("Not Found", { status: 404 });
+    }
+    return new Response(ampless.renderBody(post), {
+      status: 200,
+      headers: {
+        "Content-Type": "text/html; charset=utf-8"
+        // Cache-Control set by middleware.
+      }
+    });
+  };
+}
+
+// src/routes/static.ts
 import { createServerRunner } from "@aws-amplify/adapter-nextjs";
 import { cookies } from "next/headers";
 import { getUrl } from "aws-amplify/storage/server";
-function createUnderscoreRouteHandler(ampless) {
+function createStaticRouteHandler(ampless) {
   const { runWithAmplifyServerContext } = createServerRunner({
     config: ampless.outputs
   });
@@ -80,40 +101,27 @@ function createUnderscoreRouteHandler(ampless) {
     if (!post) {
       return new Response("Not Found", { status: 404 });
     }
+    if (post.format !== "static") {
+      return new Response("Not Found", { status: 404 });
+    }
     if (restSegments.length === 0) {
-      if (post.format === "html" && post.metadata?.no_layout === true) {
-        return new Response(ampless.renderBody(post), {
-          status: 200,
-          headers: {
-            "Content-Type": "text/html; charset=utf-8"
-            // Cache-Control set by middleware (cache strategy depends on
-            // post.metadata.cache + post.updatedAt).
-          }
-        });
+      const url = new URL(request.url);
+      if (!url.pathname.endsWith("/")) {
+        const next = new URL(url);
+        next.pathname = `${url.pathname}/`;
+        return Response.redirect(next.toString(), 308);
       }
-      if (post.format === "static") {
-        const url = new URL(request.url);
-        if (!url.pathname.endsWith("/")) {
-          const next = new URL(url);
-          next.pathname = `${url.pathname}/`;
-          return Response.redirect(next.toString(), 308);
-        }
-        const body2 = post.body ?? null;
-        const entrypoint = typeof body2?.entrypoint === "string" && body2.entrypoint ? body2.entrypoint : "index.html";
-        const presignedUrl2 = await signStaticAsset({
-          runWithAmplifyServerContext,
-          slug,
-          rest: entrypoint
-        });
-        if (!presignedUrl2) {
-          return new Response("Not Found", { status: 404 });
-        }
-        return Response.redirect(presignedUrl2, 302);
+      const body2 = post.body ?? null;
+      const entrypoint = typeof body2?.entrypoint === "string" && body2.entrypoint ? body2.entrypoint : "index.html";
+      const presignedUrl2 = await signStaticAsset({
+        runWithAmplifyServerContext,
+        slug,
+        rest: entrypoint
+      });
+      if (!presignedUrl2) {
+        return new Response("Not Found", { status: 404 });
       }
-      return new Response("Not Found", { status: 404 });
-    }
-    if (post.format !== "static") {
-      return new Response("Not Found", { status: 404 });
+      return Response.redirect(presignedUrl2, 302);
     }
     if (restSegments.some(
       (s) => !s || s === "." || s === ".." || s.includes("/") || s.includes("\\") || s.includes("\0")
@@ -156,7 +164,7 @@ async function signStaticAsset({
     });
   } catch (err) {
     console.error(
-      `[underscore-route] presign failed for ${objectPath}:`,
+      `[static-route] presign failed for ${objectPath}:`,
       err
     );
     return null;
@@ -165,6 +173,7 @@ async function signStaticAsset({
 export {
   createFeedRouteHandler,
   createOgRouteHandler,
+  createRawRouteHandler,
   createSitemapRouteHandler,
-  createUnderscoreRouteHandler
+  createStaticRouteHandler
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampless/runtime",
-  "version": "1.0.0-alpha.18",
+  "version": "1.0.0-alpha.20",
   "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": "^18.0.4",
     "tailwind-merge": "^3.6.0",
-    "ampless": "1.0.0-alpha.13",
-    "@ampless/plugin-og-image": "0.2.0-alpha.13"
+    "ampless": "1.0.0-alpha.14",
+    "@ampless/plugin-og-image": "0.2.0-alpha.14"
   },
   "peerDependencies": {
     "next": "^15 || ^16",