@byline/host-tanstack-start 3.21.0 → 4.1.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/i18n/resolve-locale.js

@@ -1,7 +1,7 @@
 import { getRequestHeader } from "@tanstack/react-start/server";
 import { AuthError, AuthErrorCodes } from "@byline/auth";
+import { getAdminRequestContext } from "@byline/client/server";
 import { resolveInterfaceLocale } from "@byline/i18n";
-import { getAdminRequestContext } from "../auth/auth-context.js";
 import { bylineCore } from "../integrations/byline-core.js";
 import { readAdminLocaleCookie } from "./locale-cookie.js";
 async function resolveRequestLocale(options) {

package/dist/index.d.ts

@@ -18,14 +18,13 @@
  *   - `@byline/host-tanstack-start/server-fns/<module>` — TanStack Start
  *     server functions for each admin module (admin-account, admin-roles,
  *     admin-users, admin-permissions, auth, collections).
- *   - `@byline/host-tanstack-start/auth/auth-context` — request-scoped
- *     `RequestContext` resolution that reads session cookies, refreshes
- *     transparently, and surfaces `ERR_UNAUTHENTICATED` to callers.
  *   - `@byline/host-tanstack-start/integrations/*` — host-side adapters
  *     binding TanStack Start primitives to the framework-neutral
- *     contracts in `@byline/ui` and `@byline/client`
- *     (`bylineFieldServices`, `bylineAdminServices`, the admin
- *     `BylineClient` singleton).
+ *     contracts in `@byline/ui`, `@byline/core`, and `@byline/client`
+ *     (`bylineFieldServices`, `bylineAdminServices`, and `host-bridge` —
+ *     the `HostRequestBridge` implementation behind the
+ *     `@byline/client/server` getters; request-context resolution and the
+ *     client singletons themselves live in `@byline/client/server`).
  *   - `@byline/host-tanstack-start/admin-shell/{chrome,collections,...}` —
  *     router-coupled admin UI: shared shell chrome (menu drawer, app bar,
  *     route-error, breadcrumbs, etc.) plus per-area page containers.

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/host-bridge.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 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
+ */
+/**
+ * Register the TanStack Start bridge. Safe to call any number of times;
+ * exported for hosts that want registration to be explicit in their
+ * server config rather than relying on a side-effect import.
+ */
+export declare function registerTanstackStartHostBridge(): void;

package/dist/integrations/host-bridge.js

@@ -0,0 +1,22 @@
+import { getCookie, getRequest, setCookie } from "@tanstack/react-start/server";
+import { registerHostRequestBridge } from "@byline/core";
+const tanstackStartRequestBridge = {
+    getRequest () {
+        try {
+            return getRequest();
+        } catch  {
+            return;
+        }
+    },
+    getCookie (name) {
+        return getCookie(name);
+    },
+    setCookie (name, value, options) {
+        setCookie(name, value, options);
+    }
+};
+function registerTanstackStartHostBridge() {
+    registerHostRequestBridge(tanstackStartRequestBridge);
+}
+registerTanstackStartHostBridge();
+export { registerTanstackStartHostBridge };

package/dist/integrations/serve-uploads.d.ts

@@ -5,6 +5,7 @@
  *
  * Copyright (c) Infonomic Company Limited
  */
+import './host-bridge.js';
 export interface UploadsHandlerOptions {
     /**
      * URL prefix to match. Trailing slash required. Default `'/uploads/'`.

package/dist/integrations/serve-uploads.js

@@ -1,5 +1,6 @@
 import { readFile, stat } from "node:fs/promises";
 import { resolve } from "node:path";
+import "./host-bridge.js";
 const DEFAULT_MIME = {
     '.avif': 'image/avif',
     '.webp': 'image/webp',

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 };

package/dist/routes/create-admin-account-route.js

@@ -5,6 +5,7 @@ import { useTranslation } from "@byline/i18n/react";
 import { Container, Section } from "@byline/ui/react";
 import { BreadcrumbsClient } from "../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js";
 import { getAccount } from "../server-fns/admin-account/index.js";
+import { getAdminRoutePath } from "./admin-path.js";
 function displayNameFor(account) {
     const parts = [
         account.given_name,
@@ -31,11 +32,11 @@ function createAdminAccountRoute(path) {
                         breadcrumbs: [
                             {
                                 label: t('chrome.menu.dashboard'),
-                                href: '/admin'
+                                href: getAdminRoutePath()
                             },
                             {
                                 label: t('chrome.account'),
-                                href: '/admin/account'
+                                href: getAdminRoutePath('account')
                             }
                         ]
                     }),

package/dist/routes/create-admin-activity-route.js

@@ -5,6 +5,7 @@ import { z } from "zod";
 import { ActivitySystemView } from "../admin-shell/admin-activity/list.js";
 import { BreadcrumbsClient } from "../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js";
 import { getSystemActivityLog } from "../server-fns/admin-activity/index.js";
+import { getAdminRoutePath } from "./admin-path.js";
 const searchSchema = z.object({
     page: z.coerce.number().int().min(1).optional(),
     page_size: z.coerce.number().int().min(1).max(100).optional(),
@@ -51,11 +52,11 @@ function createAdminActivityRoute(path) {
                         breadcrumbs: [
                             {
                                 label: t('chrome.menu.dashboard'),
-                                href: '/admin'
+                                href: getAdminRoutePath()
                             },
                             {
                                 label: t('activity.title'),
-                                href: '/admin/activity'
+                                href: getAdminRoutePath('activity')
                             }
                         ]
                     }),

package/dist/routes/create-admin-dashboard-route.js

@@ -5,6 +5,7 @@ import { useTranslation } from "@byline/i18n/react";
 import { BreadcrumbsClient } from "../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js";
 import { AdminDashboard } from "../admin-shell/chrome/dashboard.js";
 import { getCollectionStats } from "../server-fns/collections/index.js";
+import { getAdminRoutePath } from "./admin-path.js";
 function createAdminDashboardRoute(path) {
     const Route = createFileRoute(path)({
         loader: async ()=>{
@@ -30,7 +31,7 @@ function createAdminDashboardRoute(path) {
                         breadcrumbs: [
                             {
                                 label: t('chrome.menu.dashboard'),
-                                href: '/admin'
+                                href: getAdminRoutePath()
                             }
                         ]
                     }),

package/dist/routes/create-admin-layout-route.d.ts

@@ -6,7 +6,7 @@
  * Copyright (c) Infonomic Company Limited
  */
 interface AdminLayoutOpts {
-    /** Path users are redirected to when unauthenticated. Defaults to `/sign-in`. */
+    /** @deprecated Configure `routes.signIn`; an override must resolve to the same path. */
     signInPath?: string;
 }
 export declare function createAdminLayoutRoute(path: string, opts?: AdminLayoutOpts): any;

package/dist/routes/create-admin-layout-route.js

@@ -20,10 +20,12 @@ import { BylineAiAdminProvider } from "../integrations/byline-ai.js";
 import { bylineFieldServices } from "../integrations/byline-field-services.js";
 import { getCurrentAdminUser } from "../server-fns/auth/index.js";
 import { getActiveLocaleFn, setInterfaceLocaleFn } from "../server-fns/i18n/index.js";
+import { createSignInRoutePathResolver } from "./sign-in-path.js";
 function createAdminLayoutRoute(path, opts = {}) {
-    const signInPath = opts.signInPath ?? '/sign-in';
+    const resolveSignInPath = createSignInRoutePathResolver(opts.signInPath);
     const Route = createFileRoute(path)({
         beforeLoad: async ({ location })=>{
+            const signInPath = resolveSignInPath();
             try {
                 const user = await getCurrentAdminUser();
                 const activeLocale = await getActiveLocaleFn();

package/dist/routes/create-admin-permissions-route.js

@@ -4,6 +4,7 @@ import { AbilitiesInspector } from "@byline/admin/admin-permissions/components/i
 import { useTranslation } from "@byline/i18n/react";
 import { BreadcrumbsClient } from "../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js";
 import { listRegisteredAbilities } from "../server-fns/admin-permissions/index.js";
+import { getAdminRoutePath } from "./admin-path.js";
 function createAdminPermissionsRoute(path) {
     const Route = createFileRoute(path)({
         loader: async ()=>{
@@ -21,11 +22,11 @@ function createAdminPermissionsRoute(path) {
                         breadcrumbs: [
                             {
                                 label: t('chrome.menu.dashboard'),
-                                href: '/admin'
+                                href: getAdminRoutePath()
                             },
                             {
                                 label: t('chrome.menu.permissions'),
-                                href: '/admin/permissions'
+                                href: getAdminRoutePath('permissions')
                             }
                         ]
                     }),