@@ -242,7 +242,7 @@ const summarizeDlqJob = (j: Job) => ({
   failureKind: j.data.failureKind,
   failureCode: j.data.failureCode,
   to: [j.data.payload?.to].flat().filter(Boolean).map(maskEmail),
-  failedReason: j.data.failureReason ?? j.failedReason
+  failedReason: j.data.failureReason
 })
 
 export async function getDeadLetterQueueContents(c: AppContext) {
 
@@ -207,15 +207,8 @@ export async function getPushStatsAdmin(c: AppContext) {
   }
 }
 
-/** Always 200 with the status, so the dashboard reads the VAPID and queue flags from the body. */
-export async function getPushGatewayAdmin(c: AppContext) {
-  try {
-    return c.json(await pushGateway.getHealth())
-  } catch (error) {
-    adminLogger.error({ err: error }, 'Failed to get push gateway status')
-    return c.json({ error: 'Failed to fetch push gateway status' }, 500)
-  }
-}
+/** Answers 200 even when push is down, so the dashboard reads the VAPID and queue flags from the body. */
+export const getPushGatewayAdmin = async (c: AppContext) => c.json(await pushGateway.getHealth())
 
 export async function getPushPipelineAdmin(c: AppContext) {
   const supabase = getSupabaseClient()
 
@@ -98,8 +98,9 @@ function classifyGhost(user: AuthUser, minAgeDays: number): GhostType | null {
  * who may have signed in since. Refuse admins: a hard delete cascades past the
  * last-admin guard. Returns the refusal reason, or null. A read fault throws.
  */
-async function assertDeletableGhost(client: AdminClient, userId: string): Promise<string | null> {
+async function ghostDeleteRefusal(client: AdminClient, userId: string): Promise<string | null> {
   const { data, error } = await client.auth.admin.getUserById(userId)
+  if (error && error.status !== 404) throw error
   if (error || !data.user) return 'User not found'
   if (!classifyGhost(data.user as AuthUser, 0)) return 'User is no longer a ghost account'
 
@@ -347,7 +348,7 @@ export async function deleteGhostAccount(
 ): Promise<DeleteGhostResult> {
   // Prisma compares ownerId as text, so an uppercase id would count no documents.
   const userId = rawUserId.toLowerCase()
-  const refusal = await assertDeletableGhost(client, userId)
+  const refusal = await ghostDeleteRefusal(client, userId)
   if (refusal) {
     invalidateGhostCaches()
     return { status: 'refused', reason: refusal }
@@ -406,7 +407,7 @@ export async function bulkDeleteGhostAccounts(
   const checks = await Promise.all(
     userIds.map(async (userId: string) => {
       try {
-        const refusal = await assertDeletableGhost(client, userId)
+        const refusal = await ghostDeleteRefusal(client, userId)
         if (refusal) return { userId, error: refusal }
         const read = await getGhostDeletionImpact(client, userId)
         if ('error' in read) return { userId, error: read.error }
 
@@ -49,7 +49,7 @@ import * as documentContent from './modules/document-content'
 import type { RevertOutcome, VersionFailureReason, VersionOps } from './modules/document-versions'
 import * as documentVersions from './modules/document-versions'
 import { MAX_VERSION_NUMBER } from './modules/document-versions/types'
-import { documentIdField } from './schemas/hypermultimedia.schema'
+import { documentIdField } from './schemas/document.schema'
 import type { HistoryPayload } from './types/document.types'
 import type { StoreDocumentContext } from './types/queue.types'
 
 
@@ -3,7 +3,14 @@ import { z } from 'zod'
 // Deep path on purpose: the module's `http/schema` is zod-only, so importing it
 // here never drags Tiptap or the transformer into this file's consumers.
 import { tiptapDocSchema } from '../modules/document-content/http/schema'
-import { documentIdField } from './hypermultimedia.schema'
+
+// Strict charset blocks path-separator / traversal sequences before the id
+// ever reaches the filesystem (defense-in-depth with the storage-root check).
+export const documentIdField = z
+  .string()
+  .min(1, 'Document ID is required')
+  .max(100)
+  .regex(/^[A-Za-z0-9_-]+$/, 'Invalid document ID')
 
 const plainTitle = (title: string): string => title.replace(/<[^>]*>/g, '')
 
 
@@ -1,12 +1,8 @@
 import { z } from 'zod'
 
-// Strict charset blocks path-separator / traversal sequences before the id
-// ever reaches the filesystem (defense-in-depth with the storage-root check).
-export const documentIdField = z
-  .string()
-  .min(1, 'Document ID is required')
-  .max(100)
-  .regex(/^[A-Za-z0-9_-]+$/, 'Invalid document ID')
+import { documentIdField } from './document.schema'
+
+export { documentIdField }
 
 export const documentIdParamSchema = z.object({
   documentId: documentIdField