bsmnt 0.7.1 → 0.10.0

package/dist/modules/features/cms/sanity-pagebuilder/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/modules/features/cms/sanity-pagebuilder/config.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,WAAW,kCAAkC;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,aAAa,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,eAAO,MAAM,uBAAuB,EAAE,kCA6CrC,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/modules/features/cms/sanity-pagebuilder/config.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,WAAW,kCAAkC;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,aAAa,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,eAAO,MAAM,uBAAuB,EAAE,kCAgDrC,CAAC"}

package/dist/modules/features/cms/sanity-pagebuilder/config.js

@@ -9,15 +9,18 @@ export const sanityPagebuilderConfig = {
         "@phosphor-icons/react": "^2.1.10",
         "@portabletext/types": "^4.0.2",
         "@sanity/asset-utils": "^2.3.0",
+        "@sanity/icons": "^3.7.4",
         "@sanity/image-url": "^2.1.1",
         "@sanity/table": "^2.0.1",
+        "@sanity/ui": "^3.1.14",
         "@sanity/vision": "^5.30.0",
         "@sanity/visual-editing": "^5.4.3",
-        "next-sanity": "^13.0.10",
+        "next-sanity": "^13.3.1",
         sanity: "^5.30.0",
         "sanity-plugin-media": "^4.1.1",
     },
     devDependencies: {
+        "@sanity/browserslist-config": "^1.0.5",
         "schema-dts": "^2.0.0",
     },
     scripts: {

package/dist/modules/features/cms/sanity-pagebuilder/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../src/modules/features/cms/sanity-pagebuilder/config.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAUH,MAAM,CAAC,MAAM,uBAAuB,GAAuC;IAC1E,IAAI,EAAE,oBAAoB;IAE1B,YAAY,EAAE;QACb,uBAAuB,EAAE,SAAS;QAClC,qBAAqB,EAAE,QAAQ;QAC/B,qBAAqB,EAAE,QAAQ;QAC/B,mBAAmB,EAAE,QAAQ;QAC7B,eAAe,EAAE,QAAQ;QACzB,gBAAgB,EAAE,SAAS;QAC3B,wBAAwB,EAAE,QAAQ;QAClC,aAAa,EAAE,UAAU;QACzB,MAAM,EAAE,SAAS;QACjB,qBAAqB,EAAE,QAAQ;KAC/B;IAED,eAAe,EAAE;QAChB,YAAY,EAAE,QAAQ;KACtB;IAED,OAAO,EAAE;QACR,gBAAgB,EACf,wFAAwF;QACzF,gBAAgB,EAAE,qCAAqC;QACvD,MAAM,EAAE,wBAAwB;QAChC,QAAQ,EAAE,wBAAwB;KAClC;IAED,aAAa,EAAE;QACd,yBAAyB;QACzB,uCAAuC;QACvC,6BAA6B;QAC7B,uBAAuB;QACvB,uBAAuB;QACvB,kBAAkB;QAClB,sBAAsB;QACtB,+BAA+B;QAC/B,YAAY;QACZ,SAAS;QACT,cAAc;QACd,gBAAgB;QAChB,UAAU;QACV,mBAAmB;QACnB,4BAA4B;KAC5B;CACD,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../src/modules/features/cms/sanity-pagebuilder/config.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAUH,MAAM,CAAC,MAAM,uBAAuB,GAAuC;IAC1E,IAAI,EAAE,oBAAoB;IAE1B,YAAY,EAAE;QACb,uBAAuB,EAAE,SAAS;QAClC,qBAAqB,EAAE,QAAQ;QAC/B,qBAAqB,EAAE,QAAQ;QAC/B,eAAe,EAAE,QAAQ;QACzB,mBAAmB,EAAE,QAAQ;QAC7B,eAAe,EAAE,QAAQ;QACzB,YAAY,EAAE,SAAS;QACvB,gBAAgB,EAAE,SAAS;QAC3B,wBAAwB,EAAE,QAAQ;QAClC,aAAa,EAAE,SAAS;QACxB,MAAM,EAAE,SAAS;QACjB,qBAAqB,EAAE,QAAQ;KAC/B;IAED,eAAe,EAAE;QAChB,6BAA6B,EAAE,QAAQ;QACvC,YAAY,EAAE,QAAQ;KACtB;IAED,OAAO,EAAE;QACR,gBAAgB,EACf,wFAAwF;QACzF,gBAAgB,EAAE,qCAAqC;QACvD,MAAM,EAAE,wBAAwB;QAChC,QAAQ,EAAE,wBAAwB;KAClC;IAED,aAAa,EAAE;QACd,yBAAyB;QACzB,uCAAuC;QACvC,6BAA6B;QAC7B,uBAAuB;QACvB,uBAAuB;QACvB,kBAAkB;QAClB,sBAAsB;QACtB,+BAA+B;QAC/B,YAAY;QACZ,SAAS;QACT,cAAc;QACd,gBAAgB;QAChB,UAAU;QACV,mBAAmB;QACnB,4BAA4B;KAC5B;CACD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "bsmnt",
-	"version": "0.7.1",
+	"version": "0.10.0",
 	"packageManager": "bun@1.3.14",
 	"description": "CLI to scaffold basement projects and add integrations",
 	"type": "module",
@@ -81,7 +81,7 @@
 		"commander": "^13.1.0",
 		"dotenv": "^17.4.2",
 		"fs-extra": "^11.3.3",
-		"next-sanity": "^13.0.10",
+		"next-sanity": "^13.3.1",
 		"ora": "^9.1.0",
 		"picocolors": "^1.1.1",
 		"prompts": "^2.4.2",

package/src/modules/features/cms/sanity/files/app/api/blog/[slug]/route.ts

@@ -4,6 +4,7 @@ import { SanityFetch } from "@/lib/integrations/sanity/live";
 import { ARTICLE_QUERY } from "@/lib/integrations/sanity/queries";
 import type { Article } from "@/lib/integrations/sanity/sanity.types";
 import { portableTextToMarkdown } from "@/lib/utils/portable-text-to-markdown";
+import { getBaseUrl } from "@/lib/utils/url";
 
 export async function GET(
 	_request: Request,
@@ -16,7 +17,8 @@ export async function GET(
 	}
 
 	const slug = rawSlug.slice(0, -3);
-	const baseUrl = process.env.NEXT_PUBLIC_BASE_URL || "http://localhost:3000";
+	const baseUrl = getBaseUrl().replace(/\/$/, "");
+	const canonicalPath = `/blog/${slug}`;
 
 	if (!isSanityConfigured()) {
 		return new NextResponse("# 404 Not Found\n\nCMS not configured.", {
@@ -64,6 +66,7 @@ export async function GET(
 				"Content-Type": "text/markdown; charset=utf-8",
 				Vary: "Accept",
 				"X-Content-Type-Options": "nosniff",
+				Link: `<${baseUrl}${canonicalPath}>; rel="canonical"`,
 			},
 		});
 	} catch (error) {

package/src/modules/features/cms/sanity/files/app/sitemap.md/route.ts

@@ -1,8 +1,9 @@
 import { NextResponse } from "next/server";
 import { isSanityConfigured } from "@/lib/integrations/check-integration";
+import { getBaseUrl } from "@/lib/utils/url";
 
 export async function GET() {
-	const baseUrl = process.env.NEXT_PUBLIC_BASE_URL || "http://localhost:3000";
+	const baseUrl = getBaseUrl();
 
 	if (!isSanityConfigured()) {
 		return new NextResponse(

package/src/modules/features/cms/sanity/files/components/ui/sanity-image/index.tsx

@@ -4,13 +4,13 @@ import { urlForImage } from "@/lib/integrations/sanity/utils/image";
 
 interface SanityImageProps extends Omit<ImageProps, "src" | "aspectRatio"> {
 	image: {
-		asset: {
+		asset?: {
 			_ref: string;
 			_type: "reference";
 		};
 		alt?: string;
 		hotspot?: object;
-		crop?: object;
+		crop?: { left?: number; right?: number; top?: number; bottom?: number };
 	};
 	maxWidth?: number;
 }
@@ -19,18 +19,32 @@ export function SanityImage({
 	image,
 	maxWidth = 1920,
 	alt,
+	fill,
 	...props
 }: SanityImageProps) {
 	if (!image?.asset) return null;
 
+	// getImageDimensions is uncropped; the URL builder applies the crop.
+	// Rounding order must match @sanity/image-url: origin first, then subtract.
 	const { width, height } = getImageDimensions(image.asset);
-	const aspectRatio = width / height;
+	const { left = 0, right = 0, top = 0, bottom = 0 } = image.crop ?? {};
+	const cropLeft = Math.round(left * width);
+	const cropTop = Math.round(top * height);
+	const sourceWidth = Math.round(width - right * width - cropLeft);
+	const sourceHeight = Math.round(height - bottom * height - cropTop);
+
+	const imageProps = fill
+		? { fill: true }
+		: { width: sourceWidth, height: sourceHeight };
 
 	return (
 		<Image
-			src={urlForImage(image).width(maxWidth).url()}
+			src={urlForImage(image)
+				.width(Math.min(maxWidth, sourceWidth))
+				.url()}
 			alt={alt || image.alt || ""}
-			aspectRatio={aspectRatio}
+			aspectRatio={sourceWidth / sourceHeight}
+			{...imageProps}
 			{...props}
 		/>
 	);

package/src/modules/features/cms/sanity/files/lib/integrations/sanity/README.md

@@ -128,6 +128,37 @@ export const landing = defineType({
 
 See [ARCHITECTURE.md](../../../ARCHITECTURE.md) for cache gotchas.
 
+## Sanity Dashboard (Studio in an iframe)
+
+The Studio at `/studio` can be embedded in the Sanity Dashboard
+(`https://www.sanity.io/@<org>/studio/<appId>/<workspace>`), which loads it in an
+iframe from `www.sanity.io`. Three things have to be true for that to work:
+
+1. **Headers.** `next.config.ts` already exempts `/studio/:path*` from the
+   site-wide `X-Frame-Options` / `frame-ancestors 'self'` headers, sending
+   `frame-ancestors 'self' https://*.sanity.io` there instead and dropping
+   `X-Frame-Options` entirely for that path (it has no "allow this origin"
+   form — it must be absent, not overridden). Nothing to do here unless
+   you've hand-edited `headers()`.
+2. **Bridge script.** Already wired in: `next-sanity/studio`'s `NextStudio`
+   re-exports `NextStudioWithBridge`, which renders the
+   `core.sanity-cdn.com/bridge.js` tag the Dashboard needs. Don't hand-roll
+   that script tag, and don't switch the Studio route to
+   `next-sanity/studio/client-component` (the bridge-less variant).
+3. **Registered URL.** In [Sanity Manage](https://sanity.io/manage), the
+   Studio application's URL must be the **full path**
+   (`https://example.com/studio`), not just the domain. This can't be set
+   from code — either click through Manage, or run
+   `sanity deploy --external --url https://example.com/studio --yes` from
+   `lib/integrations/sanity`. Writing it via the API needs the
+   `sanity.project.deployStudio` grant, which read/write tokens don't have.
+
+Verify against a production build (`bun build && bun start`), not dev. One trap:
+the Dashboard reports `Failed to load iframe due to X-Frame-Options: SAMEORIGIN`
+for *any* framing failure, including a wrong registered URL with already-correct
+headers. Trust the browser console's `Framing '<url>' violates …` line instead —
+it names the URL actually being framed.
+
 ## Troubleshooting
 
 **Visual editor not loading:**

package/src/modules/features/cms/sanity/files/proxy.ts

@@ -14,6 +14,15 @@ export function proxy(request: NextRequest) {
 		return NextResponse.next();
 	}
 
+	// Collapse repeated slashes before any rewrite, or the rewrite below would
+	// mask the alias (e.g. /blog//foo.md silently resolving to /blog/foo.md).
+	const collapsedPathname = pathname.replace(/\/{2,}/g, "/");
+	if (collapsedPathname !== pathname) {
+		const url = request.nextUrl.clone();
+		url.pathname = collapsedPathname;
+		return NextResponse.redirect(url, 308);
+	}
+
 	// 1. Rewrite .md extension URLs to API routes
 	//    e.g. /blog/my-post.md → /api/blog/my-post.md
 	for (const route of mdExtensionRoutes) {

package/src/modules/features/cms/sanity-pagebuilder/files/app/api/[[...slug]]/route.ts

@@ -8,6 +8,9 @@ import { getBaseUrl } from "@/lib/utils/base-url";
 
 type PageResult = NonNullable<PAGE_QUERY_RESULT>;
 
+const isValidSegment = (segment: string) =>
+	segment.length > 0 && segment !== "." && segment !== "..";
+
 const getSlugPath = (slugParts?: string[]) => {
 	if (!slugParts?.length) return null;
 
@@ -18,8 +21,9 @@ const getSlugPath = (slugParts?: string[]) => {
 	const pathSegments = [...slugParts];
 	pathSegments[pathSegments.length - 1] = lastSegment.slice(0, -3);
 
-	const slug = pathSegments.filter(Boolean).join("/");
-	if (!slug) return null;
+	if (!pathSegments.every(isValidSegment)) return null;
+
+	const slug = pathSegments.join("/");
 
 	return slug === "index" ? null : slug;
 };
@@ -57,7 +61,7 @@ export async function GET(
 
 	const page = data as PageResult | null;
 
-	const baseUrl = getBaseUrl();
+	const baseUrl = getBaseUrl().replace(/\/$/, "");
 
 	if (!page) {
 		return new NextResponse("# 404 Not Found\n\nPage not found.", {
@@ -94,6 +98,7 @@ export async function GET(
 				"Content-Type": "text/markdown; charset=utf-8",
 				Vary: "Accept",
 				"X-Content-Type-Options": "nosniff",
+				Link: `<${baseUrl}${canonicalPath}>; rel="canonical"`,
 			},
 		},
 	);

package/src/modules/features/cms/sanity-pagebuilder/files/app/sitemap.md/route.ts

@@ -113,7 +113,13 @@ export const GET = async () => {
 
 		if (pages.length === 0) parts.push("No content published yet.", "");
 
-		return new NextResponse(parts.join("\n"));
+		return new NextResponse(parts.join("\n"), {
+			headers: {
+				"Content-Type": "text/markdown; charset=utf-8",
+				"X-Content-Type-Options": "nosniff",
+				"Cache-Control": "public, s-maxage=3600, stale-while-revalidate=600",
+			},
+		});
 	} catch (error) {
 		console.error("Error generating sitemap.md:", error);
 		return new NextResponse("# Sitemap\n\nError fetching content.", {

package/src/modules/features/cms/sanity-pagebuilder/files/components/ui/sanity-image/index.tsx

@@ -10,7 +10,7 @@ interface SanityImageProps extends Omit<ImageProps, "src" | "aspectRatio"> {
 		};
 		alt?: string;
 		hotspot?: object;
-		crop?: object;
+		crop?: { left?: number; right?: number; top?: number; bottom?: number };
 	};
 	maxWidth?: number;
 }
@@ -24,16 +24,26 @@ export function SanityImage({
 }: SanityImageProps) {
 	if (!image?.asset) return null;
 
+	// getImageDimensions is uncropped; the URL builder applies the crop.
+	// Rounding order must match @sanity/image-url: origin first, then subtract.
 	const { width, height } = getImageDimensions(image.asset);
-	const aspectRatio = width / height;
+	const { left = 0, right = 0, top = 0, bottom = 0 } = image.crop ?? {};
+	const cropLeft = Math.round(left * width);
+	const cropTop = Math.round(top * height);
+	const sourceWidth = Math.round(width - right * width - cropLeft);
+	const sourceHeight = Math.round(height - bottom * height - cropTop);
 
-	const imageProps = fill ? { fill: true } : { width, height };
+	const imageProps = fill
+		? { fill: true }
+		: { width: sourceWidth, height: sourceHeight };
 
 	return (
 		<Image
-			src={urlForImage(image).width(maxWidth).url()}
+			src={urlForImage(image)
+				.width(Math.min(maxWidth, sourceWidth))
+				.url()}
 			alt={alt || image.alt || ""}
-			aspectRatio={aspectRatio}
+			aspectRatio={sourceWidth / sourceHeight}
 			{...imageProps}
 			{...props}
 		/>

package/src/modules/features/cms/sanity-pagebuilder/files/lib/integrations/sanity/components/block-actions-item.tsx

@@ -0,0 +1,81 @@
+import { EyeClosedIcon, EyeOpenIcon } from "@sanity/icons";
+import { Badge, Box, Button, Flex, Text, Tooltip, useToast } from "@sanity/ui";
+import { useState } from "react";
+import { type ObjectItemProps, useClient, useFormValue } from "sanity";
+import { apiVersion } from "@/lib/integrations/sanity/env";
+
+const HIDDEN_KEYS_FIELD = "hiddenPageBuilderKeys";
+
+type ReferenceItem = { _key: string; _ref: string; _type: string };
+
+/**
+ * Eye-icon toggle for a page builder placement's per-page visibility. Adds the
+ * placement's `_key` to the owning document's `hiddenPageBuilderKeys`; GROQ
+ * filters those keys out at query time. Standalone control because Sanity's
+ * built-in item menu isn't extensible via public props.
+ */
+export function BlockActionsItem(props: ObjectItemProps<ReferenceItem>) {
+	const { value, renderDefault } = props;
+	const client = useClient({ apiVersion });
+	const toast = useToast();
+	const [busy, setBusy] = useState(false);
+
+	// Open document id (draft while editing).
+	const documentId = useFormValue(["_id"]) as string | undefined;
+	const hiddenKeys =
+		(useFormValue([HIDDEN_KEYS_FIELD]) as string[] | undefined) ?? [];
+	const itemKey = value._key;
+	const hidden = hiddenKeys.includes(itemKey);
+	const label = hidden ? "Show on this page" : "Hide on this page";
+
+	async function handleToggleHidden() {
+		if (busy || !documentId) return;
+		setBusy(true);
+		try {
+			// Atomic array ops (not read-modify-write) so concurrent toggles
+			// of different blocks don't clobber each other.
+			const patch = client.patch(documentId);
+			if (hidden) {
+				patch.unset([`${HIDDEN_KEYS_FIELD}[@ == "${itemKey}"]`]);
+			} else {
+				patch
+					.setIfMissing({ [HIDDEN_KEYS_FIELD]: [] })
+					.insert("after", `${HIDDEN_KEYS_FIELD}[-1]`, [itemKey]);
+			}
+			await patch.commit();
+			toast.push({
+				status: "success",
+				title: hidden ? "Block shown" : "Block hidden",
+			});
+		} catch {
+			toast.push({ status: "error", title: "Failed to update visibility" });
+		} finally {
+			setBusy(false);
+		}
+	}
+
+	return (
+		<Flex align="center" gap={1} paddingLeft={1}>
+			<Tooltip content={<Text size={1}>{label}</Text>} placement="top" portal>
+				<Button
+					mode="bleed"
+					// Open eye = visible, closed eye = hidden.
+					icon={hidden ? EyeClosedIcon : EyeOpenIcon}
+					tone={hidden ? "caution" : "default"}
+					aria-label={label}
+					// Unsaved doc has no id to patch — disable, don't no-op.
+					disabled={busy || !documentId}
+					onClick={handleToggleHidden}
+				/>
+			</Tooltip>
+			{hidden && (
+				<Badge fontSize={0} mode="outline" tone="caution">
+					Hidden
+				</Badge>
+			)}
+			<Box flex={1} style={hidden ? { opacity: 0.5 } : undefined}>
+				{renderDefault(props)}
+			</Box>
+		</Flex>
+	);
+}

package/src/modules/features/cms/sanity-pagebuilder/files/lib/integrations/sanity/components/slug-field.tsx

@@ -1,18 +1,24 @@
+import { Stack } from "@sanity/ui";
 import { type FieldProps, useFormValue } from "sanity";
+import { SlugRedirectNotice } from "@/lib/integrations/sanity/components/slug-notices";
 import { getPinnedPageById } from "@/lib/integrations/sanity/pinned-pages";
 
 const DEFAULT_DESCRIPTION = "URL path without leading slash.";
 const PINNED_DESCRIPTION =
 	"URL path without leading slash. Disabled on 📌 pinned pages.";
 
-// Swaps the slug description to a locked-state note on pinned pages.
-// (Sanity descriptions are plain strings, hence the 📌 character.)
+// Swaps the slug description on pinned pages (plain-string field, hence 📌).
 export function SlugField(props: FieldProps) {
 	const documentId = useFormValue(["_id"]) as string | undefined;
-	const isPinned = getPinnedPageById(documentId) !== null;
+	const pinned = getPinnedPageById(documentId);
 
-	return props.renderDefault({
-		...props,
-		description: isPinned ? PINNED_DESCRIPTION : DEFAULT_DESCRIPTION,
-	});
+	return (
+		<Stack space={3}>
+			{props.renderDefault({
+				...props,
+				description: pinned ? PINNED_DESCRIPTION : DEFAULT_DESCRIPTION,
+			})}
+			<SlugRedirectNotice pinnedPath={pinned?.path} />
+		</Stack>
+	);
 }

package/src/modules/features/cms/sanity-pagebuilder/files/lib/integrations/sanity/components/slug-notices.tsx

@@ -0,0 +1,135 @@
+import { Box, Button, Card, Stack, Text } from "@sanity/ui";
+import { useEffect, useState } from "react";
+import { useClient, useFormValue } from "sanity";
+import { useRouter } from "sanity/router";
+import { apiVersion } from "@/lib/integrations/sanity/env";
+import { isEmptyPageSlug } from "@/lib/integrations/sanity/page-category";
+
+// Mirrors `pageResolvedSlugExpression`'s chain; leaf joins in JS so this
+// tracks the live slug, not the last saved draft.
+const FOLDER_PATH_QUERY = `*[_id == $folderId][0]{
+  "path": array::join(array::compact([
+    parentFolder->parentFolder->parentFolder->parentFolder->parentFolder->slug.current,
+    parentFolder->parentFolder->parentFolder->parentFolder->slug.current,
+    parentFolder->parentFolder->parentFolder->slug.current,
+    parentFolder->parentFolder->slug.current,
+    parentFolder->slug.current,
+    slug.current
+  ]), "/")
+}.path`;
+
+const REDIRECT_QUERY = `*[_type == "redirect" && source.current == $source][0]._id`;
+
+// The slug field writes on every keystroke.
+const LOOKUP_DEBOUNCE_MS = 400;
+
+interface SlugRedirectNoticeProps {
+	/** Public path of a pinned page, whose URL is fixed rather than slug-derived. */
+	pinnedPath?: string | undefined;
+}
+
+/**
+ * Warns when a published redirect claims this page's URL — the catch-all
+ * route only runs `checkRedirect` after a page lookup misses, so the page
+ * wins and the redirect silently never fires.
+ *
+ * Reads the `page` form shape; don't reuse for other slug types.
+ */
+export function SlugRedirectNotice({ pinnedPath }: SlugRedirectNoticeProps) {
+	const client = useClient({ apiVersion });
+	const router = useRouter();
+	const slug = useFormValue(["slug", "current"]) as string | undefined;
+	const folderId = useFormValue(["pageFolder", "_ref"]) as string | undefined;
+	const [folderPath, setFolderPath] = useState("");
+	const [redirectId, setRedirectId] = useState<string | null>(null);
+
+	// Separate effect so the folder chain isn't re-resolved on every keystroke.
+	useEffect(() => {
+		if (!folderId) {
+			setFolderPath("");
+			return;
+		}
+
+		let active = true;
+		const published = client.withConfig({ perspective: "published" });
+
+		published
+			.fetch<string | null>(FOLDER_PATH_QUERY, { folderId })
+			.then((path) => {
+				if (active) setFolderPath(path ?? "");
+			})
+			.catch(() => {
+				if (active) setFolderPath("");
+			});
+
+		return () => {
+			active = false;
+		};
+	}, [client, folderId]);
+
+	useEffect(() => {
+		const leaf = isEmptyPageSlug(slug) ? "" : slug;
+		const source = pinnedPath
+			? pinnedPath.replace(/^\/+/, "")
+			: [folderPath, leaf].filter(Boolean).join("/");
+
+		if (!source) {
+			setRedirectId(null);
+			return;
+		}
+
+		let active = true;
+		// Drafts never reach visitors, so an unpublished redirect isn't a conflict.
+		const published = client.withConfig({ perspective: "published" });
+
+		const timer = setTimeout(async () => {
+			try {
+				const id = await published.fetch<string | null>(REDIRECT_QUERY, {
+					source,
+				});
+				if (active) setRedirectId(id);
+			} catch {
+				if (active) setRedirectId(null);
+			}
+		}, LOOKUP_DEBOUNCE_MS);
+
+		return () => {
+			active = false;
+			clearTimeout(timer);
+		};
+	}, [client, folderPath, pinnedPath, slug]);
+
+	if (!redirectId) return null;
+
+	return (
+		<Card border padding={3} radius={2} tone="caution">
+			<Stack space={3}>
+				<Stack space={2}>
+					<Text size={1} weight="semibold">
+						A redirect already claims this URL
+					</Text>
+					<Text muted size={1}>
+						Visitors reach this page instead — a redirect only runs when no page
+						matches its path. Remove the redirect, or move this page to another
+						slug.
+					</Text>
+				</Stack>
+				<Box>
+					<Button
+						fontSize={1}
+						mode="ghost"
+						onClick={() =>
+							router.navigateIntent("edit", {
+								id: redirectId,
+								type: "redirect",
+							})
+						}
+						padding={3}
+						text="Go to redirect"
+						tone="caution"
+					/>
+				</Box>
+			</Stack>
+		</Card>
+	);
+}

package/src/modules/features/cms/sanity-pagebuilder/files/lib/integrations/sanity/icons.ts

@@ -15,6 +15,7 @@ import {
 	LayoutIcon,
 	ListBulletsIcon,
 	ListIcon,
+	LockKeyIcon,
 	PackageIcon,
 	PushPinIcon,
 	QuestionIcon,
@@ -71,6 +72,7 @@ export const customJsonLdIcon = asDuotoneIcon(BracketsCurlyIcon);
 export const heroIcon = asDuotoneIcon(RocketIcon);
 export const descriptionIcon = asDuotoneIcon(TextAlignLeftIcon);
 export const contentIcon = asDuotoneIcon(ArticleNyTimesIcon);
+export const gatedContentIcon = asDuotoneIcon(LockKeyIcon);
 
 export const pageIcon = asDuotoneIcon(FileTextIcon);
 export const pinIcon = asDuotoneIcon(PushPinIcon);

package/src/modules/features/cms/sanity-pagebuilder/files/lib/integrations/sanity/live/index.tsx

@@ -25,7 +25,7 @@ type SanityFetchOptions = {
 	query: string;
 	params?: QueryParams;
 	tags?: string[];
-	stega?: boolean;
+	stega?: boolean | undefined;
 	perspective?: "published" | "drafts" | "previewDrafts";
 };
 

package/src/modules/features/cms/sanity-pagebuilder/files/lib/integrations/sanity/markdown-proxy.config.ts

@@ -22,7 +22,7 @@ export interface MarkdownRoute {
 /** .md extension routes -- rewrite to API endpoints */
 export const mdExtensionRoutes: MarkdownRoute[] = [
 	{
-		regex: /^\/(.+)\.md$/,
+		regex: /^\/((?:[^/]+\/)*[^/]+)\.md$/,
 		apiPath: "/api/[slug].md",
 		publicPath: "/[slug].md",
 	},

package/src/modules/features/cms/sanity-pagebuilder/files/lib/integrations/sanity/page-builder-config.ts

@@ -4,6 +4,7 @@ import { singletonComponents } from "./singletons";
 export type PageBuilderDocumentType =
 	| "hero"
 	| "description"
+	| "gatedContent"
 	| "blogContent"
 	| (typeof singletonComponents)[number]["schemaType"];
 
@@ -47,6 +48,12 @@ const reusablePageBuilderReferenceMembers: PageBuilderReferenceMember[] = [
 		title: "Description",
 		groups: ["generic"],
 	},
+	{
+		documentType: "gatedContent",
+		name: "gatedContentReference",
+		title: "Gated Content",
+		groups: ["generic"],
+	},
 	{
 		documentType: "blogContent",
 		name: "blogContentReference",