@byline/host-tanstack-start 4.0.0 → 4.1.0

package/src/i18n/resolve-locale.ts

@@ -23,10 +23,10 @@
 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 { getAdminRequestContext } from '../auth/auth-context.js'
 import { bylineCore } from '../integrations/byline-core.js'
 import { readAdminLocaleCookie } from './locale-cookie.js'
 

package/src/index.ts

@@ -19,14 +19,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/src/integrations/host-bridge.ts

@@ -0,0 +1,56 @@
+/**
+ * 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
+ */
+
+/**
+ * The TanStack Start implementation of `HostRequestBridge` — the three
+ * request primitives (`getRequest` identity, cookie read, cookie write)
+ * that `@byline/client/server` is written against.
+ *
+ * Registered as a module side effect: every module in this package that
+ * fronts the server-side client stack imports this file first, so any
+ * code path that can reach a getter has already registered the bridge.
+ * Registration is idempotent (last-write-wins on a `globalThis` symbol
+ * slot), so repeated evaluation across Vite SSR module graphs is
+ * harmless.
+ */
+
+import { getCookie, getRequest, setCookie } from '@tanstack/react-start/server'
+
+import {
+  type HostCookieSetOptions,
+  type HostRequestBridge,
+  registerHostRequestBridge,
+} from '@byline/core'
+
+const tanstackStartRequestBridge: HostRequestBridge = {
+  getRequest(): object | undefined {
+    try {
+      return getRequest()
+    } catch {
+      // No StartEvent in AsyncLocalStorage — running outside a request.
+      return undefined
+    }
+  },
+  getCookie(name: string): string | undefined {
+    return getCookie(name)
+  },
+  setCookie(name: string, value: string, options?: HostCookieSetOptions): void {
+    setCookie(name, value, options)
+  },
+}
+
+/**
+ * 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 function registerTanstackStartHostBridge(): void {
+  registerHostRequestBridge(tanstackStartRequestBridge)
+}
+
+registerTanstackStartHostBridge()

package/src/integrations/serve-uploads.ts

@@ -46,6 +46,12 @@ import type { Stats } from 'node:fs'
 import { readFile, stat } from 'node:fs/promises'
 import { resolve as resolvePath } from 'node:path'
 
+// Belt-and-braces bridge registration: `serveUploads` is imported by every
+// scaffolded app's `src/server.ts` at boot, so pulling in the host bridge
+// here guarantees `@byline/client/server` getters can resolve cookies even
+// if a server config forgets the explicit `registerTanstackStartHostBridge()`.
+import './host-bridge.js'
+
 export interface UploadsHandlerOptions {
   /**
    * URL prefix to match. Trailing slash required. Default `'/uploads/'`.

package/src/server-fns/admin-account/change-password.ts

@@ -9,8 +9,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { type AccountResponse, changeAccountPasswordCommand } from '@byline/admin/admin-account'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 export interface ChangeAccountPasswordInput {

package/src/server-fns/admin-account/get.ts

@@ -9,8 +9,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { type AccountResponse, getAccountCommand } from '@byline/admin/admin-account'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 /**

package/src/server-fns/admin-account/update.ts

@@ -9,8 +9,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { type AccountResponse, updateAccountCommand } from '@byline/admin/admin-account'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 export interface UpdateAccountInput {

package/src/server-fns/admin-activity/get.ts

@@ -10,9 +10,9 @@ import { createServerFn } from '@tanstack/react-start'
 
 import { assertAdminActor } from '@byline/admin'
 import { ADMIN_ACTIVITY_ABILITIES } from '@byline/admin/admin-activity'
+import { getAdminRequestContext } from '@byline/client/server'
 import { ERR_AUDIT_UNSUPPORTED, getLogger, getServerConfig } from '@byline/core'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { type ActorLabelMap, resolveActorLabels } from '../collections/actors.js'
 import type { AuditLogEntryDto } from '../collections/audit.js'
 

package/src/server-fns/admin-permissions/get-role-abilities.ts

@@ -12,8 +12,8 @@ import {
   type GetRoleAbilitiesResponse,
   getRoleAbilitiesCommand,
 } from '@byline/admin/admin-permissions'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 export const getRoleAbilities = createServerFn({ method: 'GET' })

package/src/server-fns/admin-permissions/list-registered.ts

@@ -12,8 +12,8 @@ import {
   type ListRegisteredAbilitiesResponse,
   listRegisteredAbilitiesCommand,
 } from '@byline/admin/admin-permissions'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 /**

package/src/server-fns/admin-permissions/set-role-abilities.ts

@@ -12,8 +12,8 @@ import {
   type SetRoleAbilitiesResponse,
   setRoleAbilitiesCommand,
 } from '@byline/admin/admin-permissions'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 export interface SetRoleAbilitiesInput {

package/src/server-fns/admin-permissions/who-has.ts

@@ -9,8 +9,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { type WhoHasAbilityResponse, whoHasAbilityCommand } from '@byline/admin/admin-permissions'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 export const whoHasAbility = createServerFn({ method: 'GET' })

package/src/server-fns/admin-roles/create.ts

@@ -9,8 +9,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { type AdminRoleResponse, createAdminRoleCommand } from '@byline/admin/admin-roles'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 export interface CreateAdminRoleInput {

package/src/server-fns/admin-roles/delete.ts

@@ -9,8 +9,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { deleteAdminRoleCommand } from '@byline/admin/admin-roles'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 // Return shape mirrors `OkResponse` from `@byline/admin/admin-users`.

package/src/server-fns/admin-roles/get.ts

@@ -9,8 +9,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { type AdminRoleResponse, getAdminRoleCommand } from '@byline/admin/admin-roles'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 export const getAdminRole = createServerFn({ method: 'GET' })

package/src/server-fns/admin-roles/list.ts

@@ -9,8 +9,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { type AdminRoleListResponse, listAdminRolesCommand } from '@byline/admin/admin-roles'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 /**

package/src/server-fns/admin-roles/reorder.ts

@@ -9,8 +9,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { reorderAdminRolesCommand } from '@byline/admin/admin-roles'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 export const reorderAdminRoles = createServerFn({ method: 'POST' })

package/src/server-fns/admin-roles/update.ts

@@ -9,8 +9,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { type AdminRoleResponse, updateAdminRoleCommand } from '@byline/admin/admin-roles'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 export interface UpdateAdminRoleInput {

package/src/server-fns/admin-users/create.ts

@@ -9,8 +9,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { type AdminUserResponse, createAdminUserCommand } from '@byline/admin/admin-users'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 export interface CreateAdminUserInput {

package/src/server-fns/admin-users/delete.ts

@@ -9,8 +9,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { deleteAdminUserCommand, type OkResponse } from '@byline/admin/admin-users'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 export const deleteAdminUser = createServerFn({ method: 'POST' })

package/src/server-fns/admin-users/disable.ts

@@ -9,8 +9,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { disableAdminUserCommand, type OkResponse } from '@byline/admin/admin-users'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 // No UI affordance yet — paired with `enable.ts`, both ship ahead of the

package/src/server-fns/admin-users/enable.ts

@@ -9,8 +9,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { enableAdminUserCommand, type OkResponse } from '@byline/admin/admin-users'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 // No UI affordance yet — paired with `disable.ts`, both ship ahead of the

package/src/server-fns/admin-users/get-user-roles.ts

@@ -9,8 +9,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { getRolesForUserCommand, type UserRolesResponse } from '@byline/admin/admin-roles'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 export const getUserRoles = createServerFn({ method: 'GET' })

package/src/server-fns/admin-users/get.ts

@@ -9,8 +9,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { type AdminUserResponse, getAdminUserCommand } from '@byline/admin/admin-users'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 export const getAdminUser = createServerFn({ method: 'GET' })

package/src/server-fns/admin-users/list.ts

@@ -13,8 +13,8 @@ import {
   type AdminUserListResponse,
   listAdminUsersCommand,
 } from '@byline/admin/admin-users'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 export interface ListAdminUsersInput {

package/src/server-fns/admin-users/set-password.ts

@@ -9,8 +9,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { type AdminUserResponse, setAdminUserPasswordCommand } from '@byline/admin/admin-users'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 export interface SetAdminUserPasswordInput {

package/src/server-fns/admin-users/set-user-roles.ts

@@ -9,8 +9,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { setRolesForUserCommand, type UserRolesResponse } from '@byline/admin/admin-roles'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 export interface SetUserRolesInput {

package/src/server-fns/admin-users/update.ts

@@ -9,8 +9,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { type AdminUserResponse, updateAdminUserCommand } from '@byline/admin/admin-users'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 export interface UpdateAdminUserInput {

package/src/server-fns/ai/execute.ts

@@ -24,8 +24,7 @@ import type { ExecuteInstructionOptions, ExecuteInstructionParams } from '@bylin
 // Server-only execute API — kept on the `/server` subpath so the browser
 // barrel for `@byline/ai` stays free of pino + the provider SDKs.
 import { executeInstruction, executeInstructionStreaming } from '@byline/ai/server'
-
-import { getAdminRequestContext } from '../../auth/auth-context.js'
+import { getAdminRequestContext } from '@byline/client/server'
 
 /**
  * Wire shape — the same as `ExecuteInstruction` minus the in-process-only

package/src/server-fns/auth/current-user.ts

@@ -21,8 +21,8 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { type Actor, AuthError } from '@byline/auth'
+import { getAdminRequestContext } from '@byline/client/server'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { bylineCore } from '../../integrations/byline-core.js'
 
 export interface CurrentAdminUser {

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

@@ -20,9 +20,9 @@
 import { createServerFn } from '@tanstack/react-start'
 import { getRequestHeader } from '@tanstack/react-start/server'
 
+import { setSessionCookies } from '@byline/client/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'
 

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

@@ -23,11 +23,13 @@
 
 import { createServerFn } from '@tanstack/react-start'
 
+import {
+  clearPreviewCookie,
+  clearSessionCookies,
+  readRefreshTokenCookie,
+} from '@byline/client/server'
 import { getServerConfig } from '@byline/core'
 
-import { clearSessionCookies, readRefreshTokenCookie } from '../../auth/auth-cookies.js'
-import { clearPreviewCookie } from '../../auth/preview-cookies.js'
-
 export const adminSignOut = createServerFn({ method: 'POST' }).handler(async () => {
   const provider = getServerConfig().sessionProvider
   const refreshToken = readRefreshTokenCookie()

package/src/server-fns/collections/audit.ts

@@ -8,10 +8,10 @@
 
 import { createServerFn } from '@tanstack/react-start'
 
+import { getAdminBylineClient } from '@byline/client/server'
 import { ERR_NOT_FOUND, getLogger } from '@byline/core'
 
 import { ensureCollection } from '../../integrations/api-utils.js'
-import { getAdminBylineClient } from '../../integrations/byline-client.js'
 import { type ActorLabelMap, resolveActorLabels } from './actors.js'
 
 // ---------------------------------------------------------------------------

package/src/server-fns/collections/copy-to-locale.ts

@@ -8,11 +8,11 @@
 
 import { createServerFn } from '@tanstack/react-start'
 
+import { getAdminRequestContext } from '@byline/client/server'
 import { ERR_NOT_FOUND, getLogger, getServerConfig } from '@byline/core'
 import type { CopyToLocaleResult, DocumentLifecycleContext } from '@byline/core/services'
 import { copyToLocale } from '@byline/core/services'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { ensureCollection } from '../../integrations/api-utils.js'
 
 // ---------------------------------------------------------------------------

package/src/server-fns/collections/create.ts

@@ -8,11 +8,11 @@
 
 import { createServerFn } from '@tanstack/react-start'
 
+import { getAdminRequestContext } from '@byline/client/server'
 import { ERR_NOT_FOUND, getLogger, getServerConfig } from '@byline/core'
 import type { DocumentLifecycleContext } from '@byline/core/services'
 import { createDocument } from '@byline/core/services'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { ensureCollection } from '../../integrations/api-utils.js'
 
 // ---------------------------------------------------------------------------

package/src/server-fns/collections/delete-locale.ts

@@ -8,11 +8,11 @@
 
 import { createServerFn } from '@tanstack/react-start'
 
+import { getAdminRequestContext } from '@byline/client/server'
 import { ERR_NOT_FOUND, getLogger, getServerConfig } from '@byline/core'
 import type { DeleteLocaleResult, DocumentLifecycleContext } from '@byline/core/services'
 import { deleteLocale } from '@byline/core/services'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { ensureCollection } from '../../integrations/api-utils.js'
 
 // ---------------------------------------------------------------------------

package/src/server-fns/collections/delete.ts

@@ -8,11 +8,11 @@
 
 import { createServerFn } from '@tanstack/react-start'
 
+import { getAdminRequestContext } from '@byline/client/server'
 import { ERR_NOT_FOUND, getLogger, getServerConfig, getUploadFields } from '@byline/core'
 import type { DocumentLifecycleContext } from '@byline/core/services'
 import { deleteDocument as deleteDocumentService } from '@byline/core/services'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { ensureCollection } from '../../integrations/api-utils.js'
 import { toDeleteDocumentResponse } from './delete-outcome.js'
 

package/src/server-fns/collections/duplicate.ts

@@ -8,11 +8,11 @@
 
 import { createServerFn } from '@tanstack/react-start'
 
+import { getAdminRequestContext } from '@byline/client/server'
 import { ERR_NOT_FOUND, getLogger, getServerConfig } from '@byline/core'
 import type { DocumentLifecycleContext, DuplicateDocumentResult } from '@byline/core/services'
 import { duplicateDocument } from '@byline/core/services'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { ensureCollection } from '../../integrations/api-utils.js'
 
 // ---------------------------------------------------------------------------

package/src/server-fns/collections/get.ts

@@ -8,6 +8,7 @@
 
 import { createServerFn } from '@tanstack/react-start'
 
+import { getAdminBylineClient } from '@byline/client/server'
 import {
   BylineError,
   buildRelationSummaryPopulateMap,
@@ -22,7 +23,6 @@ import {
 } from '@byline/core'
 
 import { ensureCollection } from '../../integrations/api-utils.js'
-import { getAdminBylineClient } from '../../integrations/byline-client.js'
 import { serialise } from './utils'
 
 // ---------------------------------------------------------------------------

package/src/server-fns/collections/history.ts

@@ -8,10 +8,10 @@
 
 import { createServerFn } from '@tanstack/react-start'
 
+import { getAdminBylineClient } from '@byline/client/server'
 import { ERR_NOT_FOUND, getCollectionSchemasForPath, getLogger } from '@byline/core'
 
 import { ensureCollection } from '../../integrations/api-utils.js'
-import { getAdminBylineClient } from '../../integrations/byline-client.js'
 import { type ActorLabelMap, resolveActorLabels } from './actors.js'
 import { serialise } from './utils'
 

package/src/server-fns/collections/list.ts

@@ -8,6 +8,7 @@
 
 import { createServerFn } from '@tanstack/react-start'
 
+import { getAdminBylineClient } from '@byline/client/server'
 import {
   buildRelationSummaryPopulateMap,
   ERR_NOT_FOUND,
@@ -21,7 +22,6 @@ import {
 } from '@byline/core'
 
 import { ensureCollection } from '../../integrations/api-utils.js'
-import { getAdminBylineClient } from '../../integrations/byline-client.js'
 import { serialise } from './utils'
 
 // ---------------------------------------------------------------------------

package/src/server-fns/collections/reindex.ts

@@ -22,10 +22,10 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import type { ReindexResult } from '@byline/client'
+import { getAdminBylineClient } from '@byline/client/server'
 import { ERR_NOT_FOUND, getLogger } from '@byline/core'
 
 import { ensureCollection } from '../../integrations/api-utils.js'
-import { getAdminBylineClient } from '../../integrations/byline-client.js'
 
 export type { ReindexResult }
 

package/src/server-fns/collections/reorder.ts

@@ -8,6 +8,7 @@
 
 import { createServerFn } from '@tanstack/react-start'
 
+import { getAdminRequestContext } from '@byline/client/server'
 import {
   assertActorCanPerform,
   ERR_NOT_FOUND,
@@ -18,7 +19,6 @@ import {
   getServerConfig,
 } from '@byline/core'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { ensureCollection } from '../../integrations/api-utils.js'
 
 // ---------------------------------------------------------------------------

package/src/server-fns/collections/restore-version.ts

@@ -8,11 +8,11 @@
 
 import { createServerFn } from '@tanstack/react-start'
 
+import { getAdminRequestContext } from '@byline/client/server'
 import { ERR_NOT_FOUND, getLogger, getServerConfig } from '@byline/core'
 import type { DocumentLifecycleContext } from '@byline/core/services'
 import { restoreDocumentVersion as restoreDocumentVersionService } from '@byline/core/services'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { ensureCollection } from '../../integrations/api-utils.js'
 
 // ---------------------------------------------------------------------------

package/src/server-fns/collections/stats.ts

@@ -8,8 +8,9 @@
 
 import { createServerFn } from '@tanstack/react-start'
 
+import { getAdminBylineClient } from '@byline/client/server'
+
 import { ensureCollection } from '../../integrations/api-utils.js'
-import { getAdminBylineClient } from '../../integrations/byline-client.js'
 
 // ---------------------------------------------------------------------------
 // Shared types

package/src/server-fns/collections/status.ts

@@ -8,6 +8,7 @@
 
 import { createServerFn } from '@tanstack/react-start'
 
+import { getAdminRequestContext } from '@byline/client/server'
 import { ERR_NOT_FOUND, getLogger, getServerConfig } from '@byline/core'
 import type { DocumentLifecycleContext } from '@byline/core/services'
 import {
@@ -15,7 +16,6 @@ import {
   unpublishDocument as unpublishDocumentService,
 } from '@byline/core/services'
 
-import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { ensureCollection } from '../../integrations/api-utils.js'
 
 // ---------------------------------------------------------------------------