@byline/admin 4.11.2 → 4.12.0

package/dist/fields/blocks/blocks-field.js

@@ -1,6 +1,6 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useState } from "react";
-import { getClientConfig } from "@byline/core";
+import { getAdminConfig } from "@byline/core";
 import { useTranslation } from "@byline/i18n/react";
 import { Card, CloseIcon, DraggableSortable, IconButton, Modal, PlusIcon, moveItem } from "@byline/ui/react";
 import clsx from "clsx";
@@ -22,7 +22,7 @@ const BlocksField = ({ field, defaultValue, path, contentLocale })=>{
     ]);
     const blockAdminByType = useMemo(()=>{
         const map = new Map();
-        for (const entry of getClientConfig().blockAdmin ?? [])map.set(entry.blockType, entry);
+        for (const entry of getAdminConfig().blockAdmin ?? [])map.set(entry.blockType, entry);
         return map;
     }, []);
     const [selectedBlockName, setSelectedBlockName] = useState(()=>availableBlocks[0]?.blockType ?? '');

package/dist/fields/field-renderer.d.ts

@@ -26,7 +26,7 @@ interface FieldRendererProps {
     /**
      * Per-field rich-text editor component override from the admin config.
      * Takes precedence over the globally registered
-     * `ClientConfig.fields.richText.editor` for this single field.
+     * `AdminConfig.fields.richText.editor` for this single field.
      * Ignored when `field.type !== 'richText'`.
      */
     editor?: RichTextEditorComponent;

package/dist/fields/field-renderer.js

@@ -1,5 +1,5 @@
 import { jsx, jsxs } from "react/jsx-runtime";
-import { getClientConfig } from "@byline/core";
+import { getAdminConfig } from "@byline/core";
 import clsx from "clsx";
 import { useFormContext } from "../forms/form-context.js";
 import { ArrayField } from "./array/array-field.js";
@@ -98,7 +98,7 @@ const FieldRenderer = ({ field, defaultValue: initialDefault, basePath, disableS
                 });
             case 'richText':
                 {
-                    const RichTextEditor = editor ?? getClientConfig().fields?.richText?.editor;
+                    const RichTextEditor = editor ?? getAdminConfig().fields?.richText?.editor;
                     if (!RichTextEditor) throw new Error("No richText editor registered. Install @byline/richtext-lexical and set `fields.richText.editor` in your admin config.");
                     return /*#__PURE__*/ jsx(RichTextEditor, {
                         field: hideLabel ? {

package/dist/fields/group/group-field.d.ts

@@ -30,7 +30,7 @@ interface GroupFieldProps {
      * Per-child-field admin overrides (`components` slots, richtext `editor`),
      * keyed by dotted, index-free schema paths relative to this group
      * ('caption', 'faq.answer'). Threaded by `BlocksField` from the site-wide
-     * `ClientConfig.blockAdmin` registry (block children render through a
+     * `AdminConfig.blockAdmin` registry (block children render through a
      * synthesized group) and by `FieldRenderer` for plain schema groups, whose
      * map arrives pre-sliced from the collection admin config. Exact-name
      * entries apply to the child itself; deeper entries are re-sliced and

package/dist/fields/relation/relation-picker.d.ts

@@ -8,7 +8,7 @@
 import type { CollectionDefinition } from '@byline/core';
 /**
  * Row rendering strategy, in priority order:
- *   1. `CollectionAdminConfig.picker` — a ColumnDefinition[] from the target
+ *   1. `CollectionAdminConfig.itemView` — a ColumnDefinition[] from the target
  *      admin config. Each row renders the declared columns side-by-side,
  *      reusing any column formatters (thumbnail, date, etc).
  *   2. Explicit `displayField` prop on this component (forwarded from

package/dist/fields/relation/relation-picker.js

@@ -1,6 +1,6 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useCallback, useEffect, useState } from "react";
-import { getCollectionAdminConfig, resolveItemViewColumns } from "@byline/core";
+import { getCollectionAdminConfig } from "@byline/core";
 import { useTranslation } from "@byline/i18n/react";
 import { Button, CheckIcon, LoaderRing, Modal, Search } from "@byline/ui/react";
 import clsx from "clsx";
@@ -21,7 +21,7 @@ const RelationPicker = ({ targetCollectionPath, targetDefinition, displayField,
     const [collectionId, setCollectionId] = useState(null);
     const { getCollectionDocuments } = useBylineFieldServices();
     const targetAdminConfig = getCollectionAdminConfig(targetCollectionPath);
-    const pickerColumns = resolveItemViewColumns(targetAdminConfig);
+    const pickerColumns = targetAdminConfig?.itemView;
     useEffect(()=>{
         if (isOpen) {
             setQuery('');

package/dist/fields/relation/relation-summary.js

@@ -1,10 +1,9 @@
 import { jsx, jsxs } from "react/jsx-runtime";
-import { resolveItemViewColumns } from "@byline/core";
 import clsx from "clsx";
 import { PickerCell, resolveFallbackDisplayField, resolveRowLabel } from "./relation-display.js";
 import relation_summary_module from "./relation-summary.module.js";
 function RelationSummary({ targetDefinition, targetAdminConfig, displayField, value, cachedRecord }) {
-    const pickerColumns = resolveItemViewColumns(targetAdminConfig);
+    const pickerColumns = targetAdminConfig?.itemView;
     if (false === value._resolved) return /*#__PURE__*/ jsxs("div", {
         className: clsx('byline-relation-summary-stack', relation_summary_module.stack),
         children: [

package/dist/forms/form-renderer.js

@@ -1,7 +1,7 @@
 "use client";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { getClientConfig } from "@byline/core";
+import { getAdminConfig } from "@byline/core";
 import { useTranslation } from "@byline/i18n/react";
 import { Alert, Button, ComboButton } from "@byline/ui/react";
 import clsx from "clsx";
@@ -34,7 +34,7 @@ const FormContent = ({ mode, fields, onSubmit, onCancel, onStatusChange, onUnpub
     const [pendingSystemFieldsSubmit, setPendingSystemFieldsSubmit] = useState(null);
     const [contentLocale, setContentLocale] = useState(initialLocale ?? defaultLocale);
     const { uploadField } = useBylineFieldServices();
-    const pathSlugifier = getClientConfig().slugifier;
+    const pathSlugifier = getAdminConfig().slugifier;
     const pathSourceLocked = useMemo(()=>{
         if (!useAsPath) return false;
         const source = fields.find((f)=>f.name === useAsPath);

package/dist/modules/admin-account/components/preferences.js

@@ -2,7 +2,7 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useMemo, useState } from "react";
 import { revalidateLogic, useForm } from "@tanstack/react-form-start";
-import { getClientConfig } from "@byline/core";
+import { getAdminConfig } from "@byline/core";
 import { useTranslation } from "@byline/i18n/react";
 import { Alert, Button, LoaderEllipsis, Select } from "@byline/ui/react";
 import clsx from "clsx";
@@ -22,16 +22,16 @@ function defaultsFrom(account) {
 }
 function Preferences({ account, onClose, onSuccess }) {
     const { t } = useTranslation('byline-admin');
-    const { setInterfaceLocale } = useBylineAdminServices();
+    const { setAdminLocale } = useBylineAdminServices();
     const [formError, setFormError] = useState(null);
     const [successMessage, setSuccessMessage] = useState(null);
     const localeItems = useMemo(()=>{
-        const { i18n } = getClientConfig();
-        const definitionByCode = new Map((i18n.interface.localeDefinitions ?? []).map((d)=>[
+        const { i18n } = getAdminConfig();
+        const definitionByCode = new Map((i18n.admin.localeDefinitions ?? []).map((d)=>[
                 d.code,
                 d.nativeName
             ]));
-        const items = i18n.interface.locales.map((code)=>({
+        const items = i18n.admin.locales.map((code)=>({
                 value: code,
                 label: definitionByCode.get(code) ?? code
             }));
@@ -60,7 +60,7 @@ function Preferences({ account, onClose, onSuccess }) {
             const nextLocale = value.locale === AUTO_VALUE ? null : value.locale;
             if (nextLocale === (account.preferred_locale ?? null)) return void setSuccessMessage(t('common.feedback.noChanges'));
             try {
-                const result = await setInterfaceLocale({
+                const result = await setAdminLocale({
                     data: {
                         locale: nextLocale
                     }

package/dist/modules/admin-users/repository.d.ts

@@ -52,7 +52,7 @@ export interface AdminUserRow {
      * Admin interface locale preference. `null` means "use the detection
      * cascade" (cookie → Accept-Language → defaultLocale). Stored as a
      * BCP 47 code; validated at the command layer against the host's
-     * `i18n.interface.locales`.
+     * `i18n.admin.locales`.
      */
     preferred_locale: string | null;
     created_at: Date;

package/dist/modules/auth/components/sign-in-form.d.ts

@@ -1,13 +1,11 @@
 export interface SignInFormProps {
     /** Host-validated root-relative destination after successful sign-in. */
     redirectTo?: string;
-    /** @deprecated Use `redirectTo`. */
-    callbackUrl?: string;
     /**
      * Optional plain "Home" link rendered on the left of the action row.
-     * Typically the host's configured `serverURL` so signed-out admins can
-     * navigate back to the public site without typing the URL.
+     * Typically the host's client-safe canonical site URL so signed-out admins
+     * can navigate back to the public site without typing the URL.
      */
     homeUrl?: string;
 }
-export declare function SignInForm({ redirectTo, callbackUrl, homeUrl }: SignInFormProps): import("react").JSX.Element;
+export declare function SignInForm({ redirectTo, homeUrl }: SignInFormProps): import("react").JSX.Element;

package/dist/modules/auth/components/sign-in-form.js

@@ -1,14 +1,14 @@
 "use client";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useState } from "react";
-import { getClientConfig } from "@byline/core";
+import { getAdminConfig } from "@byline/core";
 import { useTranslation } from "@byline/i18n/react";
 import { Alert, Button, Card, Input, LoaderEllipsis } from "@byline/ui/react";
 import clsx from "clsx";
 import { useBylineAdminServices } from "../../../services/admin-services-context.js";
 import { normalizeRootRelativeRedirect, resolveSignInFormRedirect } from "../safe-redirect.js";
 import sign_in_form_module from "./sign-in-form.module.js";
-function SignInForm({ redirectTo, callbackUrl, homeUrl }) {
+function SignInForm({ redirectTo, homeUrl }) {
     const { adminSignIn } = useBylineAdminServices();
     const { t } = useTranslation('byline-admin');
     const [email, setEmail] = useState('');
@@ -19,7 +19,7 @@ function SignInForm({ redirectTo, callbackUrl, homeUrl }) {
         event.preventDefault();
         if (pending) return;
         if (0 === email.trim().length || 0 === password.length) return void setError(t('auth.signIn.errors.empty'));
-        const destination = resolveSignInFormRedirect(redirectTo, callbackUrl, getClientConfig().routes.admin);
+        const destination = resolveSignInFormRedirect(redirectTo, getAdminConfig().routes.admin);
         setPending(true);
         setError(null);
         try {

package/dist/modules/auth/safe-redirect.d.ts

@@ -1,4 +1,4 @@
 /** Accept only canonical, unencoded, root-relative same-origin redirect paths. */
 export declare function normalizeRootRelativeRedirect(value: string): string | undefined;
-/** Resolve the new prop first, then the deprecated prop, then a trusted fallback. */
-export declare function resolveSignInFormRedirect(redirectTo: string | undefined, callbackUrl: string | undefined, fallback: string | (() => string)): string;
+/** Resolve the requested destination, then a trusted fallback. */
+export declare function resolveSignInFormRedirect(redirectTo: string | undefined, fallback: string | (() => string)): string;

package/dist/modules/auth/safe-redirect.js

@@ -11,8 +11,8 @@ function safe_redirect_normalizeRootRelativeRedirect(value) {
     if ('https://byline.invalid' !== url.origin) return;
     return `${url.pathname}${url.search}${url.hash}`;
 }
-function resolveSignInFormRedirect(redirectTo, callbackUrl, fallback) {
-    const requested = (redirectTo ? safe_redirect_normalizeRootRelativeRedirect(redirectTo) : void 0) ?? (callbackUrl ? safe_redirect_normalizeRootRelativeRedirect(callbackUrl) : void 0);
+function resolveSignInFormRedirect(redirectTo, fallback) {
+    const requested = redirectTo ? safe_redirect_normalizeRootRelativeRedirect(redirectTo) : void 0;
     if (requested) return requested;
     const defaultPath = 'function' == typeof fallback ? fallback() : fallback;
     return safe_redirect_normalizeRootRelativeRedirect(defaultPath) ?? '/';

package/dist/services/admin-services-types.d.ts

@@ -50,7 +50,7 @@ export type SignInResult = unknown;
 export type UpdateAccountInput = UpdateAccountRequest;
 /** Same shape as `ChangeAccountPasswordRequest` from `@byline/admin/admin-account`. */
 export type ChangeAccountPasswordInput = ChangeAccountPasswordRequest;
-export interface SetInterfaceLocaleInput {
+export interface SetAdminLocaleInput {
     /** BCP 47 tag, or `null` to clear the preference and re-engage detection. */
     locale: string | null;
 }
@@ -60,7 +60,7 @@ export interface SetInterfaceLocaleInput {
  * the account page); `null` on pre-auth surfaces (the sign-in page
  * locale dropdown) where the cookie write is the only effect.
  */
-export interface SetInterfaceLocaleResult {
+export interface SetAdminLocaleResult {
     ok: true;
     locale: string | null;
     account: AccountResponse | null;
@@ -121,7 +121,7 @@ export interface BylineAdminServices {
     adminSignIn: AdminServiceCall<SignInInput, SignInResult>;
     updateAccount: AdminServiceCall<UpdateAccountInput, AccountResponse>;
     changeAccountPassword: AdminServiceCall<ChangeAccountPasswordInput, AccountResponse>;
-    setInterfaceLocale: AdminServiceCall<SetInterfaceLocaleInput, SetInterfaceLocaleResult>;
+    setAdminLocale: AdminServiceCall<SetAdminLocaleInput, SetAdminLocaleResult>;
     createAdminUser: AdminServiceCall<CreateAdminUserInput, AdminUserResponse>;
     updateAdminUser: AdminServiceCall<UpdateAdminUserInput, AdminUserResponse>;
     setAdminUserPassword: AdminServiceCall<SetAdminUserPasswordInput, AdminUserResponse>;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@byline/admin",
   "private": false,
   "license": "MPL-2.0",
-  "version": "4.11.2",
+  "version": "4.12.0",
   "engines": {
     "node": ">=20.9.0"
   },
@@ -173,10 +173,10 @@
     "react-diff-viewer-continued": "^4.4.0",
     "uuid": "^14.0.1",
     "zod": "^4.4.3",
-    "@byline/auth": "4.11.2",
-    "@byline/i18n": "4.11.2",
-    "@byline/core": "4.11.2",
-    "@byline/ui": "4.11.2"
+    "@byline/auth": "4.12.0",
+    "@byline/ui": "4.12.0",
+    "@byline/core": "4.12.0",
+    "@byline/i18n": "4.12.0"
   },
   "peerDependencies": {
     "react": "^19.0.0",

package/src/fields/blocks/blocks-field.tsx

@@ -14,7 +14,7 @@ import type {
   Field,
   GroupField as GroupFieldType,
 } from '@byline/core'
-import { getClientConfig } from '@byline/core'
+import { getAdminConfig } from '@byline/core'
 import { useTranslation } from '@byline/i18n/react'
 import {
   Card,
@@ -65,14 +65,14 @@ export const BlocksField = ({
 
   const availableBlocks = useMemo(() => field.blocks ?? [], [field.blocks])
 
-  // Site-wide per-block admin config (`ClientConfig.blockAdmin`), resolved by
+  // Site-wide per-block admin config (`AdminConfig.blockAdmin`), resolved by
   // blockType. Registry-based on purpose: blocks are cross-collection units,
   // so their admin config applies wherever the block renders — no threading
   // from the collection admin config is needed (mirrors how FieldRenderer
-  // resolves the global richText editor from client config).
+  // resolves the global richText editor from admin config).
   const blockAdminByType = useMemo(() => {
     const map = new Map<string, BlockAdminConfig>()
-    for (const entry of getClientConfig().blockAdmin ?? []) {
+    for (const entry of getAdminConfig().blockAdmin ?? []) {
       map.set(entry.blockType, entry)
     }
     return map

package/src/fields/field-renderer.tsx

@@ -15,7 +15,7 @@ import type {
   GroupField as GroupFieldType,
   RichTextEditorComponent,
 } from '@byline/core'
-import { getClientConfig } from '@byline/core'
+import { getAdminConfig } from '@byline/core'
 import cx from 'clsx'
 
 import { useFormContext } from '../forms/form-context'
@@ -63,7 +63,7 @@ interface FieldRendererProps {
   /**
    * Per-field rich-text editor component override from the admin config.
    * Takes precedence over the globally registered
-   * `ClientConfig.fields.richText.editor` for this single field.
+   * `AdminConfig.fields.richText.editor` for this single field.
    * Ignored when `field.type !== 'richText'`.
    */
   editor?: RichTextEditorComponent
@@ -183,11 +183,11 @@ export const FieldRenderer = ({
         )
       case 'richText': {
         // Admin-side per-field override takes precedence over the globally
-        // registered editor (`ClientConfig.fields.richText.editor`). The
+        // registered editor (`AdminConfig.fields.richText.editor`). The
         // override travels via `FieldAdminConfig.fields.<name>.editor` —
         // see admin-types — so React component references stay out of the
         // schema graph that's loaded by the server bootstrap.
-        const RichTextEditor = editor ?? getClientConfig().fields?.richText?.editor
+        const RichTextEditor = editor ?? getAdminConfig().fields?.richText?.editor
         if (!RichTextEditor) {
           throw new Error(
             'No richText editor registered. Install @byline/richtext-lexical and set ' +

package/src/fields/group/group-field.tsx

@@ -53,7 +53,7 @@ interface GroupFieldProps {
    * Per-child-field admin overrides (`components` slots, richtext `editor`),
    * keyed by dotted, index-free schema paths relative to this group
    * ('caption', 'faq.answer'). Threaded by `BlocksField` from the site-wide
-   * `ClientConfig.blockAdmin` registry (block children render through a
+   * `AdminConfig.blockAdmin` registry (block children render through a
    * synthesized group) and by `FieldRenderer` for plain schema groups, whose
    * map arrives pre-sliced from the collection admin config. Exact-name
    * entries apply to the child itself; deeper entries are re-sliced and

package/src/fields/relation/relation-picker.tsx

@@ -9,7 +9,7 @@
 import { useCallback, useEffect, useState } from 'react'
 
 import type { CollectionAdminConfig, CollectionDefinition } from '@byline/core'
-import { getCollectionAdminConfig, resolveItemViewColumns } from '@byline/core'
+import { getCollectionAdminConfig } from '@byline/core'
 import { useTranslation } from '@byline/i18n/react'
 import { Button, CheckIcon, LoaderRing, Modal, Search } from '@byline/ui/react'
 import cx from 'clsx'
@@ -29,7 +29,7 @@ import styles from './relation-picker.module.css'
 
 /**
  * Row rendering strategy, in priority order:
- *   1. `CollectionAdminConfig.picker` — a ColumnDefinition[] from the target
+ *   1. `CollectionAdminConfig.itemView` — a ColumnDefinition[] from the target
  *      admin config. Each row renders the declared columns side-by-side,
  *      reusing any column formatters (thumbnail, date, etc).
  *   2. Explicit `displayField` prop on this component (forwarded from
@@ -138,7 +138,7 @@ export const RelationPicker = ({
 
   const targetAdminConfig: CollectionAdminConfig | null =
     getCollectionAdminConfig(targetCollectionPath)
-  const pickerColumns = resolveItemViewColumns(targetAdminConfig)
+  const pickerColumns = targetAdminConfig?.itemView
 
   // Reset local state each time the modal opens so prior queries don't leak.
   useEffect(() => {

package/src/fields/relation/relation-summary.tsx

@@ -7,7 +7,6 @@
  */
 
 import type { CollectionAdminConfig, CollectionDefinition } from '@byline/core'
-import { resolveItemViewColumns } from '@byline/core'
 import cx from 'clsx'
 
 import { PickerCell, resolveFallbackDisplayField, resolveRowLabel } from './relation-display'
@@ -63,7 +62,7 @@ export function RelationSummary({
   value,
   cachedRecord,
 }: RelationSummaryProps) {
-  const pickerColumns = resolveItemViewColumns(targetAdminConfig)
+  const pickerColumns = targetAdminConfig?.itemView
 
   // Unresolved (deleted target).
   if (value._resolved === false) {

package/src/forms/form-renderer.tsx

@@ -18,7 +18,7 @@ import type {
   TabSetDefinition,
   WorkflowStatus,
 } from '@byline/core'
-import { getClientConfig } from '@byline/core'
+import { getAdminConfig } from '@byline/core'
 import type { DocumentPatch } from '@byline/core/patches'
 import { useTranslation } from '@byline/i18n/react'
 import { Alert, Button, ComboButton } from '@byline/ui/react'
@@ -249,7 +249,7 @@ const FormContent = ({
   // server-assigned `counter` or a read-only field, its value can't be
   // reproduced or changed through the form, so the widget suppresses its
   // source-derived preview and "Regenerate" affordance.
-  const pathSlugifier = getClientConfig().slugifier
+  const pathSlugifier = getAdminConfig().slugifier
   const pathSourceLocked = useMemo(() => {
     if (!useAsPath) return false
     const source = fields.find((f) => f.name === useAsPath)

package/src/forms/path-widget.tsx

@@ -99,7 +99,7 @@ export const PathWidget = ({
 
   // The installation slugifier, or the built-in default. Server-side path
   // derivation uses `ServerConfig.slugifier`; this must be the same function
-  // (registered via `ClientConfig.slugifier`) or the preview will disagree
+  // (registered via `AdminConfig.slugifier`) or the preview will disagree
   // with what the server persists.
   const runSlugify = slugifier ?? slugify
 

package/src/modules/admin-account/components/preferences.tsx

@@ -18,8 +18,8 @@
  * setting.
  *
  * Locale write surface mirrors the chrome-bar `<LanguageMenu>` — both
- * route through `setInterfaceLocale` (the service) →
- * `setInterfaceLocaleFn` (the host server fn) → the shared
+ * route through `setAdminLocale` (the service) →
+ * `setAdminLocaleFn` (the host server fn) → the shared
  * cookie + `admin_users.preferred_locale` writes. The dropdown carries
  * an explicit "Use browser default" entry that maps to `null`
  * server-side, clearing the column and re-engaging the detection
@@ -36,7 +36,7 @@
 import { useMemo, useState } from 'react'
 import { revalidateLogic, useForm } from '@tanstack/react-form-start'
 
-import { getClientConfig } from '@byline/core'
+import { getAdminConfig } from '@byline/core'
 import { useTranslation } from '@byline/i18n/react'
 import { Alert, Button, LoaderEllipsis, Select } from '@byline/ui/react'
 import cx from 'clsx'
@@ -76,7 +76,7 @@ interface PreferencesProps {
 
 export function Preferences({ account, onClose, onSuccess }: PreferencesProps) {
   const { t } = useTranslation('byline-admin')
-  const { setInterfaceLocale } = useBylineAdminServices()
+  const { setAdminLocale } = useBylineAdminServices()
   const [formError, setFormError] = useState<string | null>(null)
   const [successMessage, setSuccessMessage] = useState<string | null>(null)
 
@@ -85,11 +85,11 @@ export function Preferences({ account, onClose, onSuccess }: PreferencesProps) {
   // ("Français" vs CLDR's lowercase "français"); when it's not set,
   // fall back to the raw code so the form still functions.
   const localeItems = useMemo(() => {
-    const { i18n } = getClientConfig()
+    const { i18n } = getAdminConfig()
     const definitionByCode = new Map(
-      (i18n.interface.localeDefinitions ?? []).map((d) => [d.code, d.nativeName])
+      (i18n.admin.localeDefinitions ?? []).map((d) => [d.code, d.nativeName])
     )
-    const items = i18n.interface.locales.map((code) => ({
+    const items = i18n.admin.locales.map((code) => ({
       value: code,
       label: definitionByCode.get(code) ?? code,
     }))
@@ -114,7 +114,7 @@ export function Preferences({ account, onClose, onSuccess }: PreferencesProps) {
         return
       }
       try {
-        const result = await setInterfaceLocale({ data: { locale: nextLocale } })
+        const result = await setAdminLocale({ data: { locale: nextLocale } })
         // Pre-auth path returns `account: null`; the form is only
         // reachable behind an admin session, so `account` should be
         // populated. Treat absence as a defensive no-op.

package/src/modules/admin-users/repository.ts

@@ -54,7 +54,7 @@ export interface AdminUserRow {
    * Admin interface locale preference. `null` means "use the detection
    * cascade" (cookie → Accept-Language → defaultLocale). Stored as a
    * BCP 47 code; validated at the command layer against the host's
-   * `i18n.interface.locales`.
+   * `i18n.admin.locales`.
    */
   preferred_locale: string | null
   created_at: Date

package/src/modules/auth/components/sign-in-form.tsx

@@ -25,7 +25,7 @@
 
 import { type FormEvent, useState } from 'react'
 
-import { getClientConfig } from '@byline/core'
+import { getAdminConfig } from '@byline/core'
 import { useTranslation } from '@byline/i18n/react'
 import { Alert, Button, Card, Input, LoaderEllipsis } from '@byline/ui/react'
 import cx from 'clsx'
@@ -37,17 +37,15 @@ import styles from './sign-in-form.module.css'
 export interface SignInFormProps {
   /** Host-validated root-relative destination after successful sign-in. */
   redirectTo?: string
-  /** @deprecated Use `redirectTo`. */
-  callbackUrl?: string
   /**
    * Optional plain "Home" link rendered on the left of the action row.
-   * Typically the host's configured `serverURL` so signed-out admins can
-   * navigate back to the public site without typing the URL.
+   * Typically the host's client-safe canonical site URL so signed-out admins
+   * can navigate back to the public site without typing the URL.
    */
   homeUrl?: string
 }
 
-export function SignInForm({ redirectTo, callbackUrl, homeUrl }: SignInFormProps) {
+export function SignInForm({ redirectTo, homeUrl }: SignInFormProps) {
   const { adminSignIn } = useBylineAdminServices()
   const { t } = useTranslation('byline-admin')
   const [email, setEmail] = useState('')
@@ -63,11 +61,7 @@ export function SignInForm({ redirectTo, callbackUrl, homeUrl }: SignInFormProps
       return
     }
 
-    const destination = resolveSignInFormRedirect(
-      redirectTo,
-      callbackUrl,
-      getClientConfig().routes.admin
-    )
+    const destination = resolveSignInFormRedirect(redirectTo, getAdminConfig().routes.admin)
 
     setPending(true)
     setError(null)

package/src/modules/auth/safe-redirect.test.node.ts

@@ -31,22 +31,17 @@ describe('normalizeRootRelativeRedirect', () => {
 })
 
 describe('resolveSignInFormRedirect', () => {
-  it('prefers a safe redirectTo over the deprecated callbackUrl', () => {
-    expect(resolveSignInFormRedirect('/cms/account', '/cms/users', '/cms')).toBe('/cms/account')
+  it('uses a safe redirectTo without evaluating the fallback', () => {
+    expect(resolveSignInFormRedirect('/cms/account', '/cms')).toBe('/cms/account')
     expect(
-      resolveSignInFormRedirect('/cms/account', undefined, () => {
+      resolveSignInFormRedirect('/cms/account', () => {
         throw new Error('fallback must be lazy')
       })
     ).toBe('/cms/account')
   })
 
-  it('supports a safe deprecated callbackUrl when redirectTo is absent or unsafe', () => {
-    expect(resolveSignInFormRedirect(undefined, '/cms/users', '/cms')).toBe('/cms/users')
-    expect(resolveSignInFormRedirect('https://evil.test', '/cms/users', '/cms')).toBe('/cms/users')
-  })
-
   it('uses the safe configured fallback without permitting an open redirect', () => {
-    expect(resolveSignInFormRedirect('//evil.test', 'https://evil.test', '/cms')).toBe('/cms')
-    expect(resolveSignInFormRedirect(undefined, undefined, 'https://evil.test')).toBe('/')
+    expect(resolveSignInFormRedirect('//evil.test', '/cms')).toBe('/cms')
+    expect(resolveSignInFormRedirect(undefined, 'https://evil.test')).toBe('/')
   })
 })

package/src/modules/auth/safe-redirect.ts

@@ -17,15 +17,12 @@ export function normalizeRootRelativeRedirect(value: string): string | undefined
   return `${url.pathname}${url.search}${url.hash}`
 }
 
-/** Resolve the new prop first, then the deprecated prop, then a trusted fallback. */
+/** Resolve the requested destination, then a trusted fallback. */
 export function resolveSignInFormRedirect(
   redirectTo: string | undefined,
-  callbackUrl: string | undefined,
   fallback: string | (() => string)
 ): string {
-  const requested =
-    (redirectTo ? normalizeRootRelativeRedirect(redirectTo) : undefined) ??
-    (callbackUrl ? normalizeRootRelativeRedirect(callbackUrl) : undefined)
+  const requested = redirectTo ? normalizeRootRelativeRedirect(redirectTo) : undefined
   if (requested) return requested
 
   const defaultPath = typeof fallback === 'function' ? fallback() : fallback

package/src/modules/auth/sign-in-form-props.test.node.ts

@@ -3,11 +3,7 @@ import { describe, expectTypeOf, it } from 'vitest'
 import type { SignInFormProps } from './components/sign-in-form.js'
 
 describe('SignInFormProps', () => {
-  it('keeps legacy callbackUrl-only callers type-compatible', () => {
-    expectTypeOf<{ callbackUrl: string }>().toMatchTypeOf<SignInFormProps>()
-  })
-
-  it('accepts the preferred redirectTo prop and no destination prop', () => {
+  it('accepts redirectTo and no destination prop', () => {
     expectTypeOf<{ redirectTo: string }>().toMatchTypeOf<SignInFormProps>()
     expectTypeOf<Record<string, never>>().toMatchTypeOf<SignInFormProps>()
   })

package/src/services/admin-services-types.ts

@@ -67,7 +67,7 @@ export type UpdateAccountInput = UpdateAccountRequest
 /** Same shape as `ChangeAccountPasswordRequest` from `@byline/admin/admin-account`. */
 export type ChangeAccountPasswordInput = ChangeAccountPasswordRequest
 
-export interface SetInterfaceLocaleInput {
+export interface SetAdminLocaleInput {
   /** BCP 47 tag, or `null` to clear the preference and re-engage detection. */
   locale: string | null
 }
@@ -78,7 +78,7 @@ export interface SetInterfaceLocaleInput {
  * the account page); `null` on pre-auth surfaces (the sign-in page
  * locale dropdown) where the cookie write is the only effect.
  */
-export interface SetInterfaceLocaleResult {
+export interface SetAdminLocaleResult {
   ok: true
   locale: string | null
   account: AccountResponse | null
@@ -159,7 +159,7 @@ export interface BylineAdminServices {
   // Account self-service
   updateAccount: AdminServiceCall<UpdateAccountInput, AccountResponse>
   changeAccountPassword: AdminServiceCall<ChangeAccountPasswordInput, AccountResponse>
-  setInterfaceLocale: AdminServiceCall<SetInterfaceLocaleInput, SetInterfaceLocaleResult>
+  setAdminLocale: AdminServiceCall<SetAdminLocaleInput, SetAdminLocaleResult>
 
   // Admin user writes (page-container reads stay in the host for now)
   createAdminUser: AdminServiceCall<CreateAdminUserInput, AdminUserResponse>