refactor(content): rebuild publishing around revision trees

Author: Innei

apps/admin/README.md

@@ -27,7 +27,7 @@ pnpm dev
 pnpm build            # production build → dist/
 pnpm test             # vitest (happy-dom)
 pnpm typecheck        # tsc --noEmit
-pnpm lint             # oxlint
+pnpm lint             # eslint
 ```
 
 For the full stack, run the core server alongside (`pnpm dev` at the repo root), then bridge the production-served admin to the local dev server via `http://localhost:2333/proxy/qaqdmin/dev-proxy`.

apps/admin/package.json

@@ -6,14 +6,13 @@
     "dev": "NODE_ENV=development vite --mode development --open --host",
     "build": "NODE_ENV=production vite build --mode production",
     "preview": "vite preview --port 2323",
-    "lint": "oxlint src",
-    "lint:fix": "oxlint src --fix",
+    "lint": "eslint src",
+    "lint:fix": "eslint src --fix",
     "test": "vitest --run",
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
     "@6over3/zeroperl-ts": "^1.0.10",
-    "@antv/g2": "^5.4.8",
     "@base-ui/react": "1.7.0",
     "@better-auth/passkey": "1.6.27",
     "@codemirror/commands": "6.11.0",
@@ -68,9 +67,6 @@
     "@mx-space/ws-client": "workspace:*",
     "@pierre/diffs": "1.3.6",
     "@rehookify/datepicker": "6.6.8",
-    "@simplewebauthn/browser": "13.3.0",
-    "@tanstack/query-async-storage-persister": "5.102.8",
-    "@tanstack/query-persist-client-core": "5.102.8",
     "@tanstack/react-query": "5.102.8",
     "@types/canvas-confetti": "1.9.0",
     "@uswriting/exiftool": "^1.0.9",
@@ -88,24 +84,19 @@
     "fuse.js": "7.5.0",
     "immer": "11.1.18",
     "jotai": "2.20.3",
-    "js-cookie": "3.0.8",
     "js-yaml": "5.4.1",
     "json5": "2.2.3",
     "katex": "^0.18.4",
     "klinecharts": "10.0.3",
     "lexical": "^0.49.0",
     "lit": "3.3.3",
-    "lodash.transform": "4.6.0",
     "lucide-react": "1.35.0",
     "maplibre-gl": "6.6.0",
     "marked": "18.0.11",
     "monaco-editor": "0.56.0",
     "motion": "13.1.1",
-    "ofetch": "1.5.1",
     "os-browserify": "0.3.0",
     "path-browserify": "1.0.1",
-    "qier-progress": "1.0.4",
-    "qs": "6.15.3",
     "react": "19.2.8",
     "react-dom": "19.2.8",
     "react-resizable-panels": "4.12.3",
@@ -117,7 +108,6 @@
     "tailwind-merge": "^3.6.0",
     "thumbhash": "0.1.1",
     "tinykeys": "4.0.0",
-    "validator": "13.15.35",
     "xss": "1.0.15",
     "zod": "4.4.3",
     "zustand": "5.0.15"
@@ -131,21 +121,16 @@
     "@types/babel__core": "7.20.5",
     "@types/event-source-polyfill": "1.0.5",
     "@types/js-yaml": "4.0.9",
-    "@types/qs": "6.15.1",
     "@types/react": "19.2.18",
     "@types/react-dom": "19.2.5",
-    "@types/validator": "13.15.10",
     "@vitejs/plugin-react": "6.1.1",
     "babel-plugin-react-compiler": "1.0.0",
     "code-inspector-plugin": "2.0.8",
-    "cors": "2.8.6",
     "happy-dom": "^20.11.12",
-    "rollup": "^4.63.1",
     "tailwindcss": "^4.3.3",
     "typescript": "6.0.3",
     "vite": "8.2.2",
     "vite-plugin-checker": "0.14.5",
-    "vite-plugin-mkcert": "2.1.0",
     "vitest": "^4.1.11"
   }
 }

apps/admin/src/api/ai-overview.ts

