@ampless/runtime 0.2.0-alpha.9 → 1.0.0-alpha.13

package/README.ja.md

@@ -74,7 +74,7 @@ export const config = defaultMatcherConfig
 
 - `@ampless/runtime` — `createAmpless`、ランタイム型、`renderBody`・`renderThemeCss`・フォーマットコンバーターの再エクスポート
 - `@ampless/runtime/middleware` — `createAmplessMiddleware`、`defaultMatcherConfig`
-- `@ampless/runtime/routes` — `createOgRouteHandler`、`createSitemapRouteHandler`、`createFeedRouteHandler`、`createRawRouteHandler`
+- `@ampless/runtime/routes` — `createOgRouteHandler`、`createSitemapRouteHandler`、`createFeedRouteHandler`、`createUnderscoreRouteHandler`
 - `@ampless/runtime/dispatchers` — `createThemeHomeDispatcher`、`createThemePostDispatcher`、`createThemeTagDispatcher`（それぞれ対応する `*Metadata` ファクトリーあり）
 
 ## テンプレートに残るもの

package/README.md

@@ -74,7 +74,7 @@ export const config = defaultMatcherConfig
 
 - `@ampless/runtime` — `createAmpless`, runtime types, and re-exports of `renderBody`, `renderThemeCss`, format converters
 - `@ampless/runtime/middleware` — `createAmplessMiddleware`, `defaultMatcherConfig`
-- `@ampless/runtime/routes` — `createOgRouteHandler`, `createSitemapRouteHandler`, `createFeedRouteHandler`, `createRawRouteHandler`
+- `@ampless/runtime/routes` — `createOgRouteHandler`, `createSitemapRouteHandler`, `createFeedRouteHandler`, `createUnderscoreRouteHandler`
 - `@ampless/runtime/dispatchers` — `createThemeHomeDispatcher`, `createThemePostDispatcher`, `createThemeTagDispatcher` (each with a matching `*Metadata` factory)
 
 ## What's still in the template

package/dist/dispatchers/index.d.ts

