@byline/host-tanstack-start 2.5.2 → 2.6.1

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

@@ -35,6 +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'
 
 /**
  * Diff helper adapter — the contract uses positional args; the underlying
@@ -66,6 +67,7 @@ export const bylineAdminServices: BylineAdminServices = {
   // Account self-service
   updateAccount,
   changeAccountPassword,
+  setInterfaceLocale: setInterfaceLocaleFn,
 
   // Admin user writes
   createAdminUser,

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

@@ -9,14 +9,18 @@
 /**
  * Host-side adapters that bind the webapp's TanStack Start server functions
  * to the framework-neutral `BylineFieldServices` contract consumed by
- * `@byline/ui` field/form components.
+ * `@byline/admin` field/form components.
  *
  * Wired into the admin route once via `<BylineFieldServicesProvider>`. A
  * future Next.js host would ship its own adapter file and Provider; the
- * @byline/ui surface is unchanged.
+ * @byline/admin surface is unchanged.
  */
 
-import type { BylineFieldServices, GetCollectionDocumentsFn, UploadFieldFn } from '@byline/ui/react'
+import type {
+  BylineFieldServices,
+  GetCollectionDocumentsFn,
+  UploadFieldFn,
+} from '@byline/admin/react'
 
 import { getCollectionDocuments as serverGetCollectionDocuments } from '../server-fns/collections/list.js'
 import { uploadField as serverUploadField } from '../server-fns/collections/upload.js'

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

@@ -9,6 +9,7 @@
 import { createFileRoute } from '@tanstack/react-router'
 
 import { AccountSelfContainer } from '@byline/admin/admin-account/components/container'
+import { useTranslation } from '@byline/i18n/react'
 import { Container, Section } from '@byline/ui/react'
 
 import { BreadcrumbsClient } from '../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js'
