@tokenoftrust/storefront-runner 2.4.23 → 2.4.25

package/apps/storefront/src/components/blog/BlogIndexView.astro

@@ -7,9 +7,9 @@ import Layout from "@/layouts/Layout.astro";
 import PostAccessBadge from "@/components/blog/PostAccessBadge.astro";
 import type { BlogPostSummary } from "@/lib/blog/types.js";
 import type { BlogIndexCopy } from "@/lib/blog/pagination.js";
-import { blogPagePath } from "@/lib/blog/pagination.js";
 import type { BlogPresentation } from "@/lib/blog/presentation.js";
 import { categorySlug } from "@/lib/blog/collection.js";
+import { collectionPathsV1 } from "@/lib/blog/collectionPaths.js";
 
 interface Props {
   basePath: string;
@@ -23,17 +23,18 @@ interface Props {
 }
 
 const { basePath, canonicalBase, copy, presentation, tags, pagePosts, page, totalPages } = Astro.props;
+const blogPaths = collectionPathsV1(Astro.locals, "blog");
 const showTopics = presentation.topics && tags.length > 0;
 
 const href = (path: string) => `${basePath}${path}` || "/";
-const path = blogPagePath(page);
+const path = blogPaths.page(page);
 // Page 1 keeps the tenant's declared title verbatim (unchanged default copy); page
 // N>1 is distinguished in the <title> tag only — the on-page <h1> stays identical
 // across pages, matching how a reader experiences "the same blog, page 2".
 const documentTitle = page > 1 ? `${copy.title} — Page ${page}` : copy.title;
 const pagination = {
-  ...(page > 1 ? { prev: blogPagePath(page - 1) } : {}),
-  ...(page < totalPages ? { next: blogPagePath(page + 1) } : {}),
+  ...(page > 1 ? { prev: blogPaths.page(page - 1) } : {}),
+  ...(page < totalPages ? { next: blogPaths.page(page + 1) } : {}),
 };
 
 const itemList = {
@@ -44,7 +45,7 @@ const itemList = {
     "@type": "ListItem",
     position: index + 1,
     name: post.title,
-    url: new URL(`/blog/${post.slug}/`, canonicalBase + "/").toString(),
+    url: new URL(blogPaths.post(post.slug), canonicalBase + "/").toString(),
   })),
 };
 ---
@@ -70,7 +71,7 @@ const itemList = {
       <aside aria-label="Blog topics">
         <p class="filter-label">Explore topics</p>
         <div class="tag-list">
-          {tags.map((tag) => <a href={href(`/blog/tag/${categorySlug(tag)}/`)}>{tag}</a>)}
+          {tags.map((tag) => <a href={href(blogPaths.tag(categorySlug(tag)))}>{tag}</a>)}
         </div>
       </aside>
     )}
