@byline/host-tanstack-start 3.20.4 → 4.0.0

package/dist/admin-shell/collections/list.js

@@ -7,6 +7,7 @@ import { Container, GripperVerticalIcon, IconButton, LoaderRing, PlusIcon, Searc
 import { DndContext, KeyboardSensor, PointerSensor, useSensor, useSensors } from "@dnd-kit/core";
 import { SortableContext, sortableKeyboardCoordinates, useSortable, verticalListSortingStrategy } from "@dnd-kit/sortable";
 import classnames from "classnames";
+import { getAdminRoutePath } from "../../routes/admin-path.js";
 import { Link, useNavigate } from "../chrome/loose-router.js";
 import { RouterPager } from "../chrome/router-pager.js";
 import { SortAscendingIcon } from "../chrome/sort-icons.js";
@@ -157,7 +158,7 @@ const ListView = ({ data, columns, workflowStatuses, useAsTitle, orderable = fal
             delete params.page;
             params.query = query;
             navigate({
-                to: '/admin/collections/$collection',
+                to: getAdminRoutePath('collections', '$collection'),
                 params: {
                     collection: data.included.collection.path
                 },
@@ -170,7 +171,7 @@ const ListView = ({ data, columns, workflowStatuses, useAsTitle, orderable = fal
         delete params.page;
         delete params.query;
         navigate({
-            to: '/admin/collections/$collection',
+            to: getAdminRoutePath('collections', '$collection'),
             params: {
                 collection: data.included.collection.path
             },
@@ -184,7 +185,7 @@ const ListView = ({ data, columns, workflowStatuses, useAsTitle, orderable = fal
         if ('_all' === value) delete params.status;
         else params.status = value;
         navigate({
-            to: '/admin/collections/$collection',
+            to: getAdminRoutePath('collections', '$collection'),
             params: {
                 collection: data.included.collection.path
             },
@@ -197,7 +198,7 @@ const ListView = ({ data, columns, workflowStatuses, useAsTitle, orderable = fal
         delete params.page;
         params.page_size = Number.parseInt(value, 10);
         navigate({
-            to: '/admin/collections/$collection',
+            to: getAdminRoutePath('collections', '$collection'),
             params: {
                 collection: data.included.collection.path
             },
@@ -223,7 +224,7 @@ const ListView = ({ data, columns, workflowStatuses, useAsTitle, orderable = fal
                         /*#__PURE__*/ jsx(IconButton, {
                             "aria-label": t('collections.list.createAriaLabel'),
                             render: /*#__PURE__*/ jsx(Link, {
-                                to: '/admin/collections/$collection/create',
+                                to: getAdminRoutePath('collections', '$collection', 'create'),
                                 params: {
                                     collection: data.included.collection.path
                                 }
@@ -328,7 +329,7 @@ const ListView = ({ data, columns, workflowStatuses, useAsTitle, orderable = fal
                                                                 [list_module.cellCenter]: 'center' === column.align
                                                             }),
                                                             children: useAsTitle && column.fieldName === useAsTitle ? /*#__PURE__*/ jsx(Link, {
-                                                                to: '/admin/collections/$collection/$id',
+                                                                to: getAdminRoutePath('collections', '$collection', '$id'),
                                                                 params: {
                                                                     collection: data.included.collection.path,
                                                                     id: document.id
@@ -371,7 +372,7 @@ const ListView = ({ data, columns, workflowStatuses, useAsTitle, orderable = fal
                                                         [list_module.cellCenter]: 'center' === column.align
                                                     }),
                                                     children: useAsTitle && column.fieldName === useAsTitle ? /*#__PURE__*/ jsx(Link, {
-                                                        to: '/admin/collections/$collection/$id',
+                                                        to: getAdminRoutePath('collections', '$collection', '$id'),
                                                         params: {
                                                             collection: data.included.collection.path,
                                                             id: document.id

package/dist/admin-shell/collections/restore-version-modal.js

@@ -5,6 +5,7 @@ import { useRouter } from "@tanstack/react-router";
 import { useTranslation } from "@byline/i18n/react";
 import { Alert, Button, LoaderEllipsis, Modal } from "@byline/ui/react";
 import classnames from "classnames";
+import { getAdminRoutePath } from "../../routes/admin-path.js";
 import { restoreDocumentVersion } from "../../server-fns/collections/index.js";
 import { useNavigate } from "../chrome/loose-router.js";
 import restore_version_modal_module from "./restore-version-modal.module.js";
@@ -29,7 +30,7 @@ function RestoreVersionModal({ collection, documentId, versionId, versionLabel,
             onClose();
             await router.invalidate();
             navigate({
-                to: '/admin/collections/$collection/$id',
+                to: getAdminRoutePath('collections', '$collection', '$id'),
                 params: {
                     collection,
                     id: documentId

package/dist/admin-shell/collections/tree-list.js

@@ -1,5 +1,5 @@
 import { jsx, jsxs } from "react/jsx-runtime";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import { useRouter } from "@tanstack/react-router";
 import { StatusBadge, renderFormatted } from "@byline/admin/react";
 import { useTranslation } from "@byline/i18n/react";
@@ -7,6 +7,8 @@ import { Container, GripperVerticalIcon, IconButton, PlusIcon, Section, Table, u
 import { DndContext, KeyboardSensor, PointerSensor, useSensor, useSensors } from "@dnd-kit/core";
 import { SortableContext, sortableKeyboardCoordinates, useSortable, verticalListSortingStrategy } from "@dnd-kit/sortable";
 import classnames from "classnames";
+import { getAdminRoutePath } from "../../routes/admin-path.js";
+import { createAdminTreeMoveController, getAdminTreeMoveUiEffects, shouldSyncAdminTreeRows } from "../../server-fns/collections/tree-mutation.js";
 import { Link } from "../chrome/loose-router.js";
 import { TableHeadingCellSortable } from "../chrome/th-sortable.js";
 import { formatNumber } from "../chrome/utils.js";
@@ -17,9 +19,10 @@ function getColumnValue(row, fieldName) {
     if (row.fields && fieldName in row.fields) return row.fields[fieldName];
     return row[fieldName];
 }
-function SortableTreeRow({ id, depth, dragging, dragHandleLabel, children }) {
+function SortableTreeRow({ id, dragging, disabled, dragHandleLabel, children }) {
     const { setNodeRef, attributes, listeners, transform, transition, isDragging } = useSortable({
-        id
+        id,
+        disabled
     });
     const style = {
         transform: transform ? `translate3d(0, ${transform.y}px, 0)` : void 0,
@@ -39,6 +42,7 @@ function SortableTreeRow({ id, depth, dragging, dragHandleLabel, children }) {
                 className: classnames('byline-tree-list-drag-cell', tree_list_module.dragCell),
                 children: /*#__PURE__*/ jsx("button", {
                     type: "button",
+                    disabled: disabled,
                     className: classnames('byline-tree-list-drag-handle', tree_list_module.dragHandle),
                     "aria-label": dragHandleLabel,
                     ...attributes,
@@ -59,8 +63,12 @@ const TreeListView = ({ rows, columns, workflowStatuses, useAsTitle, collection,
     ]);
     const [localPlaced, setLocalPlaced] = useState(()=>rows.filter((r)=>!r.unplaced));
     const [isMoving, setIsMoving] = useState(false);
+    const [moveController] = useState(()=>createAdminTreeMoveController());
+    const preserveOptimisticForRows = useRef(null);
     useEffect(()=>{
-        if (!isMoving) setLocalPlaced(rows.filter((r)=>!r.unplaced));
+        if (!shouldSyncAdminTreeRows(rows, preserveOptimisticForRows.current, isMoving)) return;
+        preserveOptimisticForRows.current = null;
+        setLocalPlaced(rows.filter((r)=>!r.unplaced));
     }, [
         rows,
         isMoving
@@ -89,10 +97,13 @@ const TreeListView = ({ rows, columns, workflowStatuses, useAsTitle, collection,
         setOverId(null);
         setOffsetLeft(0);
     };
-    const handleDragStart = ({ active })=>setActiveId(String(active.id));
+    const handleDragStart = ({ active })=>{
+        if (!moveController.isMoving()) setActiveId(String(active.id));
+    };
     const handleDragMove = ({ delta })=>setOffsetLeft(delta.x);
     const handleDragOver = ({ over })=>setOverId(over ? String(over.id) : null);
     const handleDragEnd = async ({ active, over })=>{
+        if (moveController.isMoving()) return void resetDnd();
         const proj = null != over ? getTreeProjection(localPlaced, String(active.id), String(over.id), offsetLeft, INDENT) : null;
         resetDnd();
         if (!onMove || null == proj) return;
@@ -103,19 +114,24 @@ const TreeListView = ({ rows, columns, workflowStatuses, useAsTitle, collection,
         if (unchanged) return;
         setLocalPlaced(next);
         setIsMoving(true);
-        try {
-            await onMove({
+        const outcome = await moveController.execute(()=>onMove({
                 documentId,
                 parentDocumentId: proj.parentId,
                 beforeDocumentId: proj.beforeId,
                 afterDocumentId: proj.afterId
-            });
-            await router.invalidate();
-        } catch  {
+            }), ()=>router.invalidate());
+        if ('suppressed' === outcome.status) {
             setLocalPlaced(current);
+            setIsMoving(moveController.isMoving());
+            return;
+        }
+        const effects = getAdminTreeMoveUiEffects(outcome);
+        if (effects.rollback) setLocalPlaced(current);
+        if (null != effects.structuralFailure) {
+            const conflict = 'conflict' === effects.structuralFailure;
             toastManager.add({
-                title: t('collections.list.reorderFailedToast'),
-                description: t("collections.list.reorderFailedDescription"),
+                title: t(conflict ? 'collections.list.treeConflictToast' : 'collections.list.reorderFailedToast'),
+                description: t(conflict ? "collections.list.treeConflictDescription" : "collections.list.reorderFailedDescription"),
                 data: {
                     intent: 'danger',
                     iconType: 'danger',
@@ -123,9 +139,29 @@ const TreeListView = ({ rows, columns, workflowStatuses, useAsTitle, collection,
                     close: true
                 }
             });
-        } finally{
-            setIsMoving(false);
         }
+        if (effects.committedHookWarning) toastManager.add({
+            title: t('collections.list.treeHookFailedToast'),
+            description: t("collections.list.treeHookFailedDescription"),
+            data: {
+                intent: 'warning',
+                iconType: 'warning',
+                icon: true,
+                close: true
+            }
+        });
+        if (effects.refreshWarning) toastManager.add({
+            title: t('collections.list.treeRefreshFailedToast'),
+            description: t("collections.list.treeRefreshFailedDescription"),
+            data: {
+                intent: 'warning',
+                iconType: 'warning',
+                icon: true,
+                close: true
+            }
+        });
+        if (effects.preserveOptimistic) preserveOptimisticForRows.current = rows;
+        setIsMoving(false);
     };
     const renderCells = (row, depth)=>columns.map((column)=>{
             const fieldName = column.fieldName;
@@ -147,7 +183,7 @@ const TreeListView = ({ rows, columns, workflowStatuses, useAsTitle, collection,
                             children: "└─"
                         }),
                         /*#__PURE__*/ jsx(Link, {
-                            to: '/admin/collections/$collection/$id',
+                            to: getAdminRoutePath('collections', '$collection', '$id'),
                             params: {
                                 collection,
                                 id: row.id
@@ -183,7 +219,7 @@ const TreeListView = ({ rows, columns, workflowStatuses, useAsTitle, collection,
                         /*#__PURE__*/ jsx(IconButton, {
                             "aria-label": t('collections.list.createAriaLabel'),
                             render: /*#__PURE__*/ jsx(Link, {
-                                to: '/admin/collections/$collection/create',
+                                to: getAdminRoutePath('collections', '$collection', 'create'),
                                 params: {
                                     collection
                                 }
@@ -234,8 +270,8 @@ const TreeListView = ({ rows, columns, workflowStatuses, useAsTitle, collection,
                                                 const depth = row.id === activeId && projection ? projection.depth : row.depth;
                                                 return dndEnabled ? /*#__PURE__*/ jsx(SortableTreeRow, {
                                                     id: row.id,
-                                                    depth: depth,
                                                     dragging: row.id === activeId,
+                                                    disabled: isMoving,
                                                     dragHandleLabel: t('collections.list.dragHandleAriaLabel'),
                                                     children: renderCells(row, depth)
                                                 }, row.id) : /*#__PURE__*/ jsx(Table.Row, {

package/dist/admin-shell/collections/view-menu.js

@@ -3,6 +3,7 @@ import { useEffect } from "react";
 import { useTranslation } from "@byline/i18n/react";
 import { Button, HistoryIcon, IconButton, Label, Select } from "@byline/ui/react";
 import classnames from "classnames";
+import { getAdminRoutePath } from "../../routes/admin-path.js";
 import { useNavigate } from "../chrome/loose-router.js";
 import { PreviewLink } from "./preview-link.js";
 import view_menu_module from "./view-menu.module.js";
@@ -11,7 +12,7 @@ const ViewMenu = ({ collection, documentId, activeView, locale, depth, contentLo
     const { t } = useTranslation('byline-admin');
     useEffect(()=>{
         if ('edit' === activeView && 'all' === locale) navigate({
-            to: '/admin/collections/$collection/$id',
+            to: getAdminRoutePath('collections', '$collection', '$id'),
             params: {
                 collection,
                 id: documentId
@@ -36,7 +37,7 @@ const ViewMenu = ({ collection, documentId, activeView, locale, depth, contentLo
                 locale: value
             });
         if ('api' === activeView) navigate({
-            to: '/admin/collections/$collection/$id/api',
+            to: getAdminRoutePath('collections', '$collection', '$id', 'api'),
             params: {
                 collection,
                 id: documentId
@@ -44,14 +45,14 @@ const ViewMenu = ({ collection, documentId, activeView, locale, depth, contentLo
             search: search
         });
         else 'history' === activeView ? navigate({
-            to: '/admin/collections/$collection/$id/history',
+            to: getAdminRoutePath('collections', '$collection', '$id', 'history'),
             params: {
                 collection,
                 id: documentId
             },
             search: search
         }) : navigate({
-            to: '/admin/collections/$collection/$id',
+            to: getAdminRoutePath('collections', '$collection', '$id'),
             params: {
                 collection,
                 id: documentId
@@ -64,7 +65,7 @@ const ViewMenu = ({ collection, documentId, activeView, locale, depth, contentLo
         const n = Number.parseInt(value, 10);
         const nextDepth = Number.isFinite(n) ? Math.max(0, Math.min(3, n)) : 0;
         navigate({
-            to: '/admin/collections/$collection/$id/api',
+            to: getAdminRoutePath('collections', '$collection', '$id', 'api'),
             params: {
                 collection,
                 id: documentId
@@ -154,7 +155,7 @@ const ViewMenu = ({ collection, documentId, activeView, locale, depth, contentLo
                 size: "xs",
                 variant: 'history' === activeView ? 'filled' : 'text',
                 onClick: ()=>navigate({
-                        to: '/admin/collections/$collection/$id/history',
+                        to: getAdminRoutePath('collections', '$collection', '$id', 'history'),
                         params: {
                             collection,
                             id: documentId
@@ -172,7 +173,7 @@ const ViewMenu = ({ collection, documentId, activeView, locale, depth, contentLo
                 variant: 'edit' === activeView ? 'filled' : 'outlined',
                 className: classnames('byline-view-menu-button', view_menu_module.button),
                 onClick: ()=>navigate({
-                        to: '/admin/collections/$collection/$id',
+                        to: getAdminRoutePath('collections', '$collection', '$id'),
                         params: {
                             collection,
                             id: documentId
@@ -188,7 +189,7 @@ const ViewMenu = ({ collection, documentId, activeView, locale, depth, contentLo
                 variant: 'api' === activeView ? 'filled' : 'outlined',
                 className: classnames('byline-view-menu-button', view_menu_module.button),
                 onClick: ()=>navigate({
-                        to: '/admin/collections/$collection/$id/api',
+                        to: getAdminRoutePath('collections', '$collection', '$id', 'api'),
                         params: {
                             collection,
                             id: documentId

package/dist/auth/auth-context.d.ts

@@ -32,6 +32,19 @@
  * Burns a refresh-token rotation only when the access token actually
  * fails verification — not on every request. The "one session" UX is
  * the consequence of this helper working invisibly behind each call.
+ *
+ * Resolution is memoized per request (`oncePerRequest`): every call within
+ * one logical request returns the same `RequestContext` instance — same
+ * actor snapshot, same `requestId`. Two invariants depend on this:
+ *
+ *   - The read-authorization layer binds each `ReadContext` to one
+ *     immutable authority token that includes `requestId`; a fresh id per
+ *     call makes any two reads sharing a `ReadContext` (the admin tree
+ *     view, hook-threaded nested reads) throw
+ *     'ReadContext cannot be reused across request authorities'.
+ *   - The refresh path rotates the refresh token; a second unmemoized call
+ *     in the same request would re-run the dance against the
+ *     already-rotated cookie and sign the admin out.
  */
 import { type RequestContext } from '@byline/auth';
 export declare function getAdminRequestContext(): Promise<RequestContext>;

package/dist/auth/auth-context.js

@@ -2,12 +2,16 @@ import { ERR_UNAUTHENTICATED } from "@byline/auth";
 import { getServerConfig } from "@byline/core";
 import { v7 } from "uuid";
 import { clearSessionCookies, readAccessTokenCookie, readRefreshTokenCookie, setSessionCookies } from "./auth-cookies.js";
+import { oncePerRequest } from "./request-scope.js";
 function requireSessionProvider() {
     const provider = getServerConfig().sessionProvider;
     if (!provider) throw new Error("No sessionProvider configured on ServerConfig. Construct a JwtSessionProvider in your server config and pass it to initBylineCore().");
     return provider;
 }
 async function getAdminRequestContext() {
+    return oncePerRequest('byline:admin-request-context', resolveAdminRequestContext);
+}
+async function resolveAdminRequestContext() {
     const provider = requireSessionProvider();
     const accessToken = readAccessTokenCookie();
     if (accessToken) try {

package/dist/auth/request-scope.d.ts

@@ -0,0 +1,16 @@
+/**
+ * This Source Code is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) Infonomic Company Limited
+ */
+/**
+ * Resolve `factory` at most once per HTTP request for a given `key`. The
+ * returned promise is memoized on the current Start request — rejections
+ * included, since a request's cookies cannot change mid-flight and retrying
+ * a failed refresh would burn a second rotation on an already-rotated
+ * token. Outside the Start runtime (seed scripts, unit tests, background
+ * jobs) there is no request to key on and the factory runs unmemoized.
+ */
+export declare function oncePerRequest<T>(key: string, factory: () => Promise<T>): Promise<T>;

package/dist/auth/request-scope.js

@@ -0,0 +1,24 @@
+import { getRequest } from "@tanstack/react-start/server";
+const requestScopes = new WeakMap();
+function oncePerRequest(key, factory) {
+    const request = currentRequest();
+    if (!request) return factory();
+    let scope = requestScopes.get(request);
+    if (!scope) {
+        scope = new Map();
+        requestScopes.set(request, scope);
+    }
+    const existing = scope.get(key);
+    if (existing) return existing;
+    const pending = factory();
+    scope.set(key, pending);
+    return pending;
+}
+function currentRequest() {
+    try {
+        return getRequest();
+    } catch  {
+        return;
+    }
+}
+export { oncePerRequest };

package/dist/integrations/abilities.js

@@ -1,16 +1,17 @@
 import { useRouteContext } from "@tanstack/react-router";
-const ADMIN_ROUTE_ID = '/_byline/admin';
-function useAbility(ability) {
-    const { user } = useRouteContext({
-        from: ADMIN_ROUTE_ID
+import { getAdminRouteId } from "../routes/admin-path.js";
+function useAbilityRouteContext() {
+    return useRouteContext({
+        from: getAdminRouteId()
     });
+}
+function useAbility(ability) {
+    const { user } = useAbilityRouteContext();
     if (user.is_super_admin) return true;
     return user.abilities.includes(ability);
 }
 function useAbilities() {
-    const { user } = useRouteContext({
-        from: ADMIN_ROUTE_ID
-    });
+    const { user } = useAbilityRouteContext();
     const has = (ability)=>user.is_super_admin || user.abilities.includes(ability);
     const hasAny = (abilities)=>user.is_super_admin || abilities.some((key)=>user.abilities.includes(key));
     return {

package/dist/integrations/byline-public-client.d.ts

@@ -5,5 +5,43 @@
  *
  * Copyright (c) Infonomic Company Limited
  */
+/**
+ * The host's *public-read* `BylineClient` singleton — the strict
+ * "preview-can-never-apply" sibling of `getViewerBylineClient`.
+ *
+ * Configured with `actor: null` and `readMode: 'published'`, full stop.
+ * The `requestContext` factory does not consult the `byline_preview`
+ * cookie or attempt any admin-session resolution, so an admin browsing
+ * with preview mode on cannot accidentally elevate a read that flows
+ * through this client. `assertActorCanPerform` permits the null actor
+ * exactly on `read` with `readMode === 'published'`, which is what the
+ * factory always returns.
+ *
+ * **Use this client for:**
+ *   - RSS feeds, Atom feeds, sitemaps
+ *   - JSON or other endpoints exposed to third-party consumers
+ *   - any response that an upstream CDN / cache might serve to multiple
+ *     visitors without keying off the `byline_preview` cookie
+ *
+ * **Use `getViewerBylineClient` instead for:**
+ *   - user-facing public pages where an admin's preview-mode session
+ *     should be honoured
+ *
+ * Both clients share the same module-scoped singleton pattern so the
+ * SDK's per-instance `collectionRecordCache` is amortised across the
+ * process lifetime.
+ *
+ * Companion: `getAdminBylineClient` in `./byline-client.ts` for the
+ * admin webapp's authenticated reads (resolves the `RequestContext`
+ * from session cookies, memoized per request).
+ */
+import { type RequestContext } from '@byline/auth';
 import { type BylineClient } from '@byline/client';
+/**
+ * Anonymous, published-only context — memoized per request so the
+ * context (and its requestId) is stable across every read in one
+ * request: reads sharing a ReadContext must bind a single request
+ * authority.
+ */
+export declare function resolvePublicRequestContext(): Promise<RequestContext>;
 export declare function getPublicBylineClient(): BylineClient;

package/dist/integrations/byline-public-client.js

@@ -1,15 +1,19 @@
 import { createRequestContext } from "@byline/auth";
 import { createBylineClient } from "@byline/client";
 import { getServerConfig } from "@byline/core";
+import { oncePerRequest } from "../auth/request-scope.js";
+function resolvePublicRequestContext() {
+    return oncePerRequest('byline:public-request-context', async ()=>createRequestContext({
+            readMode: 'published'
+        }));
+}
 let cachedClient;
 function getPublicBylineClient() {
     if (cachedClient) return cachedClient;
     cachedClient = createBylineClient({
         config: getServerConfig(),
-        requestContext: ()=>createRequestContext({
-                readMode: 'published'
-            })
+        requestContext: resolvePublicRequestContext
     });
     return cachedClient;
 }
-export { getPublicBylineClient };
+export { getPublicBylineClient, resolvePublicRequestContext };

package/dist/integrations/byline-viewer-client.d.ts

@@ -7,6 +7,12 @@
  */
 import { type BylineClient } from '@byline/client';
 export declare function getViewerBylineClient(): BylineClient;
+/**
+ * Preview-aware viewer context — memoized per request so every read in
+ * one request binds the same context instance (and requestId): reads
+ * sharing a ReadContext must resolve a single request authority.
+ */
+export declare function resolveViewerRequestContext(): Promise<import("@byline/auth").RequestContext>;
 /**
  * Resolve whether the current request should surface non-published
  * versions. True iff the preview cookie is set **and** a valid admin

package/dist/integrations/byline-viewer-client.js

@@ -3,30 +3,35 @@ import { createBylineClient } from "@byline/client";
 import { getServerConfig } from "@byline/core";
 import { getAdminRequestContext } from "../auth/auth-context.js";
 import { readPreviewCookie } from "../auth/preview-cookies.js";
+import { oncePerRequest } from "../auth/request-scope.js";
 let cachedClient;
 function getViewerBylineClient() {
     if (cachedClient) return cachedClient;
     cachedClient = createBylineClient({
         config: getServerConfig(),
-        requestContext: async ()=>{
-            if (!readPreviewCookie()) return createRequestContext({
-                readMode: 'published'
-            });
-            try {
-                const ctx = await getAdminRequestContext();
-                return {
-                    ...ctx,
-                    readMode: 'any'
-                };
-            } catch  {
-                return createRequestContext({
-                    readMode: 'published'
-                });
-            }
-        }
+        requestContext: resolveViewerRequestContext
     });
     return cachedClient;
 }
+function resolveViewerRequestContext() {
+    return oncePerRequest('byline:viewer-request-context', resolveViewerContext);
+}
+async function resolveViewerContext() {
+    if (!readPreviewCookie()) return createRequestContext({
+        readMode: 'published'
+    });
+    try {
+        const ctx = await getAdminRequestContext();
+        return {
+            ...ctx,
+            readMode: 'any'
+        };
+    } catch  {
+        return createRequestContext({
+            readMode: 'published'
+        });
+    }
+}
 async function isPreviewActive() {
     if (!readPreviewCookie()) return false;
     try {
@@ -36,4 +41,4 @@ async function isPreviewActive() {
         return false;
     }
 }
-export { getViewerBylineClient, isPreviewActive };
+export { getViewerBylineClient, isPreviewActive, resolveViewerRequestContext };

package/dist/integrations/start-errors.js

@@ -4,7 +4,8 @@ const CODED_ERROR_NAMES = new Set([
     'AdminPermissionsError',
     'AdminRolesError',
     'AdminUsersError',
-    'AuthError'
+    'AuthError',
+    'BylineError'
 ]);
 class BylineCodedError extends Error {
     constructor(payload){

package/dist/routes/admin-path.d.ts

@@ -0,0 +1,22 @@
+/**
+ * This Source Code is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (c) Infonomic Company Limited
+ */
+/** Build an admin URL or parameterized TanStack route from client-safe config. */
+export declare function getAdminRoutePath(...segments: ReadonlyArray<string | number>): string;
+/** Build the matching pathless-group route ID used by generated host route trees. */
+export declare function getAdminRouteId(...segments: ReadonlyArray<string | number>): string;
+/** True when a pathname is the target route or one of its segment-delimited descendants. */
+export declare function isRoutePathWithin(pathname: string, target: string): boolean;
+/**
+ * Accept an untrusted callback only when it is an unencoded, same-origin path
+ * inside the configured admin mount.
+ */
+export declare function resolveAdminCallbackPath(value: unknown): string | undefined;
+/** Resolve an untrusted callback or fall back to the configured admin dashboard. */
+export declare function resolveAdminSignInRedirect(value: unknown): string;
+/** Match the admin root exactly and admin child entries by pathname prefix. */
+export declare function isAdminRoutePathActive(pathname: string, ...segments: ReadonlyArray<string>): boolean;

package/dist/routes/admin-path.js

@@ -0,0 +1,35 @@
+import { getClientConfig, normalizeRootRelativeRedirect } from "@byline/core";
+function getAdminRoutePath(...segments) {
+    const configuredBase = getClientConfig().routes.admin;
+    const normalizedBase = configuredBase.replace(/^\/+|\/+$/g, '');
+    const base = normalizedBase ? `/${normalizedBase}` : '/';
+    const suffix = segments.map((segment)=>String(segment).replace(/^\/+|\/+$/g, '')).filter(Boolean).join('/');
+    if (!suffix) return base;
+    return '/' === base ? `/${suffix}` : `${base}/${suffix}`;
+}
+function getAdminRouteId(...segments) {
+    return `/_byline${getAdminRoutePath(...segments)}`;
+}
+function isRoutePathWithin(pathname, target) {
+    const current = pathname.length > 1 ? pathname.replace(/\/+$/, '') : pathname;
+    const base = target.length > 1 ? target.replace(/\/+$/, '') : target;
+    return current === base || ('/' === base ? current.startsWith('/') : current.startsWith(`${base}/`));
+}
+function resolveAdminCallbackPath(value) {
+    if ('string' != typeof value) return;
+    const normalized = normalizeRootRelativeRedirect(value);
+    if (!normalized) return;
+    const url = new URL(normalized, 'https://byline.invalid');
+    if (!isRoutePathWithin(url.pathname, getAdminRoutePath())) return;
+    return `${url.pathname}${url.search}${url.hash}`;
+}
+function resolveAdminSignInRedirect(value) {
+    return resolveAdminCallbackPath(value) ?? getAdminRoutePath();
+}
+function isAdminRoutePathActive(pathname, ...segments) {
+    const target = getAdminRoutePath(...segments);
+    const current = pathname.length > 1 ? pathname.replace(/\/+$/, '') : pathname;
+    if (0 === segments.length) return current === target;
+    return isRoutePathWithin(current, target);
+}
+export { getAdminRouteId, getAdminRoutePath, isAdminRoutePathActive, isRoutePathWithin, resolveAdminCallbackPath, resolveAdminSignInRedirect };