@@ -39,6 +39,7 @@ interface AssetBase {
   generationMetrics?: GenerationMetrics | null
   id: string
   lang: string
+  stale?: boolean
 }
 
 export interface SummaryAsset extends AssetBase {

apps/admin/src/api/content-migrations.ts

@@ -1,12 +1,12 @@
 import { postJson } from './http'
 
-export type MigrationMemberKind = 'draft' | 'source' | 'translation'
+export type MigrationMemberKind = 'branch' | 'source' | 'translation'
 
 export interface MigrationMemberPrecondition {
   hash: string
   id: string
   kind: MigrationMemberKind
-  version?: number
+  headRevisionId?: string
 }
 
 export interface MarkdownMigrationIssue {
@@ -77,7 +77,7 @@ export interface MarkdownToLexicalMigrationDescriptor {
 }
 
 export function dryRunMarkdownToLexical(data: {
-  draftId?: string
+  branchId?: string
   profile: 'yohaku-v1'
   refId: string
   refType: 'note' | 'page' | 'post'

apps/admin/src/api/drafts.ts

@@ -1,9 +1,11 @@
 import type { Image, PaginateResult } from '~/models/base'
 import type {
-  DraftHistoryListItem,
+  ContentRevision,
   DraftModel,
   DraftRefType,
+  RevisionComparison,
   TypeSpecificData,
+  VersionContext,
 } from '~/models/draft'
 
 import { deleteJson, getJson, postJson, putJson } from './http'
@@ -14,32 +16,40 @@ export interface GetDraftsParams {
   hasRef?: boolean
   page?: number
   refType?: DraftRefType
+  search?: string
   size?: number
   sort_by?: string
   sort_order?: DraftSortOrder
 }
 
-export interface CreateDraftData {
+export interface DraftWriteData {
   content?: string
-  contentFormat?: 'lexical' | 'markdown'
-  images?: Image[]
-  meta?: Record<string, unknown>
+  contentFormat: 'lexical' | 'markdown'
+  images?: Image[] | null
+  meta?: Record<string, unknown> | null
+  text: string
+  title: string
+  typeSpecificData?: TypeSpecificData | null
+}
+
+export interface CreateDraftData {
+  baseRevisionId?: string | null
+  data: DraftWriteData
   refId?: string
   refType: DraftRefType
-  text?: string
-  title?: string
-  typeSpecificData?: TypeSpecificData
 }
 
-export type UpdateDraftData = Partial<CreateDraftData> & {
-  expectedVersion: number
+export interface UpdateDraftData {
+  data: DraftWriteData
+  expectedHeadRevisionId: string
 }
 
 export function getDrafts(params: GetDraftsParams = {}) {
   return getJson<PaginateResult<DraftModel>>('/drafts', {
     hasRef: params.hasRef === undefined ? undefined : String(params.hasRef),
     page: params.page,
     refType: params.refType,
+    search: params.search,
     size: params.size,
     sort_by: params.sort_by,
     sort_order: params.sort_order,
@@ -50,20 +60,24 @@ export function getDraftById(id: string) {
   return getJson<DraftModel>(`/drafts/${id}`)
 }
 
-export function getDraftByRef(refType: DraftRefType, refId: string) {
-  return getJson<DraftModel | null>(`/drafts/by-ref/${refType}/${refId}`)
+export function getDraftContext(refType: DraftRefType, refId: string) {
+  return getJson<VersionContext>(`/drafts/context/${refType}/${refId}`)
 }
 
 export function getNewDrafts(refType: DraftRefType) {
-  return getJson<DraftModel[]>(`/drafts/by-ref/${refType}/new`)
+  return getJson<DraftModel[]>(`/drafts/new/${refType}`)
 }
 
-export function getDraftHistory(id: string) {
-  return getJson<DraftHistoryListItem[]>(`/drafts/${id}/history`)
+export function compareRevisions(leftId: string, rightId: string) {
+  return getJson<RevisionComparison>(`/drafts/compare/${leftId}/${rightId}`)
 }
 
-export function getDraftHistoryVersion(id: string, version: number) {
-  return getJson<DraftModel>(`/drafts/${id}/history/${version}`)
+export function getRevision(id: string) {
+  return getJson<ContentRevision>(`/drafts/revisions/${id}`)
+}
+
+export function getDraftRevisions(id: string) {
+  return getJson<ContentRevision[]>(`/drafts/${id}/revisions`)
 }
 
 export function createDraft(data: CreateDraftData) {
@@ -77,10 +91,3 @@ export function updateDraft(id: string, data: UpdateDraftData) {
 export function deleteDraft(id: string) {
   return deleteJson<{ success: boolean }>(`/drafts/${id}`)
 }
-
-export function restoreDraftVersion(id: string, version: number) {
-  return postJson<DraftModel, Record<string, never>>(
-    `/drafts/${id}/restore/${version}`,
-    {},
-  )
-}

apps/admin/src/api/notes.ts

@@ -1,8 +1,7 @@
-import type { Image, PaginateResult } from '~/models/base'
+import type { PaginateResult } from '~/models/base'
 import type { NoteModel } from '~/models/note'
 
-import type { MarkdownToLexicalMigrationDescriptor } from './content-migrations'
-import { deleteJson, getJson, patchJson, postJson, putJson } from './http'
+import { deleteJson, getJson, patchJson } from './http'
 
 export type NoteSortKey =
   'createdAt' | 'modifiedAt' | 'mood' | 'title' | 'weather'
@@ -22,35 +21,11 @@ export interface SearchNotesParams {
   size: number
 }
 
-export interface CreateNoteData {
-  bookmark?: boolean
-  content?: string
-  contentFormat?: 'lexical' | 'markdown'
-  coordinates?: null | {
-    latitude: number
-    longitude: number
-  }
-  draftId?: string
-  images?: Image[]
-  isPublished?: boolean
-  location?: null | string
-  migration?: MarkdownToLexicalMigrationDescriptor
-  meta?: Record<string, unknown>
-  mood?: string
-  password?: null | string
-  publicAt?: Date | null | string
-  skipAiAutoGeneration?: boolean
-  slug?: string
-  text: string
-  title: string
-  topicId?: null | string
-  weather?: string
-}
-
 export interface PatchNoteData {
-  [key: string]: unknown
-  slug?: null | string
+  bookmark?: boolean
+  mood?: null | string
   topicId?: null | string
+  weather?: null | string
 }
 
 export function getNotes(params: GetNotesParams = {}) {
@@ -77,30 +52,15 @@ export function getNoteById(id: string, params?: { single?: boolean }) {
   })
 }
 
-export function createNote(data: CreateNoteData) {
-  return postJson<NoteModel, CreateNoteData>('/notes', data)
-}
-
-export function updateNote(id: string, data: Partial<CreateNoteData>) {
-  return putJson<NoteModel, Partial<CreateNoteData>>(`/notes/${id}`, data)
-}
-
 export function patchNote(id: string, data: PatchNoteData) {
   return patchJson<NoteModel, PatchNoteData>(`/notes/${id}`, data)
 }
 
-export function patchNotePublish(
-  id: string,
-  isPublished: boolean,
-  preparedAiResources?: string[],
-) {
-  return patchJson<
-    NoteModel,
-    { isPublished: boolean; preparedAiResources?: string[] }
-  >(`/notes/${id}/publish`, {
-    isPublished,
-    preparedAiResources,
-  })
+export function patchNotePublish(id: string, isPublished: boolean) {
+  return patchJson<NoteModel, { isPublished: boolean }>(
+    `/notes/${id}/publish`,
+    { isPublished },
+  )
 }
 
 export function deleteNote(id: string) {

apps/admin/src/api/pages.ts

@@ -1,28 +1,13 @@
-import type { Image, PaginateResult } from '~/models/base'
+import type { PaginateResult } from '~/models/base'
 import type { PageModel } from '~/models/page'
 
-import type { MarkdownToLexicalMigrationDescriptor } from './content-migrations'
-import { deleteJson, getJson, patchJson, postJson, putJson } from './http'
+import { deleteJson, getJson, patchJson } from './http'
 
 export interface GetPagesParams {
   page?: number
   size?: number
 }
 
-export interface CreatePageData {
-  content?: string
-  contentFormat?: 'lexical' | 'markdown'
-  draftId?: string
-  images?: Image[]
-  meta?: Record<string, unknown>
-  migration?: MarkdownToLexicalMigrationDescriptor
-  order?: number
-  slug: string
-  subtitle?: string
-  text: string
-  title: string
-}
-
 export function getPages(params: GetPagesParams = {}) {
   return getJson<PaginateResult<PageModel>>('/pages', {
     page: params.page,
@@ -34,14 +19,6 @@ export function getPageById(id: string) {
   return getJson<PageModel>(`/pages/${id}`)
 }
 
-export function createPage(data: CreatePageData) {
-  return postJson<PageModel, CreatePageData>('/pages', data)
-}
-
-export function updatePage(id: string, data: Partial<CreatePageData>) {
-  return putJson<PageModel, Partial<CreatePageData>>(`/pages/${id}`, data)
-}
-
 export function deletePage(id: string) {
   return deleteJson<void>(`/pages/${id}`)
 }