@@ -78,7 +79,7 @@ const itemList = {
     <section class="post-grid" aria-label="Blog posts" id="blog-posts">
       {pagePosts.map((post, index) => (
         <article class="post-card">
-          <a href={href(`/blog/${post.slug}/`)} aria-label={`Read ${post.title}`}>
+          <a href={href(blogPaths.post(post.slug))} aria-label={`Read ${post.title}`}>
             {post.featuredImage ? (
               <img
                 src={post.featuredImage.src}
@@ -105,11 +106,11 @@ const itemList = {
   {totalPages > 1 && (
     <nav class="blog-shell blog-pagination" aria-label="Blog pagination">
       {page > 1
-        ? <a class="blog-pagination-link" rel="prev" href={href(blogPagePath(page - 1))}>← Newer posts</a>
+        ? <a class="blog-pagination-link" rel="prev" href={href(blogPaths.page(page - 1))}>← Newer posts</a>
         : <span />}
       <span class="blog-pagination-status">Page {page} of {totalPages}</span>
       {page < totalPages
-        ? <a class="blog-pagination-link" rel="next" href={href(blogPagePath(page + 1))}>Older posts →</a>
+        ? <a class="blog-pagination-link" rel="next" href={href(blogPaths.page(page + 1))}>Older posts →</a>
         : <span />}
     </nav>
   )}

package/apps/storefront/src/components/blog/PostGrid.astro

@@ -1,24 +1,25 @@
 ---
 // Reader-facing card grid for a list of blog posts, shared by the collection's
-// category and tag index pages. `base` is the collection route base (e.g.
-// "/blog"); `basePath` is the tenant/preview path prefix from Astro.locals.
+// category and tag index pages. `paths` are the collection's URLs for the space that serves
+// the page (collectionPathsV1); `basePath` is the tenant/preview path prefix from Astro.locals.
 import type { BlogPostSummary } from "@/lib/blog/types.js";
+import type { CollectionPathsV1 } from "@/lib/blog/collectionPaths.js";
 import PostAccessBadge from "@/components/blog/PostAccessBadge.astro";
 
 interface Props {
   posts: BlogPostSummary[];
   basePath: string;
-  base: string;
+  paths: CollectionPathsV1;
 }
 
-const { posts, basePath, base } = Astro.props;
+const { posts, basePath, paths } = Astro.props;
 const href = (path: string) => `${basePath}${path}` || "/";
 ---
 
 <section class="post-grid" aria-label="Posts">
   {posts.map((post, index) => (
     <article class="post-card">
-      <a href={href(`${base}/${post.slug}/`)} aria-label={`Read ${post.title}`}>
+      <a href={href(paths.post(post.slug))} aria-label={`Read ${post.title}`}>
         {post.featuredImage ? (
           <img
             src={post.featuredImage.src}

package/apps/storefront/src/components/the-build/TheBuildIndexView.astro

@@ -9,7 +9,7 @@ import PostAccessBadge from "@/components/blog/PostAccessBadge.astro";
 import type { BlogPostSummary } from "@/lib/blog/types.js";
 import type { TheBuildIndexCopy } from "@/lib/the-build/pagination.js";
 import type { BlogPresentation } from "@/lib/blog/presentation.js";
-import { theBuildPagePath } from "@/lib/the-build/pagination.js";
+import { collectionPathsV1 } from "@/lib/blog/collectionPaths.js";
 
 interface Props {
   basePath: string;
@@ -22,15 +22,16 @@ interface Props {
 }
 
 const { basePath, canonicalBase, copy, presentation, pagePosts, page, totalPages } = Astro.props;
+const buildPaths = collectionPathsV1(Astro.locals, "the-build");
 
 const href = (path: string) => `${basePath}${path}` || "/";
-const path = theBuildPagePath(page);
+const path = buildPaths.page(page);
 // Page 1 keeps the tenant's declared title verbatim; page N>1 is distinguished
 // in the <title> tag only — the on-page <h1> stays identical across pages.
 const documentTitle = page > 1 ? `${copy.title} — Page ${page}` : copy.title;
 const pagination = {
-  ...(page > 1 ? { prev: theBuildPagePath(page - 1) } : {}),
-  ...(page < totalPages ? { next: theBuildPagePath(page + 1) } : {}),
+  ...(page > 1 ? { prev: buildPaths.page(page - 1) } : {}),
+  ...(page < totalPages ? { next: buildPaths.page(page + 1) } : {}),
 };
 
 const itemList = {
@@ -41,7 +42,7 @@ const itemList = {
     "@type": "ListItem",
     position: index + 1,
     name: post.title,
-    url: new URL(`/the-build/${post.slug}/`, canonicalBase + "/").toString(),
+    url: new URL(buildPaths.post(post.slug), canonicalBase + "/").toString(),
   })),
 };
 ---
@@ -66,7 +67,7 @@ const itemList = {
     <section class="post-grid" aria-label="The Build posts" id="the-build-posts">
       {pagePosts.map((post, index) => (
         <article class="post-card">
-          <a href={href(`/the-build/${post.slug}/`)} aria-label={`Read ${post.title}`}>
+          <a href={href(buildPaths.post(post.slug))} aria-label={`Read ${post.title}`}>
             {post.featuredImage ? (
               <img
                 src={post.featuredImage.src}
@@ -92,11 +93,11 @@ const itemList = {
     {totalPages > 1 && (
       <nav class="blog-pagination" aria-label="The Build pagination">
         {page > 1
-          ? <a class="blog-pagination-link" rel="prev" href={href(theBuildPagePath(page - 1))}>← Newer posts</a>
+          ? <a class="blog-pagination-link" rel="prev" href={href(buildPaths.page(page - 1))}>← Newer posts</a>
           : <span />}
         <span class="blog-pagination-status">Page {page} of {totalPages}</span>
         {page < totalPages
-          ? <a class="blog-pagination-link" rel="next" href={href(theBuildPagePath(page + 1))}>Older posts →</a>
+          ? <a class="blog-pagination-link" rel="next" href={href(buildPaths.page(page + 1))}>Older posts →</a>
           : <span />}
       </nav>
     )}

package/apps/storefront/src/config/publicationSpaceConfig.ts

@@ -51,6 +51,7 @@ export function mountedPublicationSpaceConfig(
   mount: string,
   visibility: PublicationSpaceVisibilityV1 = "public",
   aliases: readonly PublicationSpaceAliasV1[] = [],
+  collections?: PublicationSpaceManifestV1["routes"]["collections"],
 ): PublicationSpaceManifestV1 {
   const internal = visibility === "internal";
   return {
@@ -58,7 +59,11 @@ export function mountedPublicationSpaceConfig(
     id,
     tenant,
     source,
-    routes: aliases.length ? { canonicalMount: mount, aliases: [...aliases] } : { canonicalMount: mount },
+    routes: {
+      canonicalMount: mount,
+      ...(aliases.length ? { aliases: [...aliases] } : {}),
+      ...(collections && Object.keys(collections).length ? { collections: { ...collections } } : {}),
+    },
     visibility,
     authorization: internal ? { policy: "capability", capability: "internal-content-reader" } : { policy: "public" },
     discovery: internal

package/apps/storefront/src/config/publicationSpaceRegistry.ts

@@ -33,6 +33,7 @@ export function publicationSpacesFromTopology(
         mounted.mount,
         mounted.visibility ?? "public",
         mounted.aliases ?? [],
+        mounted.collections,
       )),
   ];
   const foreign = spaces.find((space) => !sourceBelongsToTenant(tenant, space.source));

package/apps/storefront/src/config/publicationSpaceTopology.ts

@@ -1,4 +1,9 @@
-import type { PublicationSpaceAliasV1, PublicationSpaceSourceV1, PublicationSpaceVisibilityV1 } from "@tot/public-runtime";
+import type {
+  PublicationSpaceAliasV1,
+  PublicationSpaceManifestV1,
+  PublicationSpaceSourceV1,
+  PublicationSpaceVisibilityV1,
+} from "@tot/public-runtime";
 
 /**
  * One declared non-root publication space: a mount, its source, and its
@@ -11,6 +16,8 @@ export interface MountedPublicationSpaceDeclarationV1 {
   mount: string;
   visibility?: PublicationSpaceVisibilityV1;
   aliases?: readonly PublicationSpaceAliasV1[];
+  /** Collection base paths inside the mount; `""` serves the collection at the mount root. */
+  collections?: PublicationSpaceManifestV1["routes"]["collections"];
 }
 
 /** A tenant's complete declared publication topology: exactly one root, plus any mounted spaces. */
@@ -38,6 +45,8 @@ export const PUBLICATION_SPACE_TOPOLOGY: Readonly<Record<string, PublicationTopo
         source: { forge: "gitea", repo: "tokenoftrust.com-publications", defaultBranch: "main" },
         mount: "/blog",
         visibility: "public",
+        // Decision m1b-mount-layout-2026-10-12: posts, index and archives at /blog/..., as today.
+        collections: { blog: "" },
       },
     ],
   },
@@ -70,6 +79,12 @@ export const PUBLICATION_SPACE_TOPOLOGY: Readonly<Record<string, PublicationTopo
         mount: "/internal-docs",
         visibility: "internal",
       },
+      {
+        id: "fixture-articles",
+        source: { forge: "fixture", repo: "fixture.e2e.test-articles", defaultBranch: "main" },
+        mount: "/blog",
+        collections: { blog: "" },
+      },
     ],
   },
   // The same three-space shape, served by CloudFront: certifies the s3-overwrite publication path.
@@ -88,6 +103,12 @@ export const PUBLICATION_SPACE_TOPOLOGY: Readonly<Record<string, PublicationTopo
         mount: "/internal-docs",
         visibility: "internal",
       },
+      {
+        id: "fixture-cloudfront-articles",
+        source: { forge: "fixture", repo: "fixture-cloudfront.e2e.test-articles", defaultBranch: "main" },
+        mount: "/blog",
+        collections: { blog: "" },
+      },
     ],
   },
   "chrome.e2e.test": {

package/apps/storefront/src/lib/blog/collectionPaths.ts

@@ -0,0 +1,46 @@
+/**
+ * The collection URLs a page renders, for the publication space that serves it. Every one comes
+ * from `publicationCollectionPathV1`, the one constructor the route builders and the discovery
+ * emitter use, with the space's mount and its declared collection base: a space mounted at
+ * `/blog` whose blog collection sits at the mount root links its posts as `/blog/<slug>/`, and
+ * the root space keeps `/blog/<slug>/`. Paths are tenant-relative (no preview base path).
+ */
+import {
+  publicationCollectionBaseV1,
+  publicationCollectionPathV1,
+  type PublicationCollectionV1,
+  type PublicationRoutePlanV1,
+} from "@tot/public-runtime";
+
+export interface CollectionPathsV1 {
+  /** The collection index, page 1. */
+  index: string;
+  page(page: number): string;
+  post(slug: string): string;
+  author(slug: string): string;
+  category(slug: string): string;
+  tag(slug: string): string;
+  rss: string;
+}
+
+/** The collection paths for the space the request resolved to (the root space otherwise). */
+export function collectionPathsV1(
+  locals: { publicationRoute?: PublicationRoutePlanV1 },
+  collection: PublicationCollectionV1,
+): CollectionPathsV1 {
+  const plan = locals.publicationRoute;
+  const manifest = plan && plan.action === "render" ? plan.manifest : null;
+  const mount = manifest?.routes.canonicalMount ?? "/";
+  const base = publicationCollectionBaseV1(manifest, collection);
+  const path = (route: Parameters<typeof publicationCollectionPathV1>[2]) =>
+    publicationCollectionPathV1(mount, base, route);
+  return {
+    index: path({ kind: "index" }),
+    page: (page) => path({ kind: "page", page }),
+    post: (slug) => path({ kind: "post", slug }),
+    author: (slug) => path({ kind: "author", slug }),
+    category: (slug) => path({ kind: "category", slug }),
+    tag: (slug) => path({ kind: "tag", slug }),
+    rss: path({ kind: "rss" }),
+  };
+}

package/apps/storefront/src/lib/blog/pagination.ts

@@ -1,7 +1,11 @@
+import { DEFAULT_COLLECTION_PAGE_SIZE_V1 } from "@tot/public-runtime";
 import type { BlogSettings } from "./types.js";
 
-/** Posts per `/blog/` page when a tenant declares no `pageSize` (or an invalid one). */
-export const DEFAULT_BLOG_PAGE_SIZE = 12;
+/**
+ * Posts per blog index page when a tenant declares no `pageSize` (or an invalid one). The route
+ * builders count index pages with the same default, so a page the renderer serves is a page they list.
+ */
+export const DEFAULT_BLOG_PAGE_SIZE = DEFAULT_COLLECTION_PAGE_SIZE_V1;
 
 /**
  * Resolved `/blog/` index copy + page size. A declared `BlogSettings` field wins;
@@ -91,20 +95,6 @@ export function paginateBlogPosts<T>(
   return { posts: posts.slice(start, start + pageSize), page, totalPages };
 }
 
-/**
- * Generic engine behind `blogPagePath` and every other collection's page path
- * (e.g. `theBuildPagePath`): page 1 is the bare index; page N≥2 is
- * `<basePath>/page/<n>/`. `basePath` carries no trailing slash (e.g. `/blog`).
- */
-export function pagedRoutePath(basePath: string, page: number): string {
-  return page <= 1 ? `${basePath}/` : `${basePath}/page/${page}/`;
-}
-
-/** `/blog/` is page 1; `/blog/page/<n>/` is page N for N≥2. */
-export function blogPagePath(page: number): string {
-  return pagedRoutePath("/blog", page);
-}
-
 /**
  * Generic engine behind `parseBlogPageParam` and every other collection's
  * `page/[n]` route param: not a bare positive-integer string (rejects "01",

package/apps/storefront/src/lib/publication/contentProvider.ts

@@ -62,8 +62,23 @@ export class PublicationSpaceContentProvider implements ContentProvider {
   constructor(
     private readonly sharedRoot: ContentProvider,
     private readonly publication: OpenPublicationArtifactV1,
+    /**
+     * A discovery document (sitemap, feeds, search index, llms.txt) lists every page of the space,
+     * so it reads any of them; a page request reads only the page its plan selected.
+     */
+    private readonly wholeSpace = false,
   ) {}
 
+  /** The space-relative slug a page request may read, or null. `""` is the space's home. */
+  private readableSlug(slug: string): string | null {
+    if (!this.wholeSpace) return selectedPageSlug(this.plan, slug);
+    const requested = stripSlashes(slug);
+    const mount = stripSlashes(this.plan.manifest.routes.canonicalMount);
+    if (!mount) return requested;
+    if (requested === mount) return "";
+    return requested.startsWith(`${mount}/`) ? requested.slice(mount.length + 1) : null;
+  }
+
   private get plan(): PublicationRouteRenderPlanV1 {
     return this.publication.selection;
   }
@@ -86,7 +101,7 @@ export class PublicationSpaceContentProvider implements ContentProvider {
   }
 
   async getPageHtml(slug: string): Promise<string | null> {
-    const selected = selectedPageSlug(this.plan, slug);
+    const selected = this.readableSlug(slug);
     if (selected === null) return null;
     const raw = this.publication.readContent(
       selected ? `pages-html/${selected}.html` : "home.html",
@@ -122,10 +137,11 @@ export class PublicationSpaceContentProvider implements ContentProvider {
   }
 
   async getPage(slug: string): Promise<EditorialPage | null> {
-    const selected = selectedPageSlug(this.plan, slug);
+    const selected = this.readableSlug(slug);
     if (!selected) return null;
     const page = (await this.sourcePages()).find((candidate) => candidate.slug === selected);
-    return page ? rebasePage(this.plan, page, stripSlashes(this.plan.canonicalPath)) : null;
+    if (!page) return null;
+    return this.wholeSpace ? rebasePage(this.plan, page) : rebasePage(this.plan, page, stripSlashes(this.plan.canonicalPath));
   }
 
   async listPages(): Promise<EditorialPage[]> {
@@ -152,8 +168,9 @@ export class PublicationSpaceContentProvider implements ContentProvider {
 export function bindPublicationSpaceContentProviderV1(
   sharedRoot: ContentProvider,
   publication?: OpenPublicationArtifactV1,
+  options: { wholeSpace?: boolean } = {},
 ): ContentProvider {
   return publication
-    ? new PublicationSpaceContentProvider(sharedRoot, publication)
+    ? new PublicationSpaceContentProvider(sharedRoot, publication, options.wholeSpace ?? false)
     : sharedRoot;
 }

package/apps/storefront/src/lib/publication/mountedDiscovery.ts

@@ -195,7 +195,10 @@ export async function readMountedPublicationDiscoveryV1(input: {
 export function mountedDiscoveryUrlV1(canonicalBase: string, entry: Pick<MountedDiscoveryEntryV1,
   "canonicalPath" | "kind">): string {
   if (entry.kind === "raw-html") return rawPageCanonicalUrl(canonicalBase, entry.canonicalPath.slice(1));
-  return `${canonicalBase.replace(/\/$/, "")}${entry.canonicalPath}`;
+  // Collection posts and archives declare the constructor's form (publicationCollectionPathV1):
+  // the route with its trailing slash.
+  const slash = entry.kind === "post" || entry.kind === "archive" ? "/" : "";
+  return `${canonicalBase.replace(/\/$/, "")}${entry.canonicalPath}${slash}`;
 }
 
 /** An RFC 3339 instant for a feed, or undefined when the value is not a date. */

package/apps/storefront/src/lib/publication/rootDiscovery.ts

@@ -8,6 +8,7 @@ import type { APIContext } from "astro";
 import { listBlogPosts } from "@/lib/blog/provider.js";
 import { listBuildPosts } from "@/lib/the-build/provider.js";
 import { isIndexableHtml, rawPageCanonicalUrl } from "@/lib/rawMarketingHtml.js";
+import { collectionPathsV1 } from "@/lib/blog/collectionPaths.js";
 
 export interface RootDiscoveryDocumentV1 {
   kind: "home" | "page" | "post";
@@ -36,14 +37,16 @@ export async function rootPostDocumentsV1(locals: APIContext["locals"]): Promise
     listBlogPosts(tenant.tenant_id, content, publicationTimestamp),
     listBuildPosts(tenant.tenant_id, { content, now: publicationTimestamp }),
   ]);
+  const blogPaths = collectionPathsV1(locals, "blog");
+  const buildPaths = collectionPathsV1(locals, "the-build");
   return [
-    ...blogPosts.map((post) => ({ post, base: "/blog" })),
-    ...buildPosts.map((post) => ({ post, base: "/the-build" })),
-  ].map(({ post, base }) => {
+    ...blogPosts.map((post) => ({ post, paths: blogPaths })),
+    ...buildPosts.map((post) => ({ post, paths: buildPaths })),
+  ].map(({ post, paths }) => {
     const summary = plain(post.description || post.excerpt);
     return {
       kind: "post" as const,
-      path: `${base}/${post.slug}/`,
+      path: paths.post(post.slug),
       title: plain(post.title) || post.slug,
       summary,
       searchText: [plain(post.title), summary].filter(Boolean).join(" "),

package/apps/storefront/src/lib/the-build/pagination.ts

@@ -3,15 +3,15 @@
 // drift from it (fb-1791301493691-brzl6f's sibling: /the-build hardcoded
 // Token of Trust's own branding and never paginated, exactly like /blog did).
 import type { BlogSettings } from "../blog/types.js";
+import { DEFAULT_COLLECTION_PAGE_SIZE_V1 } from "@tot/public-runtime";
 import {
   type BlogIndexCopy,
-  pagedRoutePath,
   parsePagedRouteParam,
   resolveIndexCopy,
 } from "../blog/pagination.js";
 
-/** Posts per `/the-build/` page when a tenant declares no `pageSize` (or an invalid one). */
-export const DEFAULT_THE_BUILD_PAGE_SIZE = 12;
+/** Posts per the-build index page when a tenant declares no `pageSize` (or an invalid one). */
+export const DEFAULT_THE_BUILD_PAGE_SIZE = DEFAULT_COLLECTION_PAGE_SIZE_V1;
 
 export type TheBuildIndexCopy = BlogIndexCopy;
 
@@ -32,11 +32,6 @@ export function resolveTheBuildIndexCopy(
   );
 }
 
-/** `/the-build/` is page 1; `/the-build/page/<n>/` is page N for N≥2. */
-export function theBuildPagePath(page: number): string {
-  return pagedRoutePath("/the-build", page);
-}
-
 /**
  * Parse a `/the-build/page/<n>/` route param into a page number, or null when it
  * is not a valid page-N route (see `parsePagedRouteParam`).

package/apps/storefront/src/middleware/index.ts

@@ -25,7 +25,7 @@ import { getTenantResolver } from "@/config/resolver";
 import { readEnv, readKv, readR2 } from "@/lib/runtimeEnv";
 import { resolveCdnForwardRouting, resolveTenantRouting } from "@/lib/tenantRouting";
 import { crossSiteFormRefusal, verifyCdnForward } from "@/lib/cdnForward";
-import { compileRouteTierIndexV1, type RouteTierIndexV1 } from "@tot/public-runtime";
+import { compileRouteTierIndexV1, resolvePublicationRoutePlanV1, type RouteTierIndexV1 } from "@tot/public-runtime";
 import type { PublicationArtifactBucketV1, TenantConfig } from "@tot/public-runtime";
 import { DEV_DRAFT_COOKIE } from "@/lib/dev/devDraft";
 import { applySecurityHeaders } from "@/lib/securityHeaders";
@@ -39,6 +39,7 @@ import { HEALTH_PATH, healthResponse } from "@/lib/health";
 import { observeDeployVersion } from "@/lib/activity/deployVersion";
 import { primeActivityKillSwitch } from "@/lib/activity/killSwitch";
 import {
+  isPlatformPublicDiscoveryPath,
   platformStaticRootLocationV1,
   publicationRedirectLocationV1,
   resolveMiddlewareBranchV1,
@@ -237,10 +238,11 @@ async function serveRequest(
   }
 
   // A render alias dispatches the same existing Astro route as its canonical
-  // mount. Content lookup keeps its separate mount-relative `contentPath` on the
-  // plan; no downstream layer decodes or strips the request again.
+  // mount, and a collection path dispatches its platform collection route
+  // (`renderPath`). Content lookup keeps its separate mount-relative
+  // `contentPath` on the plan; no downstream layer decodes or strips the request again.
   const publicationRenderPath = publication.action === "render"
-    ? publication.canonicalPath
+    ? publication.renderPath
     : renderPath;
 
   // Workers Cache API: backs the full-page edge cache in the render chain, and
@@ -313,6 +315,14 @@ async function serveRequest(
     return asset;
   }
 
+  // A tenant's discovery documents (sitemap, feeds, search index, llms.txt, robots) are the root's:
+  // when the root is a publication space, they render from its selected version, as its pages do.
+  const discoveryRoot = isPlatformPublicDiscoveryPath(renderPath)
+    ? resolvePublicationRoutePlanV1(routeTierIndexFor(tenant), "/")
+    : null;
+  const publicationSourceRoute = discoveryRoot?.action === "render" ? discoveryRoot : publication;
+  const publicationSourcePath = discoveryRoot?.action === "render" ? "/" : renderPath;
+
   if (branch === "public-render") {
     return await servePublicRender({
       context,
@@ -325,9 +335,11 @@ async function serveRequest(
       cache,
       kv,
       routeTierIndex: routeTierIndexFor(tenant),
-      publicationRequestPath: renderPath,
-      publicationRoute: publication,
-      publicationBucket,
+      publicationRequestPath: publicationSourcePath,
+      publicationRoute: publicationSourceRoute,
+      publicationBucket: discoveryRoot?.action === "render"
+        ? await readR2("TENANT_ASSETS") as unknown as PublicationArtifactBucketV1 | undefined
+        : publicationBucket,
     });
   }
 

package/apps/storefront/src/middleware/renderChain.ts

@@ -14,6 +14,7 @@ import { mergeTheme, themeToCssVars } from "@/themes/schema";
 import { createToTClient } from "@/lib/tot/ToTClient";
 import { readEnv, readR2 } from "@/lib/runtimeEnv";
 import { tryServeStaticBundle } from "./staticBundle.js";
+import { isPlatformPublicDiscoveryPath } from "./routeBranch.js";
 import { resolveCandidateContentPin, type CandidateContentPin } from "./candidatePin.js";
 import { createContentProvider, DevDraftContentProvider } from "@/lib/storyblok/provider";
 import { bindPublicationSpaceContentProviderV1 } from "@/lib/publication/contentProvider.js";
@@ -82,6 +83,7 @@ import {
   HTML_CACHE_POLICY_CAPTURE_HEADER,
   HTML_CACHE_POLICY_CAPTURE_PROBE,
 } from "@tot/public-runtime";
+import { publicationContentRedirectLocationV1 } from "@tot/public-runtime/publication-content-redirects";
 import { loadTenantIntegrationDeclarations } from "@/lib/integration/tenantDeclarations";
 import { resolveTenantCommerce } from "@/lib/checkoutCommerce";
 import {
@@ -236,6 +238,21 @@ export async function runRenderChain(input: RenderChainInput): Promise<Response>
     if (isInternalPublication) applyInternalContentResponsePolicy(response.headers);
     return response;
   }
+  // The owning space's content-declared redirects answer before anything renders, as the CloudFront
+  // redirect plane does for the same declarations: a same-origin target keeps the path-routing prefix
+  // and the query; an off-site target (the root space only) is sent as declared.
+  if (publicationSource.status === "selected") {
+    const location = publicationContentRedirectLocationV1(publicationSource.artifact, input.publicationRequestPath);
+    if (location) {
+      const response = new Response(null, {
+        status: 308,
+        headers: { location: location.startsWith("/") ? `${url.origin}${basePath}${location}${url.search}` : location },
+      });
+      applySecurityHeaders(response.headers);
+      if (isInternalPublication) applyInternalContentResponsePolicy(response.headers);
+      return response;
+    }
+  }
 
   // The tenant as it renders in THIS environment: its record with the declared
   // `.tot/config.json` fields applied (compliance, siteType, capabilities,
@@ -613,6 +630,8 @@ export async function runRenderChain(input: RenderChainInput): Promise<Response>
   locals.content = bindPublicationSpaceContentProviderV1(
     sharedRootContent,
     publicationSource.status === "selected" ? publicationSource.artifact : undefined,
+    // A discovery document lists the whole space it is bound to, not one selected page.
+    { wholeSpace: isPlatformPublicDiscoveryPath(renderPath) },
   );
   // Developer-draft content overlay — serves the AI-edited artifacts to the draft
   // owner only; every other viewer keeps the published/base chain above.