P2 client cutover

app/api/version/route.ts

@@ -101,21 +101,42 @@ export async function POST(request: NextRequest) {
 			return NextResponse.json({ error: 'Document snapshot exceeds maximum allowed size' }, { status: 413 })
 		}
 
-		// 1. Verify user role: only owners and editors can create versions
-		const { data: doc } = await supabaseClient
-			.from('documents')
+		// 1. Verify user role: only owners and editors can create versions.
+		// Pages are the primary entity; legacy documents fall back for
+		// unmapped ids (rollback path).
+		const { data: page } = await supabaseClient
+			.from('pages')
 			.select('owner_id')
 			.eq('id', documentId)
-			.single()
+			.maybeSingle()
 
-		const isOwner = doc && doc.owner_id === user.id
+		let isOwner = !!(page && page.owner_id === user.id)
 		let isEditor = false
 
-		if (!isOwner) {
+		if (!page) {
+			const { data: doc } = await supabaseClient
+				.from('documents')
+				.select('owner_id')
+				.eq('id', documentId)
+				.maybeSingle()
+
+			isOwner = !!(doc && doc.owner_id === user.id)
+
+			if (!isOwner && doc) {
+				const { data: member } = await supabaseClient
+					.from('document_members')
+					.select('role')
+					.eq('document_id', documentId)
+					.eq('user_id', user.id)
+					.single()
+
+				isEditor = !!(member && member.role === 'editor')
+			}
+		} else if (!isOwner) {
 			const { data: member } = await supabaseClient
-				.from('document_members')
+				.from('page_members')
 				.select('role')
-				.eq('document_id', documentId)
+				.eq('page_id', documentId)
 				.eq('user_id', user.id)
 				.single()
 
@@ -126,14 +147,22 @@ export async function POST(request: NextRequest) {
 			return NextResponse.json({ error: 'Forbidden: Insufficient permissions' }, { status: 403 })
 		}
 
-		// 2. Create the document_versions record
+		// 2. Create the document_versions record (page_id for pages)
 		const { data: version, error: dbError } = await supabaseClient
 			.from('document_versions')
-			.insert({
-				document_id: documentId,
-				version_name: versionName,
-				created_by: user.id,
-			})
+			.insert(
+				page
+					? {
+						page_id: documentId,
+						version_name: versionName,
+						created_by: user.id,
+					}
+					: {
+						document_id: documentId,
+						version_name: versionName,
+						created_by: user.id,
+					}
+			)
 			.select()
 			.single()
 

app/doc/[id]/page.tsx

@@ -1,100 +1,10 @@
-'use client'
+import { redirect } from 'next/navigation'
 
-import { use, useState, useEffect } from 'react'
-import { useRouter } from 'next/navigation'
-import { supabase } from '@/lib/supabase'
-import { fetchDocumentDetails } from '@/services/db'
-import GlobalLoader from '@/components/global-loader'
-import EditorWorkspace from '@/components/editor-workspace'
-import { toast } from 'sonner'
-
-export default function DocumentPage({
+export default async function DocumentPage({
 	params: paramsPromise,
 }: {
 	params: Promise<{ id: string }>
 }) {
-	const params = use(paramsPromise)
-	const router = useRouter()
-	const [user, setUser] = useState<any | null>(null)
-	const [token, setToken] = useState<string | null>(null)
-	const [documentTitle, setDocumentTitle] = useState<string | null>(null)
-	const [loading, setLoading] = useState(true)
-
-	useEffect(() => {
-		const loadDocumentAndSession = async () => {
-			try {
-				// 1. Get current session and token
-				const { data: { session } } = await supabase.auth.getSession()
-				const { error: userError } = await supabase.auth.getUser()
-
-				// If there is an auth error that is NOT just a missing session, it means the token expired or is invalid
-				if (userError && userError.name !== 'AuthSessionMissingError') {
-					console.error('Session error (token expired):', userError)
-					toast.error('Session expired. Please log in again.')
-					router.push('/login')
-					return
-				}
-
-				if (session) {
-					setUser(session.user)
-					setToken(session.access_token)
-				} else {
-					// Check if document is public
-					try {
-						const doc = await fetchDocumentDetails(params.id)
-						if (doc && doc.is_public) {
-							// Mock anonymous user
-							const randomId = Math.random().toString(36).substring(7)
-							setUser({
-								id: `anon-${randomId}`,
-								email: 'anonymous@public',
-								full_name: 'Anonymous Viewer'
-							})
-							setToken('anonymous')
-						} else {
-							router.push('/login')
-							return
-						}
-					} catch {
-						router.push('/login')
-						return
-					}
-				}
-
-				// 2. Fetch document details using wrapper service
-				const doc = await fetchDocumentDetails(params.id)
-				setDocumentTitle(doc.title)
-			} catch (err: unknown) {
-
-				console.error('Error loading document page:', err)
-				toast.error('Document not found or access denied')
-				router.push('/')
-			} finally {
-				setLoading(false)
-			}
-		}
-
-		loadDocumentAndSession()
-	}, [params.id, router])
-
-	if (loading) {
-		return <GlobalLoader text="Loading document..." />
-	}
-
-	if (!user || !token || !documentTitle) {
-		return null
-	}
-
-	return (
-		<EditorWorkspace
-			documentId={params.id}
-			initialTitle={documentTitle}
-			token={token}
-			currentUser={{
-				id: user.id,
-				email: user.email,
-				full_name: user.user_metadata?.full_name || user.full_name
-			}}
-		/>
-	)
+	const params = await paramsPromise
+	redirect(`/page/${params.id}`)
 }

app/invite/[token]/page.tsx

@@ -3,8 +3,8 @@
 import { use, useState, useEffect } from 'react'
 import { useRouter } from 'next/navigation'
 import { supabase } from '@/lib/supabase'
-import { DocumentInvitation } from '@/types'
-import { fetchInvitationDetails, acceptInvitation, declineInvitation } from '@/services/db'
+import { PageInvitation } from '@/types'
+import { fetchPageInvitationDetails, acceptPageInvitation, declinePageInvitation } from '@/services/graph'
 import GlobalLoader from '@/components/global-loader'
 import { toast } from 'sonner'
 
@@ -16,7 +16,7 @@ export default function InvitePage ({
 	const params = use(paramsPromise)
 	const router = useRouter()
 	const [user, setUser] = useState<any | null>(null)
-	const [invite, setInvite] = useState<DocumentInvitation | null>(null)
+	const [invite, setInvite] = useState<PageInvitation | null>(null)
 	const [loading, setLoading] = useState(true)
 	const [processing, setProcessing] = useState(false)
 
@@ -36,10 +36,10 @@ export default function InvitePage ({
 				setUser(session.user)
 
 				// 2. Fetch invitation details
-				const invitation = await fetchInvitationDetails(params.token)
+				const invitation = await fetchPageInvitationDetails(params.token)
 
 				if (invitation.status === 'accepted') {
-					router.push(`/doc/${invitation.document_id}`)
+					router.push(`/page/${invitation.page_id}`)
 					return
 				}
 
@@ -62,8 +62,8 @@ export default function InvitePage ({
 		setProcessing(true)
 
 		try {
-			await acceptInvitation(invite, user.id)
-			router.push(`/doc/${invite.document_id}`)
+			await acceptPageInvitation(invite, user.id)
+			router.push(`/page/${invite.page_id}`)
 		} catch (err: unknown) {
 			const message = err instanceof Error ? err.message : String(err)
 			toast.error(`Failed to accept: ${message}`)
@@ -78,7 +78,7 @@ export default function InvitePage ({
 		setProcessing(true)
 
 		try {
-			await declineInvitation(invite.id)
+			await declinePageInvitation(invite.id)
 			router.push('/')
 		} catch (err: unknown) {
 			const message = err instanceof Error ? err.message : String(err)
@@ -99,18 +99,18 @@ export default function InvitePage ({
 		<div className='flex min-h-screen items-center justify-center bg-[radial-gradient(ellipse_at_top,_var(--tw-gradient-stops))] from-slate-900 via-slate-950 to-black p-4'>
 			<div className='w-full max-w-md rounded-2xl border border-white/10 bg-slate-900/60 p-8 backdrop-blur-xl shadow-2xl text-center'>
 				<h2 className='text-2xl font-bold tracking-tight text-white mb-2'>
-					Document Invitation
+					Page Invitation
 				</h2>
 				<p className='text-sm text-slate-400 mb-6'>
-					You have been invited to join a collaborative document workspace
+					You have been invited to join a collaborative page workspace
 				</p>
 
 				<div className='rounded-xl bg-slate-950/60 border border-white/5 p-5 mb-6 text-left'>
 					<p className='text-xs text-slate-500 uppercase tracking-wider font-semibold mb-1'>
-						Document Title
+						Page Title
 					</p>
 					<p className='text-lg font-bold text-white mb-4'>
-						{invite.documents?.title || 'Untitled'}
+						{invite.pages?.title || 'Untitled'}
 					</p>
 
 					<p className='text-xs text-slate-500 uppercase tracking-wider font-semibold mb-1'>

app/page/[id]/page.tsx

@@ -0,0 +1,99 @@
+'use client'
+
+import { use, useState, useEffect } from 'react'
+import { useRouter } from 'next/navigation'
+import { supabase } from '@/lib/supabase'
+import { fetchPageDetails } from '@/services/graph'
+import GlobalLoader from '@/components/global-loader'
+import EditorWorkspace from '@/components/editor-workspace'
+import { toast } from 'sonner'
+
+export default function PageRoute({
+	params: paramsPromise,
+}: {
+	params: Promise<{ id: string }>
+}) {
+	const params = use(paramsPromise)
+	const router = useRouter()
+	const [user, setUser] = useState<any | null>(null)
+	const [token, setToken] = useState<string | null>(null)
+	const [pageTitle, setPageTitle] = useState<string | null>(null)
+	const [loading, setLoading] = useState(true)
+
+	useEffect(() => {
+		const loadPageAndSession = async () => {
+			try {
+				// 1. Get current session and token
+				const { data: { session } } = await supabase.auth.getSession()
+				const { error: userError } = await supabase.auth.getUser()
+
+				// If there is an auth error that is NOT just a missing session, it means the token expired or is invalid
+				if (userError && userError.name !== 'AuthSessionMissingError') {
+					console.error('Session error (token expired):', userError)
+					toast.error('Session expired. Please log in again.')
+					router.push('/login')
+					return
+				}
+
+				if (session) {
+					setUser(session.user)
+					setToken(session.access_token)
+				} else {
+					// Check if page is public
+					try {
+						const page = await fetchPageDetails(params.id)
+						if (page && page.is_public) {
+							// Mock anonymous user
+							const randomId = Math.random().toString(36).substring(7)
+							setUser({
+								id: `anon-${randomId}`,
+								email: 'anonymous@public',
+								full_name: 'Anonymous Viewer'
+							})
+							setToken('anonymous')
+						} else {
+							router.push('/login')
+							return
+						}
+					} catch {
+						router.push('/login')
+						return
+					}
+				}
+
+				// 2. Fetch page details
+				const page = await fetchPageDetails(params.id)
+				setPageTitle(page.title)
+			} catch (err: unknown) {
+				console.error('Error loading page:', err)
+				toast.error('Page not found or access denied')
+				router.push('/')
+			} finally {
+				setLoading(false)
+			}
+		}
+
+		loadPageAndSession()
+	}, [params.id, router])
+
+	if (loading) {
+		return <GlobalLoader text="Loading page..." />
+	}
+
+	if (!user || !token || !pageTitle) {
+		return null
+	}
+
+	return (
+		<EditorWorkspace
+			pageId={params.id}
+			initialTitle={pageTitle}
+			token={token}
+			currentUser={{
+				id: user.id,
+				email: user.email,
+				full_name: user.user_metadata?.full_name || user.full_name
+			}}
+		/>
+	)
+}

app/settings/page.tsx

@@ -5,12 +5,12 @@ import { useRouter } from 'next/navigation'
 import { supabase } from '@/lib/supabase'
 import GlobalLoader from '@/components/global-loader'
 import SettingsClient from '@/components/settings-client'
-import { fetchOwnedDocumentsWithMembers } from '@/services/db'
+import { fetchOwnedPagesWithMembers } from '@/services/graph'
 
 export default function SettingsPage() {
 	const router = useRouter()
 	const [user, setUser] = useState<any | null>(null)
-	const [documents, setDocuments] = useState<any[]>([])
+	const [pages, setPages] = useState<any[]>([])
 	const [loading, setLoading] = useState(true)
 
 	useEffect(() => {
@@ -26,8 +26,8 @@ export default function SettingsPage() {
 					email: sessionUser.email,
 					full_name: sessionUser.user_metadata?.full_name
 				})
-				const docs = await fetchOwnedDocumentsWithMembers(sessionUser.id)
-				setDocuments(docs)
+				const pages = await fetchOwnedPagesWithMembers(sessionUser.id)
+				setPages(pages)
 			} catch (err) {
 				console.error(err)
 				router.push('/login')
@@ -41,5 +41,5 @@ export default function SettingsPage() {
 	if (loading) return <GlobalLoader text="Loading Settings..." />
 	if (!user) return null
 
-	return <SettingsClient user={user} documents={documents} setDocuments={setDocuments} />
+	return <SettingsClient user={user} pages={pages} setPages={setPages} />
 }