chore: fix race conditions, hydration, build issues

Taskfile.yml

@@ -33,7 +33,7 @@ tasks:
   # [AFTER applying metadata & migrations] Apply the hasura seeds
   seed:
     cmds:
-      - hasura seeds apply --project apps/hasura --admin-secret ${HASURA_GRAPHQL_ADMIN_SECRET}
+      - hasura seeds apply --project apps/hasura --admin-secret ${HASURA_GRAPHQL_ADMIN_SECRET} --database-name masterbots
 
   # Turns on the hasura backend (docker desktop must be started first)
   up:

apps/pro-web/app/actions/admin.actions.ts

@@ -120,7 +120,6 @@ export async function insertAdminUserPreferences({
 	userId: string
 	preferencesSet: PgInsertValue<typeof preference>
 }) {
-	await verifyUserExists(userId)
 	return await db
 		.insert(preference)
 		.values({ ...preferencesSet })
@@ -141,8 +140,6 @@ export async function insertUserOrganizations({
 		}>
 	}>
 }) {
-	await verifyUserExists(userId)
-
 	if (!organizationsList || organizationsList.length === 0) {
 		return []
 	}

apps/pro-web/app/actions/chat-memory/ingest-assistant-answer.ts

@@ -70,22 +70,43 @@ export async function ingestAssistantAnswer(
 		const nextTurnIndex = (lastEntry?.turnIndex ?? 0) + 1
 
 		// 5) insert (idempotent by message_id)
-		await db
-			.insert(assistantAnswers)
-			.values({
-				content,
-				scopeId,
-				threadId,
-				docNodeId,
-				embedding, // Pass raw number[] array, Drizzle/pg handles vector formatting
-				messageId,
-				contentHash,
-				turnIndex: nextTurnIndex,
-				scopeType: (scopeType || 'chat_thread') as ScopeType, // Default to chat_thread if undefined
-			})
-			.onConflictDoNothing({
-				target: assistantAnswers.messageId,
-			})
+		const MAX_RETRIES = 5
+		const baseDelay = 1000
+
+		for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
+			try {
+				await db
+					.insert(assistantAnswers)
+					.values({
+						content,
+						scopeId,
+						threadId,
+						docNodeId,
+						embedding, // Pass raw number[] array, Drizzle/pg handles vector formatting
+						messageId,
+						contentHash,
+						turnIndex: nextTurnIndex,
+						scopeType: (scopeType || 'chat_thread') as ScopeType, // Default to chat_thread if undefined
+					})
+					.onConflictDoNothing({
+						target: assistantAnswers.messageId,
+					})
+				break // Success, exit loop
+			} catch (error) {
+				const pgError = error as { code?: string }
+				// Check for Foreign Key Violation (Postgres code 23503)
+				// This implies the thread_id doesn't exist yet (race condition)
+				if (pgError?.code === '23503' && attempt < MAX_RETRIES) {
+					const delay = baseDelay * 2 ** (attempt - 1)
+					console.warn(
+						`[ingestAssistantAnswer] FK violation on attempt ${attempt}. Retrying in ${delay}ms...`,
+					)
+					await new Promise((resolve) => setTimeout(resolve, delay))
+					continue
+				}
+				throw error // Re-throw if not FK error or retries exhausted
+			}
+		}
 
 		// Log success
 		// console.log(`[ingestAssistantAnswer] Ingested message ${messageId} (turn ${nextTurnIndex})`)

apps/pro-web/app/actions/subscriptions.actions.ts

@@ -188,23 +188,19 @@ export async function getPromptDetails(promptId: string) {
 			throw new Error(data.error || 'Failed to fetch prompt details')
 		}
 
-		inputs = (
-			data.inputs as {
-				label: string
-				type: string
-				required: boolean
-				default: string
-				options: string[]
-				pattern: string
-				min_length: number
-				max_length: number
-			}[]
-		).reduce(
-			(acc, input) => ({
-				...acc,
-				[input.label]: '',
-			}),
-			{},
+		inputs = Object.fromEntries(
+			(
+				data.inputs as {
+					label: string
+					type: string
+					required: boolean
+					default: string
+					options: string[]
+					pattern: string
+					min_length: number
+					max_length: number
+				}[]
+			).map((input) => [input.label, '']),
 		)
 	} catch (err) {
 		console.error('Error fetching prompt details:', error)

apps/pro-web/app/actions/thread.actions.ts

@@ -330,7 +330,23 @@ export async function uploadWorkspaceDocumentToBucket({
 	type?: WorkspaceDocumentType
 }) {
 	if (!content) throw new Error('Document content required')
-	const existingThread = await getThreadBySlug(threadSlug)
+
+	let existingThread = null
+	const MAX_RETRIES = 5
+	const baseDelay = 1000
+
+	for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
+		existingThread = await getThreadBySlug(threadSlug)
+		if (existingThread) break
+		if (attempt < MAX_RETRIES) {
+			const delay = baseDelay * 2 ** (attempt - 1)
+			console.warn(
+				`[uploadWorkspaceDocumentToBucket] Thread not found for slug ${threadSlug} on attempt ${attempt}. Retrying in ${delay}ms...`,
+			)
+			await new Promise((resolve) => setTimeout(resolve, delay))
+		}
+	}
+
 	if (!existingThread) throw new Error('Thread not found for slug')
 	const existingDocs: WorkspaceDocumentMetadata[] =
 		(existingThread.metadata as ThreadMetadata | null)?.documents || []

apps/pro-web/app/api/auth/signup/route.ts

@@ -1,12 +1,12 @@
 import crypto from 'node:crypto'
-import {
-	insertAdminUserPreferences,
-	insertUserOrganizations,
-} from '@/app/actions/admin.actions'
+import { insertUserOrganizations } from '@/app/actions/admin.actions'
 import { sendEmailVerification } from '@/lib/email'
 import { generateUsername } from '@/lib/username'
 import { delayFetch } from '@/lib/utils'
-import { isUsernameTaken } from '@/services/hasura/hasura.service'
+import {
+	insertPreferencesByUserId,
+	isUsernameTaken,
+} from '@/services/hasura/hasura.service'
 import type { OrganizationData } from '@/types/thread.types'
 import bcryptjs from 'bcryptjs'
 import { appConfig } from 'mb-env'
@@ -126,10 +126,13 @@ export async function POST(req: NextRequest) {
 				)
 			}
 
-			const insertPreferenceResults = await insertAdminUserPreferences({
-				userId: insertUserOne.userId,
+			const { data: preference, error } = await insertPreferencesByUserId({
+				// userId is not needed in the object for this specific function signature in hasura.service,
+				// check the definition of insertPreferencesByUserId manually?
+				// Wait, let me check the signature of insertPreferencesByUserId again.
+				// It takes { jwt, preferencesSet }. preferencesSet is PreferenceInsertInput.
+				// PreferenceInsertInput has userId.
 				preferencesSet: {
-					// * Default preferences
 					userId: insertUserOne.userId,
 					preferredComplexity: 'general',
 					preferredLength: 'detailed',
@@ -138,7 +141,7 @@ export async function POST(req: NextRequest) {
 				},
 			})
 
-			if (!insertPreferenceResults) {
+			if (error || !preference) {
 				// console.error('Failed to create your account ——> ', error)
 				throw new Error(
 					'Failed to create your account, an error occurred while creating your profile.',

apps/pro-web/app/b/page.tsx

@@ -3,8 +3,5 @@ import type { PageProps } from '@/types'
 
 export default async function BotPage(props: PageProps) {
 	// When no bot is selected, pass null/undefined to show welcome view
-	return (
-		// biome-ignore lint/suspicious/noExplicitAny: <explanation>
-		<BotProfileThreadSection threads={[]} count={0} chatbot={null} />
-	)
+	return <BotProfileThreadSection threads={[]} count={0} chatbot={null} />
 }

apps/pro-web/components/routes/browse/browse-chatbot-desktop-details.tsx

@@ -92,7 +92,7 @@ export function BrowseChatbotDesktopDetails({
 									className="text-base text-black dark:text-white min-h-24 onboarding-chatbot-card__content"
 									components={memoizedMarkdownComponents()}
 								>
-									{chatbot.description}
+									{chatbot.description || ''}
 								</MemoizedReactMarkdown>
 							</div>
 						</div>

apps/pro-web/components/routes/browse/browse-chatbot-mobile-details.tsx

@@ -80,7 +80,7 @@ export function BrowseChatbotMobileDetails({
 							className="pt-2.5 text-base text-black dark:text-white min-h-24 onboarding-chatbot-card__content [&ul]:flex"
 							components={memoizedMarkdownComponents()}
 						>
-							{chatbot.description}
+							{chatbot.description || ''}
 						</MemoizedReactMarkdown>
 					</CardContent>
 

apps/pro-web/components/routes/chat/chat-selected-chatbot-mobile.tsx

@@ -76,7 +76,7 @@ export function SelectedBotMobileView({
 						className="pt-6 text-base text-black dark:text-white min-h-24 onboarding-chatbot-card__content"
 						components={memoizedMarkdownComponents()}
 					>
-						{description}
+						{description || ''}
 					</MemoizedReactMarkdown>
 				</CardContent>
 

apps/pro-web/components/routes/chat/onboarding-chatbot-details.tsx

@@ -78,7 +78,7 @@ export function OnboardingChatbotDetails({
 					>
 						{isWelcomeView
 							? 'Here you can create new threads and share them to your network! Navigate with the sidebar and pick any bot of your interest.'
-							: description}
+							: description || ''}
 					</MemoizedReactMarkdown>
 
 					{isWelcomeView && (

apps/pro-web/components/routes/pro/chat-message-pro.tsx

@@ -107,7 +107,8 @@ export function ChatMessagePro({
 			<div className="flex-1 pr-1 space-y-2 overflow-hidden">
 				<MemoizedReactMarkdown
 					className="min-w-full prose break-words dark:prose-invert prose-p:leading-relaxed prose-pre:p-0"
-					remarkPlugins={[remarkGfm, rehypeMathJax, remarkRehype]}
+					remarkPlugins={[remarkGfm]}
+					rehypePlugins={[rehypeMathJax]}
 					components={memoizedMarkdownComponents(
 						!(isBrowseView || isProfileView)
 							? {
@@ -117,7 +118,7 @@ export function ChatMessagePro({
 							: undefined,
 					)}
 				>
-					{cleanMessage.content}
+					{cleanMessage.content || ''}
 				</MemoizedReactMarkdown>
 
 				{actionRequired && (