@byline/host-tanstack-start 4.11.2 → 4.13.0

package/src/admin-shell/chrome/route-progress-bar.tsx

@@ -38,8 +38,14 @@ const FINISH_EXIT_MS = 350
 type Phase = 'idle' | 'visible' | 'finishing'
 
 export function RouteProgressBar() {
+  // `isLoading` is the whole navigation-in-flight signal: router-core derives
+  // it as `status === 'pending'`, set when a navigation starts and cleared in
+  // the same batch that commits the new matches. TanStack Router 1.170.30
+  // (router-core 1.171.25) removed `isTransitioning` from `RouterState` —
+  // Transitioner now uses the standalone `React.startTransition`, which has no
+  // pending flag — so there is nothing further to OR in here.
   const isNavigating = useRouterState({
-    select: (s) => s.isLoading || s.isTransitioning,
+    select: (s) => s.isLoading,
   })
   const [phase, setPhase] = useState<Phase>('idle')
   const showTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)

package/src/admin-shell/chrome/sign-in-page.tsx

@@ -8,19 +8,20 @@
 
 import { SignInForm } from '@byline/admin/auth/components/sign-in-form'
 import { BylineAdminServicesProvider } from '@byline/admin/services'
-import { getClientConfig } from '@byline/core'
+import { getAdminConfig } from '@byline/core'
 import type { LocaleCode } from '@byline/i18n'
 import { I18nProvider, LanguageMenu } from '@byline/i18n/react'
 import cx from 'clsx'
 
 import { buildLocaleDefinitions } from '../../i18n/locale-definitions.js'
 import { bylineAdminServices } from '../../integrations/byline-admin-services.js'
-import { setInterfaceLocaleFn } from '../../server-fns/i18n/index.js'
+import { setAdminLocaleFn } from '../../server-fns/i18n/index.js'
 import styles from './sign-in-page.module.css'
 
 interface SignInPageProps {
   redirectTo: string
   activeLocale: LocaleCode
+  homeUrl?: string
 }
 
 /**
@@ -33,32 +34,28 @@ interface SignInPageProps {
  * (the one that wraps the authenticated admin) doesn't apply here.
  * `<LanguageMenu>` lights up automatically when two or more interface
  * locales are configured. On change, the menu calls
- * `setInterfaceLocaleFn` which writes the cookie unconditionally and
+ * `setAdminLocaleFn` which writes the cookie unconditionally and
  * skips the DB write on the pre-auth path (the user has no admin
  * session yet). After sign-in succeeds, the `adminSignIn` server fn
  * reconciles the cookie locale into the user's
  * `admin_users.preferred_locale` so the pre-auth choice becomes
  * sticky across devices from day one.
  *
- * Threads the configured `serverURL` into the `SignInForm` as `homeUrl` so
- * the form's action row can render a plain "Home" link beside the submit
- * button.
+ * Threads an optional host-owned `homeUrl` into `SignInForm` so the form's
+ * action row can render a plain "Home" link beside the submit button.
  */