@@ -37,18 +38,19 @@ export function createAdminAccountRoute(path: string) {
     },
     component: function AdminAccountComponent() {
       const { account } = Route.useLoaderData() as { account: AccountResponse }
+      const { t } = useTranslation('byline-admin')
       return (
         <>
           <BreadcrumbsClient
             breadcrumbs={[
-              { label: 'Dashboard', href: '/admin' },
-              { label: 'Account', href: '/admin/account' },
+              { label: t('chrome.menu.dashboard'), href: '/admin' },
+              { label: t('chrome.account'), href: '/admin/account' },
             ]}
           />
           <Section className="pb-2">
-            <Container>
+            <Container className="mb-2">
               <h1 className="mb-2">{displayNameFor(account)}</h1>
-              <p className="muted">Manage your own profile and password.</p>
+              <p className="muted">{t('account.intro')}</p>
             </Container>
           </Section>
           <Section>

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

@@ -9,6 +9,7 @@
 import { createFileRoute } from '@tanstack/react-router'
 
 import { getClientConfig } from '@byline/core'
+import { useTranslation } from '@byline/i18n/react'
 
 import { BreadcrumbsClient } from '../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js'
 import { AdminDashboard } from '../admin-shell/chrome/dashboard.js'
@@ -39,9 +40,12 @@ export function createAdminDashboardRoute(path: string) {
       const { statsMap } = Route.useLoaderData() as {
         statsMap: Record<string, CollectionStatusCount[]>
       }
+      const { t } = useTranslation('byline-admin')
       return (
         <>
-          <BreadcrumbsClient breadcrumbs={[{ label: 'Dashboard', href: '/admin' }]} />
+          <BreadcrumbsClient
+            breadcrumbs={[{ label: t('chrome.menu.dashboard'), href: '/admin' }]}
+          />
           <AdminDashboard statsMap={statsMap} />
         </>
       )

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

@@ -21,8 +21,11 @@
 
 import { createFileRoute, Outlet, redirect } from '@tanstack/react-router'
 
+import { BylineFieldServicesProvider } from '@byline/admin/react'
 import { BylineAdminServicesProvider } from '@byline/admin/services'
-import { BylineFieldServicesProvider } from '@byline/ui/react'
+import { getClientConfig } from '@byline/core'
+import type { LocaleCode } from '@byline/i18n'
+import { I18nProvider } from '@byline/i18n/react'
 import cx from 'classnames'
 
 import { AdminAppBar } from '../admin-shell/chrome/admin-app-bar.js'
@@ -33,10 +36,12 @@ import { AdminMenuDrawer } from '../admin-shell/chrome/menu-drawer.js'
 import { AdminMenuProvider } from '../admin-shell/chrome/menu-provider.js'
 import { RouteError, RouteNotFound } from '../admin-shell/chrome/route-error.js'
 import { RouteProgressBar } from '../admin-shell/chrome/route-progress-bar.js'
+import { buildLocaleDefinitions } from '../i18n/locale-definitions.js'
 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'
 
 interface AdminLayoutOpts {
   /** Path users are redirected to when unauthenticated. Defaults to `/sign-in`. */
@@ -51,7 +56,14 @@ export function createAdminLayoutRoute(path: string, opts: AdminLayoutOpts = {})
     beforeLoad: async ({ location }: { location: { href: string } }) => {
       try {
         const user = await getCurrentAdminUser()
-        return { user }
+        // Resolve the active interface locale once on the server so SSR
+        // and the hydrated client render the same translations and
+        // there's no locale flicker. Going through the server fn (rather
+        // than calling `resolveRequestLocale` directly) keeps
+        // `@tanstack/react-start/server` out of the client bundle — the
+        // same pattern `getCurrentAdminUser` uses for `getAdminRequestContext`.
+        const activeLocale = await getActiveLocaleFn()
+        return { user, activeLocale }
       } catch {
         // `getCurrentAdminUser` (via `getAdminRequestContext`) throws
         // `ERR_UNAUTHENTICATED` or a related auth error when no valid
@@ -64,27 +76,48 @@ export function createAdminLayoutRoute(path: string, opts: AdminLayoutOpts = {})
       }
     },
     component: function AdminLayoutComponent() {
-      const { user } = Route.useRouteContext() as {
+      const { user, activeLocale } = Route.useRouteContext() as {
         user: Awaited<ReturnType<typeof getCurrentAdminUser>>
+        activeLocale: LocaleCode
+      }
+      const { i18n } = getClientConfig()
+      const localeDefinitions = buildLocaleDefinitions(
+        i18n.interface.locales,
+        i18n.interface.localeDefinitions
+      )
+      // Cookie + DB write happen in setInterfaceLocaleFn; 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 } })
+        window.location.reload()
       }
       return (
-        <BylineAdminServicesProvider services={bylineAdminServices}>
-          <BylineFieldServicesProvider services={bylineFieldServices}>
-            <BylineAiAdminProvider>
-              <AdminMenuProvider>
-                <RouteProgressBar />
-                <AdminAppBar user={user} />
-                <main className={cx('byline-admin-layout-main', layoutStyles.main)}>
-                  <DrawerToggle />
-                  <AdminMenuDrawer />
-                  <Content>
-                    <Outlet />
-                  </Content>
-                </main>
-              </AdminMenuProvider>
-            </BylineAiAdminProvider>
-          </BylineFieldServicesProvider>
-        </BylineAdminServicesProvider>
+        <I18nProvider
+          bundle={i18n.translations ?? {}}
+          activeLocale={activeLocale}
+          defaultLocale={i18n.interface.defaultLocale}
+          localeDefinitions={localeDefinitions}
+          setLocale={handleSetLocale}
+        >
+          <BylineAdminServicesProvider services={bylineAdminServices}>
+            <BylineFieldServicesProvider services={bylineFieldServices}>
+              <BylineAiAdminProvider>
+                <AdminMenuProvider>
+                  <RouteProgressBar />
+                  <AdminAppBar user={user} />
+                  <main className={cx('byline-admin-layout-main', layoutStyles.main)}>
+                    <DrawerToggle />
+                    <AdminMenuDrawer />
+                    <Content>
+                      <Outlet />
+                    </Content>
+                  </main>
+                </AdminMenuProvider>
+              </BylineAiAdminProvider>
+            </BylineFieldServicesProvider>
+          </BylineAdminServicesProvider>
+        </I18nProvider>
       )
     },
     errorComponent: RouteError,

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

@@ -9,6 +9,7 @@
 import { createFileRoute } from '@tanstack/react-router'
 
 import { AbilitiesInspector } from '@byline/admin/admin-permissions/components/inspector'
+import { useTranslation } from '@byline/i18n/react'
 
 import { BreadcrumbsClient } from '../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js'
 import {
@@ -25,12 +26,13 @@ export function createAdminPermissionsRoute(path: string) {
     },
     component: function AdminPermissionsComponent() {
       const { data } = Route.useLoaderData() as { data: ListRegisteredAbilitiesResponse }
+      const { t } = useTranslation('byline-admin')
       return (
         <>
           <BreadcrumbsClient
             breadcrumbs={[
-              { label: 'Dashboard', href: '/admin' },
-              { label: 'Permissions', href: '/admin/permissions' },
+              { label: t('chrome.menu.dashboard'), href: '/admin' },
+              { label: t('chrome.menu.permissions'), href: '/admin/permissions' },
             ]}
           />
           <AbilitiesInspector data={data} />

package/src/routes/create-admin-role-edit-route.tsx

@@ -8,6 +8,7 @@
 
 import { createFileRoute, notFound } from '@tanstack/react-router'
 
+import { useTranslation } from '@byline/i18n/react'
 import { Container, Section } from '@byline/ui/react'
 
 import { RoleContainer } from '../admin-shell/admin-roles/container.js'
@@ -56,13 +57,14 @@ export function createAdminRoleEditRoute(path: string) {
     },
     component: function AdminRoleEditComponent() {
       const { role, registered, initialAbilities } = Route.useLoaderData() as LoaderData
+      const { t } = useTranslation('byline-admin')
       return (
         <>
           <BreadcrumbsClient
             breadcrumbs={[
-              { label: 'Dashboard', href: '/admin' },
-              { label: 'Admin Roles', href: '/admin/roles' },
-              { label: 'Role', href: `/admin/roles/${role.id}` },
+              { label: t('chrome.menu.dashboard'), href: '/admin' },
+              { label: t('chrome.menu.adminRoles'), href: '/admin/roles' },
+              { label: t('adminRoles.breadcrumbDetail'), href: `/admin/roles/${role.id}` },
             ]}
           />
           <Section className="py-5 pb-2">

package/src/routes/create-admin-roles-list-route.tsx

@@ -8,6 +8,8 @@
 
 import { createFileRoute } from '@tanstack/react-router'
 
+import { useTranslation } from '@byline/i18n/react'
+
 import { AdminRolesListView } from '../admin-shell/admin-roles/list.js'
 import { BreadcrumbsClient } from '../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js'
 import { type AdminRoleListResponse, listAdminRoles } from '../server-fns/admin-roles/index.js'
@@ -21,12 +23,13 @@ export function createAdminRolesListRoute(path: string) {
     },
     component: function AdminRolesListComponent() {
       const { data } = Route.useLoaderData() as { data: AdminRoleListResponse }
+      const { t } = useTranslation('byline-admin')
       return (
         <>
           <BreadcrumbsClient
             breadcrumbs={[
-              { label: 'Dashboard', href: '/admin' },
-              { label: 'Admin Roles', href: '/admin/roles' },
+              { label: t('chrome.menu.dashboard'), href: '/admin' },
+              { label: t('chrome.menu.adminRoles'), href: '/admin/roles' },
             ]}
           />
           <AdminRolesListView data={data} />

package/src/routes/create-admin-user-edit-route.tsx

@@ -8,6 +8,7 @@
 
 import { createFileRoute, notFound } from '@tanstack/react-router'
 
+import { useTranslation } from '@byline/i18n/react'
 import { Container, Section } from '@byline/ui/react'
 
 import { AccountContainer } from '../admin-shell/admin-users/container.js'
@@ -73,13 +74,14 @@ export function createAdminUserEditRoute(path: string) {
     },
     component: function AdminUserEditComponent() {
       const { user, allRoles, initialUserRoles } = Route.useLoaderData() as LoaderData
+      const { t } = useTranslation('byline-admin')
       return (
         <>
           <BreadcrumbsClient
             breadcrumbs={[
-              { label: 'Dashboard', href: '/admin' },
-              { label: 'Admin Users', href: '/admin/users' },
-              { label: 'User', href: `/admin/users/${user.id}` },
+              { label: t('chrome.menu.dashboard'), href: '/admin' },
+              { label: t('chrome.menu.adminUsers'), href: '/admin/users' },
+              { label: t('adminUsers.breadcrumbDetail'), href: `/admin/users/${user.id}` },
             ]}
           />
           <Section className="py-5 pb-2">

package/src/routes/create-admin-users-list-route.tsx

@@ -8,6 +8,7 @@
 
 import { createFileRoute } from '@tanstack/react-router'
 
+import { useTranslation } from '@byline/i18n/react'
 import { z } from 'zod'
 
 import { AdminUsersListView } from '../admin-shell/admin-users/list.js'
@@ -66,12 +67,13 @@ export function createAdminUsersListRoute(path: string) {
     },
     component: function AdminUsersListComponent() {
       const { data } = Route.useLoaderData() as { data: AdminUserListResponse }
+      const { t } = useTranslation('byline-admin')
       return (
         <>
           <BreadcrumbsClient
             breadcrumbs={[
-              { label: 'Dashboard', href: '/admin' },
-              { label: 'Admin Users', href: '/admin/users' },
+              { label: t('chrome.menu.dashboard'), href: '/admin' },
+              { label: t('chrome.menu.adminUsers'), href: '/admin/users' },
             ]}
           />
           <AdminUsersListView data={data} />

package/src/routes/create-collection-api-route.tsx

@@ -10,6 +10,7 @@ import { createFileRoute, notFound } from '@tanstack/react-router'
 
 import type { CollectionDefinition } from '@byline/core'
 import { getCollectionDefinition } from '@byline/core'
+import { useTranslation } from '@byline/i18n/react'
 import { z } from 'zod'
 
 import { BreadcrumbsClient } from '../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js'
@@ -77,19 +78,20 @@ export function createCollectionApiRoute(path: string, opts: CollectionApiOpts)
       const { collection, id } = Route.useParams() as { collection: string; id: string }
       const { locale, depth } = Route.useSearch() as z.infer<typeof searchSchema>
       const collectionDef = getCollectionDefinition(collection) as CollectionDefinition
+      const { t } = useTranslation('byline-admin')
 
       return (
         <>
           <BreadcrumbsClient
             breadcrumbs={[
-              { label: 'Dashboard', href: `/admin` },
+              { label: t('chrome.menu.dashboard'), href: `/admin` },
               { label: collectionDef.labels.plural, href: `/admin/collections/${collection}` },
               {
-                label: 'Edit',
+                label: t('common.actions.edit'),
                 href: `/admin/collections/${collection}/${id}`,
               },
               {
-                label: 'API',
+                label: t('collections.viewMenu.apiButton'),
                 href: `/admin/collections/${collection}/${id}/api`,
               },
             ]}

package/src/routes/create-collection-create-route.tsx

@@ -14,6 +14,7 @@ import {
   getCollectionAdminConfig,
   getCollectionDefinition,
 } from '@byline/core'
+import { useTranslation } from '@byline/i18n/react'
 
 import { BreadcrumbsClient } from '../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js'
 import { CreateView } from '../admin-shell/collections/create.js'
@@ -43,13 +44,17 @@ export function createCollectionCreateRoute(path: string) {
       const { initialData } = Route.useLoaderData() as { initialData: any }
       const collectionDef = getCollectionDefinition(collection) as CollectionDefinition
       const adminConfig = getCollectionAdminConfig(collection)
+      const { t } = useTranslation('byline-admin')
       return (
         <>
           <BreadcrumbsClient
             breadcrumbs={[
-              { label: 'Dashboard', href: '/admin' },
+              { label: t('chrome.menu.dashboard'), href: '/admin' },
               { label: collectionDef.labels.plural, href: `/admin/collections/${collection}` },
-              { label: 'Create', href: `/admin/collections/${collection}/create` },
+              {
+                label: t('collections.breadcrumbs.create'),
+                href: `/admin/collections/${collection}/create`,
+              },
             ]}
           />
           <CreateView

package/src/routes/create-collection-edit-route.tsx

@@ -10,6 +10,7 @@ import { createFileRoute, notFound } from '@tanstack/react-router'
 
 import type { CollectionDefinition } from '@byline/core'
 import { getCollectionAdminConfig, getCollectionDefinition } from '@byline/core'
+import { useTranslation } from '@byline/i18n/react'
 import { z } from 'zod'
 
 import { BreadcrumbsClient } from '../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js'
@@ -72,15 +73,16 @@ export function createCollectionEditRoute(path: string, opts: CollectionEditOpts
       const { locale } = Route.useSearch() as z.infer<typeof searchSchema>
       const collectionDef = getCollectionDefinition(collection) as CollectionDefinition
       const adminConfig = getCollectionAdminConfig(collection)
+      const { t } = useTranslation('byline-admin')
 
       return (
         <>
           <BreadcrumbsClient
             breadcrumbs={[
-              { label: 'Dashboard', href: `/admin` },
+              { label: t('chrome.menu.dashboard'), href: `/admin` },
               { label: collectionDef.labels.plural, href: `/admin/collections/${collection}` },
               {
-                label: 'Edit',
+                label: t('common.actions.edit'),
                 href: `/admin/collections/${collection}/${id}`,
               },
             ]}

package/src/routes/create-collection-history-route.tsx

@@ -14,6 +14,7 @@ import {
   getCollectionDefinition,
   getWorkflowStatuses,
 } from '@byline/core'
+import { useTranslation } from '@byline/i18n/react'
 import { z } from 'zod'
 
 import { BreadcrumbsClient } from '../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js'
@@ -95,19 +96,20 @@ export function createCollectionHistoryRoute(path: string, opts: CollectionHisto
       const { collection } = Route.useParams() as { collection: string; id: string }
       const collectionDef = getCollectionDefinition(collection) as CollectionDefinition
       const adminConfig = getCollectionAdminConfig(collection)
+      const { t } = useTranslation('byline-admin')
 
       return (
         <>
           <BreadcrumbsClient
             breadcrumbs={[
-              { label: 'Dashboard', href: `/admin` },
+              { label: t('chrome.menu.dashboard'), href: `/admin` },
               { label: collectionDef.labels.plural, href: `/admin/collections/${collection}` },
               {
-                label: 'Edit',
+                label: t('common.actions.edit'),
                 href: `/admin/collections/${collection}/${Route.useParams().id}`,
               },
               {
-                label: 'History',
+                label: t('collections.breadcrumbs.history'),
                 href: `/admin/collections/${collection}/${Route.useParams().id}/history`,
               },
             ]}

package/src/routes/create-collection-list-route.tsx

@@ -15,6 +15,7 @@ import {
   getCollectionDefinition,
   getWorkflowStatuses,
 } from '@byline/core'
+import { useTranslation } from '@byline/i18n/react'
 import { useToastManager } from '@byline/ui/react'
 import { z } from 'zod'
 
@@ -97,6 +98,7 @@ export function createCollectionListRoute(path: string) {
     },
     component: function CollectionListComponent() {
       const toastManager = useToastManager()
+      const { t } = useTranslation('byline-admin')
       const data = Route.useLoaderData()
       const { collection } = Route.useParams() as { collection: string }
       const search = Route.useSearch() as z.infer<typeof searchSchema>
@@ -124,8 +126,10 @@ export function createCollectionListRoute(path: string) {
         createdToastFiredRef.current = true
 
         toastManager.add({
-          title: `${collectionDef.labels.singular} Created`,
-          description: `Successfully created ${collectionDef.labels.singular.toLowerCase()}`,
+          title: t('collections.list.createdToastTitle', { label: collectionDef.labels.singular }),
+          description: t('collections.list.createdToastDescription', {
+            label: collectionDef.labels.singular.toLowerCase(),
+          }),
           data: {
             intent: 'success',
             iconType: 'success',
@@ -138,13 +142,7 @@ export function createCollectionListRoute(path: string) {
           search: (prev: Record<string, unknown>) => ({ ...prev, action: undefined }),
           replace: true,
         })
-      }, [
-        search.action,
-        navigate,
-        toastManager.add,
-        collectionDef.labels.singular.toLowerCase,
-        collectionDef.labels.singular,
-      ])
+      }, [search.action, navigate, toastManager.add, collectionDef.labels.singular, t])
 
       const CustomListView = adminConfig?.listView
 
@@ -152,7 +150,7 @@ export function createCollectionListRoute(path: string) {
         <>
           <BreadcrumbsClient
             breadcrumbs={[
-              { label: 'Dashboard', href: `/admin` },
+              { label: t('chrome.menu.dashboard'), href: `/admin` },
               {
                 label: data.included.collection.labels.plural,
                 href: `/admin/collections/${collection}`,

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

@@ -17,7 +17,10 @@
 
 import { createFileRoute } from '@tanstack/react-router'
 
+import type { LocaleCode } from '@byline/i18n'
+
 import { SignInPage } from '../admin-shell/chrome/sign-in-page.js'
+import { getActiveLocaleFn } from '../server-fns/i18n/index.js'
 
 interface SignInSearch {
   callbackUrl?: string
@@ -30,9 +33,19 @@ export function createSignInRoute(path: string) {
       const callbackUrl = typeof search.callbackUrl === 'string' ? search.callbackUrl : undefined
       return { callbackUrl }
     },
+    beforeLoad: async () => {
+      // Resolve the active locale on the server before render so the
+      // sign-in page hydrates in the user's chosen language. The
+      // resolver works pre-auth — `readPreferredLocaleFromActor()`
+      // returns null when there's no admin session and the cascade
+      // falls through to cookie → Accept-Language → defaultLocale.
+      const activeLocale = await getActiveLocaleFn()
+      return { activeLocale }
+    },
     component: function SignInRouteComponent() {
       const { callbackUrl } = Route.useSearch() as SignInSearch
-      return <SignInPage callbackUrl={callbackUrl} />
+      const { activeLocale } = Route.useRouteContext() as { activeLocale: LocaleCode }
+      return <SignInPage callbackUrl={callbackUrl} activeLocale={activeLocale} />
     },
   })
   return Route

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

@@ -23,6 +23,8 @@ import { getRequestHeader } from '@tanstack/react-start/server'
 import { getServerConfig } from '@byline/core'
 
 import { setSessionCookies } from '../../auth/auth-cookies.js'
+import { readAdminLocaleCookie } from '../../i18n/locale-cookie.js'
+import { bylineCore } from '../../integrations/byline-core.js'
 
 export interface SignInInput {
   email: string
@@ -67,5 +69,48 @@ export const adminSignIn = createServerFn({ method: 'POST' })
 
     setSessionCookies(result)
 
+    // Reconcile the byline_admin_lng cookie against the freshly-signed-in
+    // user's stored preferred_locale. If the cookie carries a permitted
+    // locale and it differs from what the user has stored (including the
+    // "null preferred_locale" case for brand-new users), update the
+    // column so the pre-auth locale choice becomes sticky across devices
+    // from day one. Pure best-effort — any error short-circuits and the
+    // sign-in still succeeds.
+    try {
+      await reconcileLocaleAfterSignIn(result.actor.id)
+    } catch {
+      // Swallow — locale sync is not load-bearing for the sign-in flow.
+    }
+
     return { userId: result.actor.id }
   })
+
+/**
+ * Apply the `byline_admin_lng` cookie to `admin_users.preferred_locale`
+ * when the two diverge after sign-in. No-op when:
+ *
+ *   - 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`
+ *     (stale value pointing at a removed locale — let the resolver
+ *     fall through cleanly).
+ *   - No admin store is configured (headless tooling paths).
+ *   - The stored value already matches the cookie.
+ */
+async function reconcileLocaleAfterSignIn(adminUserId: string): Promise<void> {
+  const cookieLocale = readAdminLocaleCookie()
+  if (cookieLocale == null) return
+
+  const core = bylineCore()
+  const locales = core.config.i18n.interface.locales
+  if (!locales.includes(cookieLocale)) return
+
+  const adminStore = core.adminStore
+  if (adminStore == null) return
+
+  const row = await adminStore.adminUsers.getById(adminUserId)
+  if (!row) return
+  if (row.preferred_locale === cookieLocale) return
+
+  await adminStore.adminUsers.setPreferredLocale(adminUserId, cookieLocale)
+}

package/src/server-fns/i18n/get-active-locale.ts

@@ -0,0 +1,26 @@
+/**
+ * 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 active interface locale for the current request as a
+ * server function. Wraps `resolveRequestLocale` so route `beforeLoad`
+ * callers in client-touching files don't transitively pull the
+ * `@tanstack/react-start/server` import (and the
+ * `@tanstack/start-server-core` graph behind it) into the client
+ * bundle. Same pattern as `getCurrentAdminUser`.
+ */
+
+import { createServerFn } from '@tanstack/react-start'
+
+import { resolveRequestLocale } from '../../i18n/resolve-locale.js'
+
+export const getActiveLocaleFn = createServerFn({ method: 'GET' }).handler(
+  async (): Promise<string> => {
+    return resolveRequestLocale()
+  }
+)

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

@@ -0,0 +1,11 @@
+/**
+ * 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
+ */
+
+export { getActiveLocaleFn } from './get-active-locale.js'
+export { setInterfaceLocaleFn } from './set-locale.js'
+export type { SetInterfaceLocaleInput, SetInterfaceLocaleResult } from './set-locale.js'