@@ -11,9 +11,9 @@ interface Props$2 {
 type ThemeHomeDispatcher = (props: Props$2) => Promise<ReactNode>;
 type ThemeHomeMetadata = (props: Props$2) => Promise<Metadata>;
 /**
- * Home page dispatcher. Resolves the active theme for the request's
- * siteId and renders the theme's `components.Home` server component
- * with the same `params` Promise it was passed.
+ * Home page dispatcher. Resolves the active theme and renders the
+ * theme's `components.Home` server component with the same `params`
+ * Promise it was passed.
  */
 declare function createThemeHomeDispatcher(ampless: Ampless): ThemeHomeDispatcher;
 /** generateMetadata factory for the home dispatcher. */
@@ -31,14 +31,24 @@ 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 metadata: if
- * `metadata.no_layout === true`, the post is meant to be served as
- * bare HTML (own DOCTYPE, no theme chrome, no Next.js root layout).
- * Next.js page.tsx can't bypass the root layout, so we 308-redirect
- * to the raw route handler at `/raw/<slug>` which returns the body
- * unchanged. The redirect is permanent because no_layout is a
- * persistent property of the post — bookmarks naturally settle on
- * the `/raw/` URL.
+ * 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.
  *
  * The metadata peek is an extra AppSync call before theme resolve,
  * but it's the same query the theme's Post component would make

package/dist/dispatchers/index.js

@@ -1,16 +1,14 @@
 // src/dispatchers/home.ts
 function createThemeHomeDispatcher(ampless) {
   return async function SiteHomeDispatcher({ params }) {
-    const { siteId } = await params;
-    const { module } = await ampless.resolveActiveTheme(siteId);
+    const { module } = await ampless.resolveActiveTheme();
     const Home = module.components.Home;
     return await Home({ params });
   };
 }
 function createThemeHomeMetadata(ampless) {
   return async function generateMetadata({ params }) {
-    const { siteId } = await params;
-    const { module } = await ampless.resolveActiveTheme(siteId);
+    const { module } = await ampless.resolveActiveTheme();
     const fn = module.metadata?.Home;
     return fn ? await fn({ params }) : {};
   };
@@ -20,17 +18,12 @@ function createThemeHomeMetadata(ampless) {
 import { notFound, redirect } from "next/navigation";
 function createThemePostDispatcher(ampless) {
   return async function SitePostDispatcher({ params }) {
-    const { siteId, slug } = await params;
-    const post = await ampless.getPublishedPost(slug, { siteId });
-    if (post?.metadata?.no_layout === true) {
-      redirect(`/raw/${slug}`);
+    const { slug } = await params;
+    const post = await ampless.getPublishedPost(slug);
+    if (post?.metadata?.no_layout === true || post?.format === "static") {
+      redirect(`/_/${slug}`);
     }
-    if (post?.format === "static") {
-      const body = post.body ?? null;
-      const entrypoint = typeof body?.entrypoint === "string" && body.entrypoint ? body.entrypoint : "index.html";
-      redirect(`/${slug}/${entrypoint}`);
-    }
-    const { module } = await ampless.resolveActiveTheme(siteId);
+    const { module } = await ampless.resolveActiveTheme();
     const Post = module.components.Post;
     if (!Post) notFound();
     return await Post({ params });
@@ -38,8 +31,7 @@ function createThemePostDispatcher(ampless) {
 }
 function createThemePostMetadata(ampless) {
   return async function generateMetadata({ params }) {
-    const { siteId } = await params;
-    const { module } = await ampless.resolveActiveTheme(siteId);
+    const { module } = await ampless.resolveActiveTheme();
     const fn = module.metadata?.Post;
     return fn ? await fn({ params }) : {};
   };
@@ -49,8 +41,7 @@ function createThemePostMetadata(ampless) {
 import { notFound as notFound2 } from "next/navigation";
 function createThemeTagDispatcher(ampless) {
   return async function SiteTagDispatcher({ params }) {
-    const { siteId } = await params;
-    const { module } = await ampless.resolveActiveTheme(siteId);
+    const { module } = await ampless.resolveActiveTheme();
     const Tag = module.components.Tag;
     if (!Tag) notFound2();
     return await Tag({ params });
@@ -58,8 +49,7 @@ function createThemeTagDispatcher(ampless) {
 }
 function createThemeTagMetadata(ampless) {
   return async function generateMetadata({ params }) {
-    const { siteId } = await params;
-    const { module } = await ampless.resolveActiveTheme(siteId);
+    const { module } = await ampless.resolveActiveTheme();
     const fn = module.metadata?.Tag;
     return fn ? await fn({ params }) : {};
   };

package/dist/index.d.ts

@@ -25,7 +25,6 @@ interface StorageApi {
 
 interface PublicPostShape {
     postId: string;
-    siteId: string;
     slug: string;
     title: string;
     excerpt?: string | null;
@@ -41,7 +40,6 @@ interface PublicPostConnectionShape {
     nextToken?: string | null;
 }
 interface ListPostsOptions {
-    siteId?: string;
     /** ISO 8601 timestamp; SK lower bound (inclusive). */
     from?: string;
     /** ISO 8601 timestamp; SK upper bound (inclusive). */
@@ -51,7 +49,6 @@ interface ListPostsOptions {
     nextToken?: string;
 }
 interface ListPostsByTagOptions {
-    siteId?: string;
     limit?: number;
     nextToken?: string;
 }
@@ -61,9 +58,7 @@ interface ListPostsResult {
 }
 interface PostsApi {
     listPublishedPosts(opts?: ListPostsOptions): Promise<ListPostsResult>;
-    getPublishedPost(slug: string, opts?: {
-        siteId?: string;
-    }): Promise<Post | null>;
+    getPublishedPost(slug: string): Promise<Post | null>;
     listPostsByTag(tag: string, opts?: ListPostsByTagOptions): Promise<ListPostsResult>;
 }
 
@@ -87,18 +82,18 @@ interface EffectiveSiteSettings {
     timezone?: string;
 }
 interface SiteSettingsApi {
-    loadSiteSettings(siteId?: string): Promise<EffectiveSiteSettings>;
+    loadSiteSettings(): Promise<EffectiveSiteSettings>;
 }
 
 interface SeoApi {
-    postMetadata(post: Post, siteId?: string): Promise<Metadata>;
-    siteMetadata(siteId?: string): Promise<Metadata>;
+    postMetadata(post: Post): Promise<Metadata>;
+    siteMetadata(): Promise<Metadata>;
 }
 
 interface ThemesRegistry {
     /** Map of theme name → loaded theme module. */
     themes: Record<string, ThemeModule>;
-    /** Name used when no `theme.active` override is stored for the site. */
+    /** Name used when no `theme.active` override is stored. */
     defaultTheme: string;
 }
 interface ResolvedTheme {
@@ -106,7 +101,7 @@ interface ResolvedTheme {
     module: ThemeModule;
 }
 interface ThemeActiveApi {
-    resolveActiveTheme(siteId?: string): Promise<ResolvedTheme>;
+    resolveActiveTheme(): Promise<ResolvedTheme>;
 }
 
 type ColorScheme = 'auto' | 'light' | 'dark';
@@ -145,7 +140,7 @@ interface EffectiveThemeConfig {
     colorScheme: ColorScheme;
 }
 interface ThemeConfigApi {
-    loadThemeConfig(siteId?: string): Promise<EffectiveThemeConfig>;
+    loadThemeConfig(): Promise<EffectiveThemeConfig>;
 }
 /**
  * Render `cssVars` as the body of a `:root { ... }` CSS block. Values
@@ -159,32 +154,42 @@ declare function renderBody(post: Post): string;
  * Convert a tiptap doc to its HTML form. Same renderer the public
  * site uses. Defensive: tiptap accepts an HTML string as initial
  * content and parses it on mount, but won't fire onUpdate until the
- * user edits — so a format-switch chain (e.g. markdown → tiptap →
+ * user edits, so a format-switch chain (e.g. markdown -> tiptap ->
  * markdown without editing) can still hand us a raw HTML string
  * here. In that case, return it as-is rather than walking it as a
  * malformed tiptap node and producing empty output.
  */
 declare function tiptapToHtml(doc: unknown): string;
-/** Convert markdown to HTML using the built-in minimal renderer. */
+/** Convert markdown to HTML using marked + GFM. */
 declare function markdownToHtml(md: string): string;
 /**
  * Walk a tiptap doc and emit Markdown. Mirrors `renderTiptap` in
  * shape but produces markdown syntax. Loses anything markdown can't
  * express (data attributes, image display modes, custom marks).
  *
+ * Notes on info loss:
+ * - underline / highlight are not in GFM, so they fall back to the
+ *   literal `<u>` / `<mark>` HTML tags (preserved as-is across round trips).
+ * - paragraph / heading textAlign cannot be expressed in markdown and
+ *   is therefore lost on conversion.
+ *
  * Same defensive path as tiptapToHtml: a string input means tiptap
  * hasn't emitted JSON yet (the body is still the HTML we handed it).
  * Route through htmlToMarkdown so the content survives.
  */
 declare function tiptapToMarkdown(doc: unknown): string;
 /**
- * Regex-based HTML → Markdown converter. Handles the tag set the
+ * Regex-based HTML -> Markdown converter. Handles the tag set the
  * editor produces (`<p>` `<h1>`-`<h6>` `<strong>` `<em>` `<a>`
  * `<img>` `<ul>` `<ol>` `<li>` `<code>` `<pre>` `<blockquote>` `<hr>`
- * `<br>`). Anything else (tables, sections, divs) keeps its content
- * but loses structural meaning.
+ * `<br>` `<u>` `<mark>` `<table>` task-list `<ul data-type="taskList">`).
+ * Decorative containers like `<div style="text-align:...">` are dropped.
+ *
+ * Tables are reduced to GFM pipe syntax via convertHtmlTable. Complex
+ * nested content inside cells (lists, other tables) is flattened to
+ * plain text.
  *
- * Not a full library — there are known limits like nested formatting
+ * Not a full library, there are known limits like nested formatting
  * inside list items potentially merging. Acceptable for a v0.x
  * format-switch convenience; complex HTML round-trips shouldn't be
  * relied on.
@@ -198,15 +203,13 @@ interface CreateAmplessOpts {
 }
 interface Ampless {
     listPublishedPosts(opts?: ListPostsOptions): Promise<ListPostsResult>;
-    getPublishedPost(slug: string, opts?: {
-        siteId?: string;
-    }): Promise<Post | null>;
+    getPublishedPost(slug: string): Promise<Post | null>;
     listPostsByTag(tag: string, opts?: ListPostsByTagOptions): Promise<ListPostsResult>;
-    loadSiteSettings(siteId?: string): Promise<EffectiveSiteSettings>;
-    resolveActiveTheme(siteId?: string): Promise<ResolvedTheme>;
-    loadThemeConfig(siteId?: string): Promise<EffectiveThemeConfig>;
-    postMetadata(post: Post, siteId?: string): Promise<Metadata>;
-    siteMetadata(siteId?: string): Promise<Metadata>;
+    loadSiteSettings(): Promise<EffectiveSiteSettings>;
+    resolveActiveTheme(): Promise<ResolvedTheme>;
+    loadThemeConfig(): Promise<EffectiveThemeConfig>;
+    postMetadata(post: Post): Promise<Metadata>;
+    siteMetadata(): Promise<Metadata>;
     renderBody(post: Post): string;
     renderThemeCss(cssVars: Record<string, string>): string;
     publicAssetUrl(key: string): string;

package/dist/index.js

@@ -20,35 +20,20 @@ function createStorage(outputs) {
 // src/posts.ts
 import { cookies } from "next/headers";
 import { generateServerClientUsingCookies } from "@aws-amplify/adapter-nextjs/api";
-function decodeBody(value) {
-  if (typeof value !== "string") return value;
-  try {
-    return JSON.parse(value);
-  } catch {
-    return value;
-  }
-}
+import { decodeAwsJson } from "ampless";
 function decodeMetadata(value) {
   if (value === null || value === void 0) return void 0;
-  const parsed = typeof value === "string" ? safeJsonParse(value) : value;
+  const parsed = decodeAwsJson(value);
   return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : void 0;
 }
-function safeJsonParse(value) {
-  try {
-    return JSON.parse(value);
-  } catch {
-    return value;
-  }
-}
 function toCorePost(p) {
   return {
     postId: p.postId,
-    siteId: p.siteId,
     slug: p.slug,
     title: p.title,
     excerpt: p.excerpt ?? void 0,
     format: p.format ?? "markdown",
-    body: decodeBody(p.body),
+    body: decodeAwsJson(p.body),
     status: p.status ?? "draft",
     publishedAt: p.publishedAt ?? void 0,
     tags: (p.tags ?? []).filter((t) => typeof t === "string"),
@@ -66,7 +51,6 @@ function createPostsApi(outputs) {
   return {
     async listPublishedPosts(opts = {}) {
       const { data, errors } = await client.queries.listPublishedPosts({
-        siteId: opts.siteId ?? "default",
         from: opts.from,
         to: opts.to,
         limit: opts.limit ?? 20,
@@ -76,9 +60,8 @@ function createPostsApi(outputs) {
       const items = (data?.items ?? []).filter((p) => p !== null).map(toCorePost);
       return { items, nextToken: data?.nextToken ?? null };
     },
-    async getPublishedPost(slug, opts = {}) {
+    async getPublishedPost(slug) {
       const { data, errors } = await client.queries.getPublishedPost({
-        siteId: opts.siteId ?? "default",
         slug
       });
       if (errors) throw new Error(errors[0]?.message ?? "Failed to get post");
@@ -86,7 +69,6 @@ function createPostsApi(outputs) {
     },
     async listPostsByTag(tag, opts = {}) {
       const { data, errors } = await client.queries.listPostsByTag({
-        siteId: opts.siteId ?? "default",
         tag,
         limit: opts.limit ?? 20,
         nextToken: opts.nextToken
@@ -99,25 +81,27 @@ function createPostsApi(outputs) {
 }
 
 // src/site-settings.ts
-import { DEFAULT_SITE_ID, siteFor, unflattenSettings } from "ampless";
+import { unflattenSettings } from "ampless";
 function createSiteSettings(cmsConfig, storage) {
-  async function fetchRemote(siteId) {
+  async function fetchRemote() {
     if (!storage.isStorageConfigured()) return null;
     let url;
     try {
-      url = storage.publicAssetUrl(`public/site-settings/${siteId}.json`);
+      url = storage.publicAssetUrl("public/site-settings.json");
     } catch {
       return null;
     }
-    const res = await fetch(url, { next: { revalidate: 60, tags: [`site-settings:${siteId}`] } });
+    const res = await fetch(url, {
+      next: { revalidate: 60, tags: ["site-settings"] }
+    });
     if (!res.ok) return null;
     const flat = await res.json();
     return unflattenSettings(flat);
   }
   return {
-    async loadSiteSettings(siteId = DEFAULT_SITE_ID) {
-      const remote = await fetchRemote(siteId).catch(() => null);
-      const baseSite = siteFor(siteId, cmsConfig);
+    async loadSiteSettings() {
+      const remote = await fetchRemote().catch(() => null);
+      const baseSite = cmsConfig.site;
       return {
         site: {
           name: remote?.site?.name ?? baseSite.name,
@@ -142,15 +126,14 @@ function createSiteSettings(cmsConfig, storage) {
 }
 
 // src/seo.ts
-import { DEFAULT_SITE_ID as DEFAULT_SITE_ID2 } from "ampless";
 function isPlugin(p) {
   return typeof p === "object" && p !== null && "apiVersion" in p;
 }
 function createSeo(cmsConfig, settingsApi) {
   const plugins = (cmsConfig.plugins ?? []).filter(isPlugin);
   return {
-    async postMetadata(post, siteId = DEFAULT_SITE_ID2) {
-      const settings = await settingsApi.loadSiteSettings(siteId);
+    async postMetadata(post) {
+      const settings = await settingsApi.loadSiteSettings();
       const accum = {};
       for (const plugin of plugins) {
         if (!plugin.metadata) continue;
@@ -167,8 +150,8 @@ function createSeo(cmsConfig, settingsApi) {
       }
       return accum;
     },
-    async siteMetadata(siteId = DEFAULT_SITE_ID2) {
-      const settings = await settingsApi.loadSiteSettings(siteId);
+    async siteMetadata() {
+      const settings = await settingsApi.loadSiteSettings();
       const accum = {
         title: settings.site.name,
         description: settings.site.description
@@ -193,24 +176,25 @@ function createSeo(cmsConfig, settingsApi) {
 
 // src/theme-active.ts
 import { headers } from "next/headers";
-import { DEFAULT_SITE_ID as DEFAULT_SITE_ID3 } from "ampless";
 function createThemeActive(registry, storage) {
-  async function fetchActiveFromCache(siteId) {
+  async function fetchActiveFromCache() {
     if (!storage.isStorageConfigured()) return null;
     let url;
     try {
-      url = storage.publicAssetUrl(`public/site-settings/${siteId}.json`);
+      url = storage.publicAssetUrl("public/site-settings.json");
     } catch {
       return null;
     }
-    const res = await fetch(url, { next: { revalidate: 60, tags: [`site-settings:${siteId}`] } });
+    const res = await fetch(url, {
+      next: { revalidate: 60, tags: ["site-settings"] }
+    });
     if (!res.ok) return null;
     const flat = await res.json();
     const v = flat["theme.active"];
     return typeof v === "string" ? v : null;
   }
   return {
-    async resolveActiveTheme(siteId = DEFAULT_SITE_ID3) {
+    async resolveActiveTheme() {
       let previewOverride = null;
       try {
         const h = await headers();
@@ -221,7 +205,7 @@ function createThemeActive(registry, storage) {
         const mod2 = registry.themes[previewOverride];
         if (mod2) return { name: previewOverride, module: mod2 };
       }
-      const stored = await fetchActiveFromCache(siteId).catch(() => null);
+      const stored = await fetchActiveFromCache().catch(() => null);
       const name = stored && stored in registry.themes ? stored : registry.defaultTheme;
       const mod = registry.themes[name] ?? registry.themes[registry.defaultTheme];
       if (!mod) {
@@ -236,7 +220,6 @@ function createThemeActive(registry, storage) {
 
 // src/theme-config.ts
 import {
-  DEFAULT_SITE_ID as DEFAULT_SITE_ID4,
   resolveThemeValues,
   themeSettingKey
 } from "ampless";
@@ -247,23 +230,23 @@ function validateColorScheme(raw) {
   return DEFAULT_COLOR_SCHEME;
 }
 function createThemeConfig(themeActive, storage) {
-  async function fetchRemote(siteId) {
+  async function fetchRemote() {
     if (!storage.isStorageConfigured()) return null;
     let url;
     try {
-      url = storage.publicAssetUrl(`public/site-settings/${siteId}.json`);
+      url = storage.publicAssetUrl("public/site-settings.json");
     } catch {
       return null;
     }
-    const res = await fetch(url, { next: { revalidate: 60, tags: [`site-settings:${siteId}`] } });
+    const res = await fetch(url, { next: { revalidate: 60, tags: ["site-settings"] } });
     if (!res.ok) return null;
     return await res.json();
   }
   return {
-    async loadThemeConfig(siteId = DEFAULT_SITE_ID4) {
+    async loadThemeConfig() {
       const [active, flat] = await Promise.all([
-        themeActive.resolveActiveTheme(siteId),
-        fetchRemote(siteId).catch(() => null)
+        themeActive.resolveActiveTheme(),
+        fetchRemote().catch(() => null)
       ]);
       const manifest = active.module.manifest;
       const stored = {};
@@ -299,9 +282,17 @@ ${lines.join("\n")}
 }
 
 // src/rendering.ts
+import { marked } from "marked";
 function escape(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
+function textAlignStyle(attrs) {
+  const v = attrs?.textAlign;
+  if (v === "left" || v === "center" || v === "right" || v === "justify") {
+    return ` style="text-align: ${v}"`;
+  }
+  return "";
+}
 function renderTiptap(node) {
   if (node.type === "text") {
     let html = escape(node.text ?? "");
@@ -310,6 +301,8 @@ function renderTiptap(node) {
       else if (mark.type === "italic") html = `<em>${html}</em>`;
       else if (mark.type === "code") html = `<code>${html}</code>`;
       else if (mark.type === "strike") html = `<s>${html}</s>`;
+      else if (mark.type === "underline") html = `<u>${html}</u>`;
+      else if (mark.type === "highlight") html = `<mark>${html}</mark>`;
       else if (mark.type === "link") {
         const href = escape(String(mark.attrs?.href ?? "#"));
         html = `<a href="${href}" target="_blank" rel="noopener">${html}</a>`;
@@ -322,10 +315,10 @@ function renderTiptap(node) {
     case "doc":
       return children;
     case "paragraph":
-      return `<p>${children}</p>`;
+      return `<p${textAlignStyle(node.attrs)}>${children}</p>`;
     case "heading": {
       const level = Number(node.attrs?.level ?? 1);
-      return `<h${level}>${children}</h${level}>`;
+      return `<h${level}${textAlignStyle(node.attrs)}>${children}</h${level}>`;
     }
     case "bulletList":
       return `<ul>${children}</ul>`;
@@ -350,52 +343,39 @@ function renderTiptap(node) {
       const display = node.attrs?.display ? ` data-display="${escape(String(node.attrs.display))}"` : "";
       return `<img src="${src}" alt="${alt}"${title}${display} loading="lazy" />`;
     }
+    case "table":
+      return `<table class="tiptap-table"><tbody>${children}</tbody></table>`;
+    case "tableRow":
+      return `<tr>${children}</tr>`;
+    case "tableHeader":
+      return `<th${tableCellAttrs(node.attrs)}>${children}</th>`;
+    case "tableCell":
+      return `<td${tableCellAttrs(node.attrs)}>${children}</td>`;
+    case "taskList":
+      return `<ul data-type="taskList">${children}</ul>`;
+    case "taskItem": {
+      const checked = node.attrs?.checked === true ? "true" : "false";
+      return `<li data-type="taskItem" data-checked="${checked}">${children}</li>`;
+    }
     default:
       return children;
   }
 }
-function renderMarkdown(md) {
-  const lines = md.split("\n");
-  const out = [];
-  let i = 0;
-  while (i < lines.length) {
-    const line = lines[i] ?? "";
-    if (line.startsWith("# ")) {
-      out.push(`<h1>${escape(line.slice(2))}</h1>`);
-      i++;
-    } else if (line.startsWith("## ")) {
-      out.push(`<h2>${escape(line.slice(3))}</h2>`);
-      i++;
-    } else if (line.startsWith("```")) {
-      const lang = line.slice(3).trim();
-      const code = [];
-      i++;
-      while (i < lines.length && !(lines[i] ?? "").startsWith("```")) {
-        code.push(lines[i] ?? "");
-        i++;
-      }
-      i++;
-      out.push(
-        `<pre><code${lang ? ` class="language-${escape(lang)}"` : ""}>${escape(code.join("\n"))}</code></pre>`
-      );
-    } else if (line.startsWith("- ")) {
-      const items = [];
-      while (i < lines.length && (lines[i] ?? "").startsWith("- ")) {
-        items.push(`<li>${renderInlineMarkdown((lines[i] ?? "").slice(2))}</li>`);
-        i++;
-      }
-      out.push(`<ul>${items.join("")}</ul>`);
-    } else if (line.trim() === "") {
-      i++;
-    } else {
-      out.push(`<p>${renderInlineMarkdown(line)}</p>`);
-      i++;
-    }
+function tableCellAttrs(attrs) {
+  let out = "";
+  const colspan = Number(attrs?.colspan ?? 1);
+  if (colspan > 1) out += ` colspan="${colspan}"`;
+  const rowspan = Number(attrs?.rowspan ?? 1);
+  if (rowspan > 1) out += ` rowspan="${rowspan}"`;
+  const colwidth = attrs?.colwidth;
+  if (Array.isArray(colwidth) && colwidth.length > 0) {
+    const w = Number(colwidth[0]);
+    if (Number.isFinite(w) && w > 0) out += ` style="width: ${w}px"`;
   }
-  return out.join("\n");
+  return out;
 }
-function renderInlineMarkdown(text) {
-  return text.replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/`([^`]+)`/g, "<code>$1</code>").replace(/\*\*([^*]+)\*\*/g, "<strong>$1</strong>");
+function renderMarkdown(md) {
+  return marked.parse(md, { gfm: true, breaks: false, async: false });
 }
 function renderBody(post) {
   if (post.format === "html") return String(post.body);
@@ -426,6 +406,8 @@ function tiptapNodeToMarkdown(node) {
       else if (mark.type === "italic") txt = `*${txt}*`;
       else if (mark.type === "code") txt = `\`${txt}\``;
       else if (mark.type === "strike") txt = `~~${txt}~~`;
+      else if (mark.type === "underline") txt = `<u>${txt}</u>`;
+      else if (mark.type === "highlight") txt = `<mark>${txt}</mark>`;
       else if (mark.type === "link") txt = `[${txt}](${String(mark.attrs?.href ?? "#")})`;
     }
     return txt;
@@ -463,12 +445,54 @@ function tiptapNodeToMarkdown(node) {
       const alt = String(node.attrs?.alt ?? "");
       return `![${alt}](${src})`;
     }
+    case "table":
+      return tiptapTableToMarkdown(node);
+    case "taskList":
+      return children + "\n";
+    case "taskItem": {
+      const checked = node.attrs?.checked === true ? "x" : " ";
+      const inner = children.replace(/\n+$/, "");
+      const [first, ...rest] = inner.split("\n");
+      const cont = rest.map((l) => l ? "  " + l : l).join("\n");
+      return `- [${checked}] ${first ?? ""}${cont ? "\n" + cont : ""}
+`;
+    }
     default:
       return children;
   }
 }
+function tiptapTableToMarkdown(node) {
+  const rows = node.content ?? [];
+  if (rows.length === 0) return "";
+  const renderedRows = [];
+  let headerIdx = -1;
+  for (let i = 0; i < rows.length; i++) {
+    const row = rows[i];
+    const cells = row.content ?? [];
+    const cellTexts = cells.map((c) => {
+      const inner = (c.content ?? []).map(tiptapNodeToMarkdown).join("");
+      return inner.replace(/\n+$/, "").replace(/\n/g, "<br>").replace(/\|/g, "\\|");
+    });
+    renderedRows.push(cellTexts);
+    if (headerIdx === -1 && cells.some((c) => c.type === "tableHeader")) headerIdx = i;
+  }
+  if (headerIdx === -1) headerIdx = 0;
+  const header = renderedRows[headerIdx] ?? [];
+  const body = renderedRows.filter((_, i) => i !== headerIdx);
+  const cols = header.length;
+  const headerLine = "| " + header.join(" | ") + " |";
+  const sepLine = "| " + Array.from({ length: cols }, () => "---").join(" | ") + " |";
+  const bodyLines = body.map((r) => {
+    const cells = Array.from({ length: cols }, (_, i) => r[i] ?? "");
+    return "| " + cells.join(" | ") + " |";
+  });
+  return "\n" + [headerLine, sepLine, ...bodyLines].join("\n") + "\n\n";
+}
 function htmlToMarkdown(html) {
   let md = html;
+  md = md.replace(/<table[^>]*>([\s\S]*?)<\/table>/gi, (_, inner) => {
+    return "\n" + convertHtmlTable(String(inner)) + "\n";
+  });
   md = md.replace(/<h([1-6])[^>]*>([\s\S]*?)<\/h\1>/gi, (_, level, text) => {
     return "\n" + "#".repeat(Number(level)) + " " + String(text).trim() + "\n\n";
   });
@@ -481,6 +505,9 @@ function htmlToMarkdown(html) {
   md = md.replace(/<blockquote[^>]*>([\s\S]*?)<\/blockquote>/gi, (_, content) => {
     return "\n" + String(content).trim().split("\n").map((l) => "> " + l).join("\n") + "\n\n";
   });
+  md = md.replace(/<ul[^>]*data-type="taskList"[^>]*>([\s\S]*?)<\/ul>/gi, (_, items) => {
+    return "\n" + convertHtmlTaskList(String(items)) + "\n";
+  });
   md = md.replace(/<ul[^>]*>([\s\S]*?)<\/ul>/gi, (_, items) => {
     return "\n" + String(items).replace(/<li[^>]*>([\s\S]*?)<\/li>/gi, "- $1\n") + "\n";
   });
@@ -500,11 +527,63 @@ function htmlToMarkdown(html) {
   md = md.replace(/<(em|i)>([\s\S]*?)<\/\1>/gi, "*$2*");
   md = md.replace(/<s>([\s\S]*?)<\/s>/gi, "~~$1~~");
   md = md.replace(/<code>([\s\S]*?)<\/code>/gi, "`$1`");
+  const PH_U_OPEN = "AMP_U_OPEN";
+  const PH_U_CLOSE = "AMP_U_CLOSE";
+  const PH_MARK_OPEN = "AMP_MARK_OPEN";
+  const PH_MARK_CLOSE = "AMP_MARK_CLOSE";
+  md = md.replace(/<u>([\s\S]*?)<\/u>/gi, `${PH_U_OPEN}$1${PH_U_CLOSE}`);
+  md = md.replace(/<mark>([\s\S]*?)<\/mark>/gi, `${PH_MARK_OPEN}$1${PH_MARK_CLOSE}`);
   md = md.replace(/<\/?[^>]+>/g, "");
+  md = md.split(PH_U_OPEN).join("<u>").split(PH_U_CLOSE).join("</u>").split(PH_MARK_OPEN).join("<mark>").split(PH_MARK_CLOSE).join("</mark>");
   md = md.replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&#39;/g, "'").replace(/&nbsp;/g, " ");
   md = md.replace(/\n{3,}/g, "\n\n");
   return md.trim() + "\n";
 }
+function convertHtmlTable(inner) {
+  const stripped = inner.replace(/<\/?(thead|tbody)[^>]*>/gi, "");
+  const rowRe = /<tr[^>]*>([\s\S]*?)<\/tr>/gi;
+  const rows = [];
+  let m;
+  while ((m = rowRe.exec(stripped)) !== null) {
+    const rowHtml = m[1] ?? "";
+    const cellRe = /<(th|td)[^>]*>([\s\S]*?)<\/\1>/gi;
+    const cells = [];
+    let isHeader = false;
+    let cm;
+    while ((cm = cellRe.exec(rowHtml)) !== null) {
+      if ((cm[1] ?? "").toLowerCase() === "th") isHeader = true;
+      cells.push(normalizeTableCell(cm[2] ?? ""));
+    }
+    if (cells.length > 0) rows.push({ isHeader, cells });
+  }
+  if (rows.length === 0) return "";
+  let headerIdx = rows.findIndex((r) => r.isHeader);
+  if (headerIdx === -1) headerIdx = 0;
+  const header = rows[headerIdx].cells;
+  const body = rows.filter((_, i) => i !== headerIdx).map((r) => r.cells);
+  const cols = header.length;
+  const headerLine = "| " + header.join(" | ") + " |";
+  const sepLine = "| " + Array.from({ length: cols }, () => "---").join(" | ") + " |";
+  const bodyLines = body.map((cells) => {
+    const padded = Array.from({ length: cols }, (_, i) => cells[i] ?? "");
+    return "| " + padded.join(" | ") + " |";
+  });
+  return [headerLine, sepLine, ...bodyLines].join("\n") + "\n";
+}
+function normalizeTableCell(html) {
+  return html.replace(/<br\s*\/?>/gi, " ").replace(/<\/?[^>]+>/g, "").replace(/\|/g, "\\|").replace(/\s+/g, " ").trim();
+}
+function convertHtmlTaskList(items) {
+  const liRe = /<li[^>]*data-checked="(true|false)"[^>]*>([\s\S]*?)<\/li>/gi;
+  const out = [];
+  let m;
+  while ((m = liRe.exec(items)) !== null) {
+    const checked = m[1] === "true" ? "x" : " ";
+    const inner = String(m[2] ?? "").replace(/<\/?p[^>]*>/gi, "").trim();
+    out.push(`- [${checked}] ${inner}`);
+  }
+  return out.join("\n");
+}
 
 // src/index.ts
 function createAmpless(opts) {
@@ -517,13 +596,13 @@ function createAmpless(opts) {
   const themeConfig = createThemeConfig(themeActive, storage);
   return {
     listPublishedPosts: (o) => posts.listPublishedPosts(o),
-    getPublishedPost: (slug, o) => posts.getPublishedPost(slug, o),
+    getPublishedPost: (slug) => posts.getPublishedPost(slug),
     listPostsByTag: (tag, o) => posts.listPostsByTag(tag, o),
-    loadSiteSettings: (siteId) => settings.loadSiteSettings(siteId),
-    resolveActiveTheme: (siteId) => themeActive.resolveActiveTheme(siteId),
-    loadThemeConfig: (siteId) => themeConfig.loadThemeConfig(siteId),
-    postMetadata: (post, siteId) => seo.postMetadata(post, siteId),
-    siteMetadata: (siteId) => seo.siteMetadata(siteId),
+    loadSiteSettings: () => settings.loadSiteSettings(),
+    resolveActiveTheme: () => themeActive.resolveActiveTheme(),
+    loadThemeConfig: () => themeConfig.loadThemeConfig(),
+    postMetadata: (post) => seo.postMetadata(post),
+    siteMetadata: () => seo.siteMetadata(),
     renderBody: (post) => renderBody(post),
     renderThemeCss: (cssVars) => renderThemeCss(cssVars),
     publicAssetUrl: (key) => storage.publicAssetUrl(key),

package/dist/middleware.d.ts

@@ -8,24 +8,26 @@ type MiddlewareFn = (request: NextRequest) => NextResponse;
 /**
  * Build the ampless public-site middleware. Performs:
  *
- *  - hostname → siteId resolution (multi-site rewrites)
- *  - `/path` → `/site/<siteId>/path` internal rewrite
+ *  - `/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
- *  - `Cache-Control: private, no-store` in multi-site mode (Amplify
- *    Hosting's CloudFront cache key doesn't include Host, so SSR
- *    responses would cross-contaminate at the same path)
  *
- * No-layout / bare-HTML routing is data-driven: the theme post
- * dispatcher reads `post.metadata.no_layout` and redirects to
- * `/raw/<slug>` when set. The plain prefix-prepend below picks up
- * that path because the raw route lives at
- * `app/site/<siteId>/raw/<slug>/route.ts` — no special middleware
- * branch is needed.
+ * 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/`.
  *
- * The factory captures the multi-site flag at construction time so the
- * hot path stays a pair of cheap header lookups.
+ * 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.
  */
-declare function createAmplessMiddleware({ cmsConfig }: 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

package/dist/middleware.js

@@ -1,31 +1,22 @@
 // src/middleware.ts
 import { NextResponse } from "next/server";
-import { resolveSiteId, isMultiSite } from "ampless";
-function createAmplessMiddleware({ cmsConfig }) {
-  const MULTI_SITE = isMultiSite(cmsConfig);
+var INTERNAL_SITE_SEGMENT = "default";
+function createAmplessMiddleware(_opts) {
   return function middleware(request) {
-    const host = (request.headers.get("host") ?? "").split(":")[0];
-    const siteId = resolveSiteId(host ?? "", cmsConfig);
-    if (!siteId) {
-      return new NextResponse("Site not found", { status: 404 });
-    }
     const url = request.nextUrl.clone();
     if (!url.pathname.startsWith("/site/")) {
-      const tail = url.pathname === "/" ? "" : url.pathname;
-      url.pathname = `/site/${siteId}${tail}`;
+      let tail = url.pathname === "/" ? "" : url.pathname;
+      if (tail === "/_" || tail.startsWith("/_/")) {
+        tail = `/r${tail.slice(2)}`;
+      }
+      url.pathname = `/site/${INTERNAL_SITE_SEGMENT}${tail}`;
     }
     const previewTheme = url.searchParams.get("previewTheme");
     const previewColorScheme = url.searchParams.get("previewColorScheme");
     const requestHeaders = new Headers(request.headers);
-    requestHeaders.set("x-site-id", siteId);
     if (previewTheme) requestHeaders.set("x-preview-theme", previewTheme);
     if (previewColorScheme) requestHeaders.set("x-preview-color-scheme", previewColorScheme);
-    const response = NextResponse.rewrite(url, { request: { headers: requestHeaders } });
-    response.headers.set("x-site-id", siteId);
-    if (MULTI_SITE) {
-      response.headers.set("Cache-Control", "private, no-store");
-    }
-    return response;
+    return NextResponse.rewrite(url, { request: { headers: requestHeaders } });
   };
 }
 var defaultMatcherConfig = {

package/dist/routes/index.d.ts

@@ -2,112 +2,86 @@ import { Ampless } from '../index.js';
 import 'ampless';
 import 'next';
 
-interface Ctx$4 {
+interface Ctx$3 {
     params: Promise<{
         siteId: string;
         slug: string;
     }>;
 }
-type OgRouteHandler = (req: Request, ctx: Ctx$4) => Promise<Response>;
+type OgRouteHandler = (req: Request, ctx: Ctx$3) => Promise<Response>;
 declare function createOgRouteHandler(ampless: Ampless): OgRouteHandler;
 
-interface Ctx$3 {
+interface Ctx$2 {
     params: Promise<{
         siteId: string;
     }>;
 }
-type SitemapRouteHandler = (req: Request, ctx: Ctx$3) => Promise<Response>;
+type SitemapRouteHandler = (req: Request, ctx: Ctx$2) => Promise<Response>;
 /**
- * Sitemap route delegate. Looks up the active theme for the request's
- * siteId and forwards to whichever `routes.sitemap` handler the theme
- * provides. Themes without a sitemap handler return 404.
+ * Sitemap route delegate. Looks up the active theme and forwards to
+ * whichever `routes.sitemap` handler the theme provides. Themes
+ * without a sitemap handler return 404.
  */
 declare function createSitemapRouteHandler(ampless: Ampless): SitemapRouteHandler;
 
-interface Ctx$2 {
+interface Ctx$1 {
     params: Promise<{
         siteId: string;
     }>;
 }
-type FeedRouteHandler = (req: Request, ctx: Ctx$2) => Promise<Response>;
+type FeedRouteHandler = (req: Request, ctx: Ctx$1) => Promise<Response>;
 /**
- * Feed route delegate. Looks up the active theme for the request's
- * siteId and forwards to whichever `routes.feed` handler the theme
- * provides. Themes without a feed handler return 404.
+ * Feed route delegate. Looks up the active theme and forwards to
+ * whichever `routes.feed` handler the theme provides. Themes without
+ * a feed handler return 404.
  */
 declare function createFeedRouteHandler(ampless: Ampless): FeedRouteHandler;
 
-interface Ctx$1 {
+interface Ctx {
     params: Promise<{
-        siteId: string;
         slug: string;
+        path?: string[];
     }>;
 }
-type RawRouteHandler = (req: Request, ctx: Ctx$1) => Promise<Response>;
+type UnderscoreRouteHandler = (req: Request, ctx: Ctx) => Promise<Response>;
 /**
- * Bare HTML route. Returns the published post's rendered body as the
- * entire HTTP response — no Next.js root layout, no theme chrome.
- *
- * Reached via the data-driven dispatcher path: the theme post page
- * checks `post.metadata.no_layout` and redirects to `/raw/<slug>` when
- * set. Posts without that flag never hit this route in practice; the
- * handler additionally enforces the same check here so a direct
- * `/raw/<slug>` request can't bypass the theme for a post that wasn't
- * marked no-layout (would otherwise surface the body without any
- * chrome the editor didn't intend).
+ * Unified `/_/<slug>(/...)` route handler.
  *
- * Why this is a route handler (not a page): Next.js's root layout
- * always emits `<html>` / `<head>` / `<body>`, which means a normal
- * page can't replace the document. A `route.ts` returns a Response
- * directly and bypasses React rendering entirely.
+ * The public URL prefix `/_/` is reserved for two related cases that
+ * both need to bypass the theme's post page:
  *
- * Format pairing:
- *   - `format: 'html'` with a full `<!DOCTYPE html>...</html>` body
- *     → the body lands in the response unchanged. Best fit for
- *     custom landing pages with their own `<head>`, styles, scripts.
- *   - `format: 'tiptap'` / `'markdown'` → renderBody returns an
- *     HTML fragment. Browsers render fragments fine, but the page
- *     ships without `<!DOCTYPE>` / `<head>` / `<title>`. If you care
- *     about those, use `format: 'html'`.
- *
- * Trust model: the response body is the editor's content verbatim,
- * with no sanitization. Same trust assumption as `format: 'html'`
- * post bodies on the regular path — see
- * docs/architecture/04-access-layer-mcp.md §"editor の信頼モデル".
- */
-declare function createRawRouteHandler(ampless: Ampless): RawRouteHandler;
-
-interface Ctx {
-    params: Promise<{
-        siteId: string;
-        path: string[];
-    }>;
-}
-type StaticRouteHandler = (req: Request, ctx: Ctx) => Promise<Response>;
-/**
- * Catch-all route for static bundles. Lives at
- * `app/site/[siteId]/[...path]/route.ts` and serves every file
- * inside a `format: 'static'` post's bundle. The first segment of
- * `path` is the post slug; the rest is the relative path inside the
- * bundle (or empty, in which case the manifest's entrypoint is used).
+ *  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).
+ *  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>`.
  *
- * Routing precedence: Next.js prefers the more specific
- * `[siteId]/[slug]/page.tsx` for single-segment URLs, so this catch-all
- * only fires when path.length >= 2. The post dispatcher detects
- * `format === 'static'` and 308-redirects to `/<slug>/<entrypoint>`
- * so the catch-all picks up from there.
+ * 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>(/...)`.
+ *   - `params.path` is `undefined` (or `[]`) for single-segment
+ *     requests `/_/<slug>`, an array of remaining segments otherwise.
  *
- * Single-segment requests (`/<siteId>/<slug>`) that somehow do reach
- * here are 308-redirected to add a trailing slash, which is what makes
- * relative paths in the bundle resolve correctly in the browser.
+ * 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.
  *
- * Implementation: generate a short-lived presigned URL for the S3
- * object and 302-redirect to it. Same model as `/api/media/[...path]`
- * — keeps the bucket private while letting CloudFront cache the 302
- * for the Cache-Control window. The presigned URL itself expires in
- * an hour; the 302 cache is 5 minutes so re-issued presigns stay
- * fresh.
+ * 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 の信頼モデル".
  */
-declare function createStaticRouteHandler(ampless: Ampless): StaticRouteHandler;
+declare function createUnderscoreRouteHandler(ampless: Ampless): UnderscoreRouteHandler;
 
-export { type FeedRouteHandler, type OgRouteHandler, type RawRouteHandler, type SitemapRouteHandler, type StaticRouteHandler, createFeedRouteHandler, createOgRouteHandler, createRawRouteHandler, createSitemapRouteHandler, createStaticRouteHandler };
+export { type FeedRouteHandler, type OgRouteHandler, type SitemapRouteHandler, type UnderscoreRouteHandler, createFeedRouteHandler, createOgRouteHandler, createSitemapRouteHandler, createUnderscoreRouteHandler };

package/dist/routes/index.js

@@ -6,13 +6,13 @@ function hasOgImage(p) {
 }
 function createOgRouteHandler(ampless) {
   return async function GET(_req, { params }) {
-    const { siteId, slug } = await params;
+    const { slug } = await params;
     const cleanSlug = slug.replace(/\.png$/, "");
-    const post = await ampless.getPublishedPost(cleanSlug, { siteId });
+    const post = await ampless.getPublishedPost(cleanSlug);
     if (!post) return new Response("not found", { status: 404 });
     const plugin = (ampless.cmsConfig.plugins ?? []).find(hasOgImage);
     if (!plugin) return new Response("og not configured", { status: 404 });
-    const settings = await ampless.loadSiteSettings(siteId);
+    const settings = await ampless.loadSiteSettings();
     const fonts = await Promise.all(
       plugin.ogImage.fonts.map(async (f) => ({
         name: f.name,
@@ -43,122 +43,127 @@ function createOgRouteHandler(ampless) {
 
 // src/routes/sitemap.ts
 function createSitemapRouteHandler(ampless) {
-  return async function GET(request, { params }) {
-    const { siteId } = await params;
-    const { module } = await ampless.resolveActiveTheme(siteId);
+  return async function GET(request) {
+    const { module } = await ampless.resolveActiveTheme();
     const handler = module.routes?.sitemap;
     if (!handler) {
       return new Response("sitemap not implemented for this theme", { status: 404 });
     }
-    return handler({ siteId, request });
+    return handler({ request });
   };
 }
 
 // src/routes/feed.ts
 function createFeedRouteHandler(ampless) {
-  return async function GET(request, { params }) {
-    const { siteId } = await params;
-    const { module } = await ampless.resolveActiveTheme(siteId);
+  return async function GET(request) {
+    const { module } = await ampless.resolveActiveTheme();
     const handler = module.routes?.feed;
     if (!handler) {
       return new Response("feed not implemented for this theme", { status: 404 });
     }
-    return handler({ siteId, request });
+    return handler({ request });
   };
 }
 
-// src/routes/raw.ts
-function createRawRouteHandler(ampless) {
-  return async function GET(_request, { params }) {
-    const { siteId, slug } = await params;
-    const post = await ampless.getPublishedPost(slug, { siteId });
-    if (!post) {
-      return new Response("Not Found", { status: 404 });
-    }
-    if (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": "public, max-age=300"
-      }
-    });
-  };
-}
-
-// src/routes/static.ts
+// src/routes/underscore.ts
 import { createServerRunner } from "@aws-amplify/adapter-nextjs";
 import { cookies } from "next/headers";
 import { getUrl } from "aws-amplify/storage/server";
-var FALLBACK_MIME = {
-  ".html": "text/html; charset=utf-8",
-  ".htm": "text/html; charset=utf-8"
-};
-function createStaticRouteHandler(ampless) {
+function createUnderscoreRouteHandler(ampless) {
   const { runWithAmplifyServerContext } = createServerRunner({
     config: ampless.outputs
   });
   return async function GET(request, { params }) {
-    const { siteId, path } = await params;
-    if (!path || path.length === 0) {
+    const { slug, path } = await params;
+    const restSegments = path ?? [];
+    const post = await ampless.getPublishedPost(slug);
+    if (!post) {
+      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": "public, max-age=300"
+          }
+        });
+      }
+      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);
+      }
+      return new Response("Not Found", { status: 404 });
+    }
+    if (post.format !== "static") {
       return new Response("Not Found", { status: 404 });
     }
-    const slug = path[0];
-    const restSegments = path.slice(1);
     if (restSegments.some(
       (s) => !s || s === "." || s === ".." || s.includes("/") || s.includes("\\") || s.includes("\0")
     )) {
       return new Response("Invalid path", { status: 400 });
     }
-    const post = await ampless.getPublishedPost(slug, { siteId });
-    if (!post || post.format !== "static") {
-      return new Response("Not Found", { status: 404 });
-    }
     const body = post.body ?? null;
-    const entrypoint = typeof body?.entrypoint === "string" && body.entrypoint ? body.entrypoint : "index.html";
     const fileList = Array.isArray(body?.files) ? body.files : [];
-    let rest = restSegments.join("/");
-    if (rest === "") {
-      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);
-      }
-      rest = entrypoint;
-    }
+    const rest = restSegments.join("/");
     if (fileList.length > 0 && !fileList.includes(rest)) {
       return new Response("Not Found", { status: 404 });
     }
-    const objectPath = `public/static/${siteId}/${slug}/${rest}`;
-    try {
-      const presignedUrl = await runWithAmplifyServerContext({
-        nextServerContext: { cookies },
-        operation: async (amplifyContext) => {
-          const result = await getUrl(amplifyContext, {
-            path: objectPath,
-            options: { expiresIn: 60 * 60 }
-          });
-          return result.url.toString();
-        }
-      });
-      return Response.redirect(presignedUrl, 302);
-    } catch {
-      const ext = rest.slice(rest.lastIndexOf("."));
-      const fallback = FALLBACK_MIME[ext] ?? "text/plain; charset=utf-8";
-      return new Response("Not Found", {
-        status: 404,
-        headers: { "Content-Type": fallback }
-      });
+    const presignedUrl = await signStaticAsset({
+      runWithAmplifyServerContext,
+      slug,
+      rest
+    });
+    if (!presignedUrl) {
+      return new Response("Not Found", { status: 404 });
     }
+    return Response.redirect(presignedUrl, 302);
   };
 }
+async function signStaticAsset({
+  runWithAmplifyServerContext,
+  slug,
+  rest
+}) {
+  const objectPath = `public/static/${slug}/${rest}`;
+  try {
+    return await runWithAmplifyServerContext({
+      nextServerContext: { cookies },
+      operation: async (amplifyContext) => {
+        const result = await getUrl(amplifyContext, {
+          path: objectPath,
+          options: { expiresIn: 60 * 60 }
+        });
+        return result.url.toString();
+      }
+    });
+  } catch (err) {
+    console.error(
+      `[underscore-route] presign failed for ${objectPath}:`,
+      err
+    );
+    return null;
+  }
+}
 export {
   createFeedRouteHandler,
   createOgRouteHandler,
-  createRawRouteHandler,
   createSitemapRouteHandler,
-  createStaticRouteHandler
+  createUnderscoreRouteHandler
 };

package/package.json

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