-export function SignInPage({ redirectTo, activeLocale }: SignInPageProps) {
-  const { i18n, serverURL } = getClientConfig()
-  const localeDefinitions = buildLocaleDefinitions(
-    i18n.interface.locales,
-    i18n.interface.localeDefinitions
-  )
+export function SignInPage({ redirectTo, activeLocale, homeUrl }: SignInPageProps) {
+  const { i18n } = getAdminConfig()
+  const localeDefinitions = buildLocaleDefinitions(i18n.admin.locales, i18n.admin.localeDefinitions)
   const handleSetLocale = async (next: LocaleCode) => {
-    await setInterfaceLocaleFn({ data: { locale: next } })
+    await setAdminLocaleFn({ data: { locale: next } })
     window.location.reload()
   }
   return (
     <I18nProvider
       bundle={i18n.translations ?? {}}
       activeLocale={activeLocale}
-      defaultLocale={i18n.interface.defaultLocale}
+      defaultLocale={i18n.admin.defaultLocale}
       localeDefinitions={localeDefinitions}
       setLocale={handleSetLocale}
     >
@@ -68,7 +65,7 @@ export function SignInPage({ redirectTo, activeLocale }: SignInPageProps) {
             <LanguageMenu />
           </div>
           <div className={cx('byline-sign-in-page-inner', styles.inner)}>
-            <SignInForm redirectTo={redirectTo} homeUrl={serverURL} />
+            <SignInForm redirectTo={redirectTo} homeUrl={homeUrl} />
           </div>
         </main>
       </BylineAdminServicesProvider>

package/src/i18n/locale-cookie.ts

@@ -44,7 +44,7 @@ export function readAdminLocaleCookie(): string | null {
 
 /**
  * Write the admin locale cookie. Caller is expected to have validated
- * `locale` against the permitted `i18n.interface.locales` set first.
+ * `locale` against the permitted `i18n.admin.locales` set first.
  */
 export function setAdminLocaleCookie(locale: string): void {
   setCookie(ADMIN_LOCALE_COOKIE, locale, {

package/src/i18n/locale-definitions.ts

@@ -13,7 +13,7 @@ import type { LocaleDefinition } from '@byline/i18n'
  * resolution order:
  *
  *   1. An entry from the host's configured `localeDefinitions` —
- *      `i18n.interface.localeDefinitions` for the admin switcher, or
+ *      `i18n.admin.localeDefinitions` for the admin switcher, or
  *      `i18n.content.localeDefinitions` when a host frontend resolves
  *      content-locale labels (matched by code). Wins outright — this is
  *      the path that lets a host author write `Français` instead of the

package/src/i18n/resolve-locale.ts

@@ -9,7 +9,7 @@
 /**
  * Server-side locale resolution for the admin interface.
  *
- * Combines `@byline/i18n`'s pure `resolveInterfaceLocale` cascade with
+ * Combines `@byline/i18n`'s pure `resolveAdminLocale` cascade with
  * the host's request-scoped signals — the `byline_admin_lng` cookie, the
  * `Accept-Language` header, and (when an admin session is present)
  * `admin_users.preferred_locale` on the authenticated actor.
@@ -25,7 +25,7 @@ import { getRequestHeader } from '@tanstack/react-start/server'
 import { AuthError, AuthErrorCodes } from '@byline/auth'
 import { getAdminRequestContext } from '@byline/client/server'
 import type { LocaleCode } from '@byline/i18n'
-import { resolveInterfaceLocale } from '@byline/i18n'
+import { resolveAdminLocale } from '@byline/i18n'
 
 import { bylineCore } from '../integrations/byline-core.js'
 import { readAdminLocaleCookie } from './locale-cookie.js'
@@ -43,16 +43,16 @@ export async function resolveRequestLocale(options?: {
   skipActorLookup?: boolean
 }): Promise<LocaleCode> {
   const core = bylineCore()
-  const { interface: ifaceConfig } = core.config.i18n
+  const { admin: adminConfig } = core.config.i18n
 
   let preferred: string | null = null
   if (!options?.skipActorLookup) {
     preferred = await readPreferredLocaleFromActor()
   }
 
-  return resolveInterfaceLocale({
-    locales: ifaceConfig.locales,
-    defaultLocale: ifaceConfig.defaultLocale,
+  return resolveAdminLocale({
+    locales: adminConfig.locales,
+    defaultLocale: adminConfig.defaultLocale,
     preferred,
     cookie: readAdminLocaleCookie(),
     acceptLanguage: readAcceptLanguage(),

package/src/i18n/server-translator.ts

@@ -39,7 +39,7 @@ export interface ServerTranslator {
 
 export async function resolveServerTranslator(namespace: string): Promise<ServerTranslator> {
   const core = bylineCore()
-  const { interface: ifaceConfig, translations: bundle } = core.config.i18n
+  const { admin: adminConfig, translations: bundle } = core.config.i18n
   if (bundle == null) {
     throw new Error(
       '[resolveServerTranslator] no translation bundle is registered. ' +
@@ -51,7 +51,7 @@ export async function resolveServerTranslator(namespace: string): Promise<Server
   const formatter = createFormatter({
     bundle,
     activeLocale,
-    defaultLocale: ifaceConfig.defaultLocale,
+    defaultLocale: adminConfig.defaultLocale,
   })
   return {
     t: (key, values) => formatter.t(namespace, key, values),

package/src/integrations/byline-admin-services.ts

@@ -35,7 +35,7 @@ import {
 } from '../server-fns/admin-users/index.js'
 import { adminSignIn } from '../server-fns/auth/index.js'
 import { getCollectionDocumentVersion as serverGetCollectionDocumentVersion } from '../server-fns/collections/get.js'
-import { setInterfaceLocaleFn } from '../server-fns/i18n/index.js'
+import { setAdminLocaleFn } from '../server-fns/i18n/index.js'
 
 /**
  * Diff helper adapter — the contract uses positional args; the underlying
@@ -67,7 +67,7 @@ export const bylineAdminServices: BylineAdminServices = {
   // Account self-service
   updateAccount,
   changeAccountPassword,
-  setInterfaceLocale: setInterfaceLocaleFn,
+  setAdminLocale: setAdminLocaleFn,
 
   // Admin user writes
   createAdminUser,

package/src/routes/admin-path.test.node.ts

@@ -1,4 +1,4 @@
-import { defineClientConfig } from '@byline/core'
+import { defineAdminConfig } from '@byline/core'
 import { beforeEach, describe, expect, it } from 'vitest'
 
 import {
@@ -11,13 +11,12 @@ import {
 } from './admin-path.js'
 
 function registerRoutes(admin?: string): void {
-  defineClientConfig({
-    serverURL: 'http://localhost:3000',
+  defineAdminConfig({
     routes: admin ? { admin } : undefined,
     collections: [],
     admin: [],
     i18n: {
-      interface: { defaultLocale: 'en', locales: [] },
+      admin: { defaultLocale: 'en', locales: [] },
       content: { defaultLocale: 'en', locales: [] },
     },
   })

package/src/routes/admin-path.ts

@@ -6,11 +6,11 @@
  * Copyright (c) Infonomic Company Limited
  */
 
-import { getClientConfig, normalizeRootRelativeRedirect } from '@byline/core'
+import { getAdminConfig, normalizeRootRelativeRedirect } from '@byline/core'
 
 /** Build an admin URL or parameterized TanStack route from client-safe config. */
 export function getAdminRoutePath(...segments: ReadonlyArray<string | number>): string {
-  const configuredBase = getClientConfig().routes.admin
+  const configuredBase = getAdminConfig().routes.admin
   const normalizedBase = configuredBase.replace(/^\/+|\/+$/g, '')
   const base = normalizedBase ? `/${normalizedBase}` : '/'
   const suffix = segments

package/src/routes/auth-routes.test.node.ts

@@ -1,18 +1,17 @@
-import { defineClientConfig } from '@byline/core'
+import { defineAdminConfig } from '@byline/core'
 import { beforeEach, describe, expect, it } from 'vitest'
 
 import { resolveAdminCallbackPath, resolveAdminSignInRedirect } from './admin-path.js'
-import { configureSignInRoutePath, getSignInRoutePath } from './sign-in-path.js'
+import { getSignInRoutePath } from './sign-in-path.js'
 
 describe('admin authentication routes', () => {
   beforeEach(() => {
-    defineClientConfig({
-      serverURL: 'http://localhost:3000',
+    defineAdminConfig({
       routes: { admin: '/cms/', signIn: '/staff/login/' },
       collections: [],
       admin: [],
       i18n: {
-        interface: { defaultLocale: 'en', locales: [] },
+        admin: { defaultLocale: 'en', locales: [] },
         content: { defaultLocale: 'en', locales: [] },
       },
     })
@@ -30,10 +29,5 @@ describe('admin authentication routes', () => {
 
   it('shares routes.signIn between guard and sign-out consumers', () => {
     expect(getSignInRoutePath()).toBe('/staff/login')
-    expect(configureSignInRoutePath('/staff/login/')).toBe('/staff/login')
-  })
-
-  it('does not allow the deprecated layout override to silently diverge', () => {
-    expect(() => configureSignInRoutePath('/auth/login')).toThrow(/must match routes\.signIn/)
   })
 })

package/src/routes/create-admin-dashboard-route.tsx

@@ -8,7 +8,7 @@
 
 import { createFileRoute } from '@tanstack/react-router'
 
-import { getClientConfig } from '@byline/core'
+import { getAdminConfig } from '@byline/core'
 import { useTranslation } from '@byline/i18n/react'
 
 import { BreadcrumbsClient } from '../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js'
@@ -20,7 +20,7 @@ export function createAdminDashboardRoute(path: string) {
   // biome-ignore lint/suspicious/noExplicitAny: dynamic path bypasses route-tree typing
   const Route: any = createFileRoute(path as never)({
     loader: async () => {
-      const { collections } = getClientConfig()
+      const { collections } = getAdminConfig()
       const statsMap: Record<string, CollectionStatusCount[]> = {}
 
       await Promise.all(

package/src/routes/create-admin-layout-route.tsx

@@ -25,7 +25,7 @@ import { createFileRoute, Outlet, redirect } from '@tanstack/react-router'
 import { applyStoredTheme } from '@byline/admin/admin-account/components/theme'
 import { BylineFieldServicesProvider } from '@byline/admin/react'
 import { BylineAdminServicesProvider } from '@byline/admin/services'
-import { getClientConfig } from '@byline/core'
+import { getAdminConfig } from '@byline/core'
 import type { LocaleCode } from '@byline/i18n'
 import { I18nProvider } from '@byline/i18n/react'
 import cx from 'clsx'
@@ -42,19 +42,13 @@ import { bylineAdminServices } from '../integrations/byline-admin-services.js'
 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'
+import { getActiveLocaleFn, setAdminLocaleFn } from '../server-fns/i18n/index.js'
+import { getSignInRoutePath } from './sign-in-path.js'
 
-interface AdminLayoutOpts {
-  /** @deprecated Configure `routes.signIn`; an override must resolve to the same path. */
-  signInPath?: string
-}
-
-export function createAdminLayoutRoute(path: string, opts: AdminLayoutOpts = {}) {
-  const resolveSignInPath = createSignInRoutePathResolver(opts.signInPath)
+export function createAdminLayoutRoute(path: string) {
   const Route: any = createFileRoute(path as never)({
     beforeLoad: async ({ location }: { location: { href: string } }) => {
-      const signInPath = resolveSignInPath()
+      const signInPath = getSignInRoutePath()
       try {
         const user = await getCurrentAdminUser()
         // Resolve the active interface locale once on the server so SSR
@@ -81,10 +75,10 @@ export function createAdminLayoutRoute(path: string, opts: AdminLayoutOpts = {})
         user: Awaited<ReturnType<typeof getCurrentAdminUser>>
         activeLocale: LocaleCode
       }
-      const { i18n } = getClientConfig()
+      const { i18n } = getAdminConfig()
       const localeDefinitions = buildLocaleDefinitions(
-        i18n.interface.locales,
-        i18n.interface.localeDefinitions
+        i18n.admin.locales,
+        i18n.admin.localeDefinitions
       )
       // Re-assert the admin user's stored theme when the shell mounts.
       // Byline shares the host's theme contract, but a host theme provider
@@ -93,18 +87,18 @@ export function createAdminLayoutRoute(path: string, opts: AdminLayoutOpts = {})
       useEffect(() => {
         applyStoredTheme()
       }, [])
-      // Cookie + DB write happen in setInterfaceLocaleFn; full reload
+      // Cookie + DB write happen in setAdminLocaleFn; full reload
       // re-runs beforeLoad so the provider re-renders with the new
       // bundle/locale (no in-place bundle swap needed for PR 1's scope).
       const handleSetLocale = async (next: LocaleCode) => {
-        await setInterfaceLocaleFn({ data: { locale: next } })
+        await setAdminLocaleFn({ data: { locale: next } })
         window.location.reload()
       }
       return (
         <I18nProvider
           bundle={i18n.translations ?? {}}
           activeLocale={activeLocale}
-          defaultLocale={i18n.interface.defaultLocale}
+          defaultLocale={i18n.admin.defaultLocale}
           localeDefinitions={localeDefinitions}
           setLocale={handleSetLocale}
         >

package/src/routes/create-sign-in-route.tsx

@@ -22,13 +22,23 @@ import type { LocaleCode } from '@byline/i18n'
 import { SignInPage } from '../admin-shell/chrome/sign-in-page.js'
 import { getActiveLocaleFn } from '../server-fns/i18n/index.js'
 import { resolveAdminCallbackPath, resolveAdminSignInRedirect } from './admin-path.js'
+import { resolveSignInHomeUrl } from './sign-in-home-url.js'
 
 interface SignInSearch {
   callbackUrl?: string
 }
 
-export function createSignInRoute(path: string) {
-  // biome-ignore lint/suspicious/noExplicitAny: dynamic path bypasses route-tree typing
+export interface CreateSignInRouteOptions {
+  /**
+   * Client-safe URL for the sign-in page's Home link. Defaults to `/`, which
+   * preserves the link for integrated hosts without requiring an absolute site
+   * origin. Pass an absolute URL when the public home is on another origin.
+   */
+  homeUrl?: string
+}
+
+export function createSignInRoute(path: string, { homeUrl }: CreateSignInRouteOptions = {}) {
+  const resolvedHomeUrl = resolveSignInHomeUrl(homeUrl)
   const Route: any = createFileRoute(path as never)({
     validateSearch: (search: Record<string, unknown>): SignInSearch => {
       const callbackUrl = resolveAdminCallbackPath(search.callbackUrl)
@@ -50,6 +60,7 @@ export function createSignInRoute(path: string) {
         <SignInPage
           redirectTo={resolveAdminSignInRedirect(callbackUrl)}
           activeLocale={activeLocale}
+          homeUrl={resolvedHomeUrl}
         />
       )
     },

package/src/routes/get-content-locale-route-config.ts

@@ -6,7 +6,7 @@
  * Copyright (c) Infonomic Company Limited
  */
 
-import { getClientConfig } from '@byline/core'
+import { getAdminConfig } from '@byline/core'
 
 import type { ContentLocaleOption } from '../admin-shell/collections/view-menu.js'
 
@@ -14,7 +14,7 @@ export function getContentLocaleRouteConfig(): {
   contentLocales: ContentLocaleOption[]
   defaultContentLocale: string
 } {
-  const content = getClientConfig().i18n.content
+  const content = getAdminConfig().i18n.content
   const labels = new Map(
     content.localeDefinitions?.map(({ code, nativeName }) => [code, nativeName]) ?? []
   )

package/src/routes/index.ts

@@ -14,7 +14,7 @@ export {
   resolveAdminCallbackPath,
   resolveAdminSignInRedirect,
 } from './admin-path.js'
-export { configureSignInRoutePath, getSignInRoutePath } from './sign-in-path.js'
+export { getSignInRoutePath } from './sign-in-path.js'
 
 /**
  * Route factories for the Byline admin UI on TanStack Start.
@@ -45,4 +45,7 @@ export { createCollectionCreateRoute } from './create-collection-create-route.js
 export { createCollectionEditRoute } from './create-collection-edit-route.js'
 export { createCollectionHistoryRoute } from './create-collection-history-route.js'
 export { createCollectionListRoute } from './create-collection-list-route.js'
-export { createSignInRoute } from './create-sign-in-route.js'
+export {
+  type CreateSignInRouteOptions,
+  createSignInRoute,
+} from './create-sign-in-route.js'

package/src/routes/sign-in-home-url.test.node.ts

@@ -0,0 +1,21 @@
+/**
+ * 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
+ */
+
+import { describe, expect, it } from 'vitest'
+
+import { resolveSignInHomeUrl } from './sign-in-home-url.js'
+
+describe('resolveSignInHomeUrl', () => {
+  it('defaults the sign-in Home link to the same-origin root', () => {
+    expect(resolveSignInHomeUrl(undefined)).toBe('/')
+  })
+
+  it('preserves an explicit host-owned Home URL', () => {
+    expect(resolveSignInHomeUrl('https://example.test/')).toBe('https://example.test/')
+  })
+})

package/src/routes/sign-in-home-url.ts

@@ -0,0 +1,12 @@
+/**
+ * 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 the sign-in Home link without requiring a configured site origin. */
+export function resolveSignInHomeUrl(homeUrl: string | undefined): string {
+  return homeUrl ?? '/'
+}

package/src/routes/sign-in-path.test.node.ts

@@ -1,21 +1,16 @@
-import { defineClientConfig } from '@byline/core'
+import { defineAdminConfig } from '@byline/core'
 import { beforeEach, describe, expect, it } from 'vitest'
 
-import {
-  configureSignInRoutePath,
-  createSignInRoutePathResolver,
-  getSignInRoutePath,
-} from './sign-in-path.js'
+import { getSignInRoutePath } from './sign-in-path.js'
 
 describe('sign-in route configuration', () => {
   beforeEach(() => {
-    defineClientConfig({
-      serverURL: 'http://localhost:3000',
+    defineAdminConfig({
       routes: { signIn: '/staff/login/' },
       collections: [],
       admin: [],
       i18n: {
-        interface: { defaultLocale: 'en', locales: [] },
+        admin: { defaultLocale: 'en', locales: [] },
         content: { defaultLocale: 'en', locales: [] },
       },
     })
@@ -24,56 +19,4 @@ describe('sign-in route configuration', () => {
   it('reads and normalizes routes.signIn', () => {
     expect(getSignInRoutePath()).toBe('/staff/login')
   })
-
-  it('allows a deprecated signInPath override when it matches canonical config', () => {
-    expect(configureSignInRoutePath('staff/login/')).toBe('/staff/login')
-  })
-
-  it('rejects an invalid or divergent deprecated override when resolved', () => {
-    expect(() => configureSignInRoutePath('/auth/login/')).toThrow(/must match routes\.signIn/)
-    expect(() => configureSignInRoutePath('/auth/../login')).toThrow(/routes\.signIn/)
-  })
-
-  it('validates an override against configured rather than default route trees', () => {
-    defineClientConfig({
-      serverURL: 'http://localhost:3000',
-      routes: { admin: '/cms', api: '/rpc', signIn: '/admin/login' },
-      collections: [],
-      admin: [],
-      i18n: {
-        interface: { defaultLocale: 'en', locales: [] },
-        content: { defaultLocale: 'en', locales: [] },
-      },
-    })
-
-    expect(configureSignInRoutePath('/admin/login/')).toBe('/admin/login')
-    expect(() => configureSignInRoutePath('/cms/login')).toThrow(/routes\.signIn/)
-  })
-
-  it('defers a deprecated override until parent beforeLoad config registration', () => {
-    defineClientConfig({
-      serverURL: 'http://localhost:3000',
-      routes: { signIn: '/old/login' },
-      collections: [],
-      admin: [],
-      i18n: {
-        interface: { defaultLocale: 'en', locales: [] },
-        content: { defaultLocale: 'en', locales: [] },
-      },
-    })
-    const resolveSignInPath = createSignInRoutePathResolver('/staff/login/')
-
-    defineClientConfig({
-      serverURL: 'http://localhost:3000',
-      routes: { signIn: '/staff/login' },
-      collections: [],
-      admin: [],
-      i18n: {
-        interface: { defaultLocale: 'en', locales: [] },
-        content: { defaultLocale: 'en', locales: [] },
-      },
-    })
-
-    expect(resolveSignInPath()).toBe('/staff/login')
-  })
 })

package/src/routes/sign-in-path.ts

@@ -6,31 +6,9 @@
  * Copyright (c) Infonomic Company Limited
  */
 
-import { getClientConfig, resolveRoutes } from '@byline/core'
+import { getAdminConfig } from '@byline/core'
 
 /** Read the canonical client-safe sign-in destination. */
 export function getSignInRoutePath(): string {
-  return getClientConfig().routes.signIn
-}
-
-/** @deprecated Configure `routes.signIn`; retained for route-factory input validation. */
-export function configureSignInRoutePath(legacyOverride?: string): string {
-  const routes = getClientConfig().routes
-  const configured = routes.signIn
-  if (legacyOverride === undefined) return configured
-
-  const normalizedOverride = resolveRoutes({ ...routes, signIn: legacyOverride }).signIn
-  if (normalizedOverride !== configured) {
-    throw new Error(
-      `createAdminLayoutRoute signInPath (${normalizedOverride}) must match routes.signIn (${configured})`
-    )
-  }
-  return configured
-}
-
-/** Defer deprecated override validation until the admin route's beforeLoad boundary. */
-export function createSignInRoutePathResolver(legacyOverride?: string): () => string {
-  return legacyOverride === undefined
-    ? getSignInRoutePath
-    : () => configureSignInRoutePath(legacyOverride)
+  return getAdminConfig().routes.signIn
 }

package/src/server-fns/auth/sign-in.ts

@@ -91,7 +91,7 @@ export const adminSignIn = createServerFn({ method: 'POST' })
  *
  *   - The cookie is unset (the cascade falls through to the existing
  *     column / Accept-Language / default anyway).
- *   - The cookie carries a locale outside `i18n.interface.locales`
+ *   - The cookie carries a locale outside `i18n.admin.locales`
  *     (stale value pointing at a removed locale — let the resolver
  *     fall through cleanly).
  *   - No admin store is configured (headless tooling paths).
@@ -102,7 +102,7 @@ async function reconcileLocaleAfterSignIn(adminUserId: string): Promise<void> {
   if (cookieLocale == null) return
 
   const core = bylineCore()
-  const locales = core.config.i18n.interface.locales
+  const locales = core.config.i18n.admin.locales
   if (!locales.includes(cookieLocale)) return
 
   const adminStore = core.adminStore

package/src/server-fns/i18n/index.ts

@@ -7,5 +7,5 @@
  */
 
 export { getActiveLocaleFn } from './get-active-locale.js'
-export { setInterfaceLocaleFn } from './set-locale.js'
-export type { SetInterfaceLocaleInput, SetInterfaceLocaleResult } from './set-locale.js'
+export { setAdminLocaleFn } from './set-locale.js'
+export type { SetAdminLocaleInput, SetAdminLocaleResult } from './set-locale.js'

package/src/server-fns/i18n/set-locale.ts

@@ -15,7 +15,7 @@
  * is also updated so the choice follows the user across devices.
  *
  * Locale validation is host-side: the request locale must appear in
- * `config.i18n.interface.locales` (or be `null`, which clears the
+ * `config.i18n.admin.locales` (or be `null`, which clears the
  * cookie + column and re-engages the detection cascade). Validation
  * lives here rather than in the admin module so the rule stays close
  * to the host's i18n config.
@@ -35,12 +35,12 @@ import { getAdminRequestContext } from '@byline/client/server'
 import { clearAdminLocaleCookie, setAdminLocaleCookie } from '../../i18n/locale-cookie.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
-export interface SetInterfaceLocaleInput {
+export interface SetAdminLocaleInput {
   /** BCP 47 tag, or `null` to clear the preference. */
   locale: string | null
 }
 
-export interface SetInterfaceLocaleResult {
+export interface SetAdminLocaleResult {
   ok: true
   /** Echo of the persisted value. `null` means the column was cleared. */
   locale: string | null
@@ -53,17 +53,17 @@ export interface SetInterfaceLocaleResult {
   account: AccountResponse | null
 }
 
-export const setInterfaceLocaleFn = createServerFn({ method: 'POST' })
-  .validator((input: SetInterfaceLocaleInput) => input)
-  .handler(async ({ data }): Promise<SetInterfaceLocaleResult> => {
+export const setAdminLocaleFn = createServerFn({ method: 'POST' })
+  .validator((input: SetAdminLocaleInput) => input)
+  .handler(async ({ data }): Promise<SetAdminLocaleResult> => {
     const core = bylineCore()
-    const locales = core.config.i18n.interface.locales
+    const locales = core.config.i18n.admin.locales
 
     // Validate against the permitted set. `null` is always permitted —
     // it's the "use detection" signal.
     if (data.locale != null && !locales.includes(data.locale)) {
       throw new Error(
-        `[setInterfaceLocaleFn] locale '${data.locale}' is not in i18n.interface.locales [${locales.join(', ')}].`
+        `[setAdminLocaleFn] locale '${data.locale}' is not in i18n.admin.locales [${locales.join(', ')}].`
       )
     }