Con las mejoras visuales

app/page.tsx

@@ -1,6 +1,13 @@
 import { createClient } from '@/lib/supabase'
-import type { BrandConfig, Question, Survey } from '@/lib/types'
-import { SurveyForm } from '@/components/survey-form'
+import type { BrandConfig, Survey } from '@/lib/types'
+import type { FormSchema, Question as EngineQuestion } from '@/lib/form-engine.types'
+import { buildFormSchema } from '@/lib/form-engine'
+import { WizardForm } from '@/components/wizard-form'
+
+// Preguntas de consentimiento (S1, 1.1, 1.2): las resuelve ConsentScreen, no el
+// motor de flujo — su texto legal (ADR-003) no vive en el hint de estas filas
+// todavía. Se excluyen del FormSchema para que el wizard arranque en S2.
+const CONSENT_CODES = new Set(['S1', '1.1', '1.2'])
 
 // Force dynamic rendering — page fetches from Supabase at request time.
 export const dynamic = 'force-dynamic'
@@ -48,11 +55,12 @@ export default async function Page({ searchParams }: PageProps) {
     )
   }
 
-  // 2. Fetch questions ordered by position
+  // 2. Fetch questions ordered by position — incluye hint/instance_generator/instance_of (4D)
   const { data: questionRows, error: questionsError } = await supabase
     .from('questions')
     .select(
-      'id, survey_id, code, type, prompt, position, is_sensitive, required, max_select, options, conditional_rules'
+      'id, survey_id, code, type, prompt, position, is_sensitive, required, hint, ' +
+        'max_select, options, conditional_rules, instance_generator, instance_of'
     )
     .eq('survey_id', surveyRow.id)
     .order('position', { ascending: true })
@@ -66,9 +74,12 @@ export default async function Page({ searchParams }: PageProps) {
     )
   }
 
-  const questions = questionRows as Question[]
+  // Cast en dos pasos: el cliente Supabase no tiene un Database genérico configurado
+  // (lib/supabase.ts), así que el tipo de fila que infiere para .select() no solapa
+  // directamente con EngineQuestion. Las columnas pedidas arriba sí coinciden 1:1.
+  const engineQuestions = questionRows as unknown as EngineQuestion[]
 
-  console.log(`[2B] Survey loaded: id=${surveyRow.id} | questions=${questions.length}`)
+  console.log(`[4D] Survey loaded: id=${surveyRow.id} | questions=${engineQuestions.length}`)
 
   const survey: Survey = {
     id: surveyRow.id,
@@ -79,8 +90,13 @@ export default async function Page({ searchParams }: PageProps) {
     k_threshold: surveyRow.k_threshold,
     consent_version_id: surveyRow.consent_version_id,
     brand_config: (surveyRow.brand_config as BrandConfig) ?? null,
-    questions,
+    questions: [],
   }
 
-  return <SurveyForm survey={survey} questions={questions} />
+  // El consentimiento (S1, 1.1, 1.2) lo resuelve ConsentScreen, no el motor — ver nota arriba.
+  const schema: FormSchema = buildFormSchema(
+    engineQuestions.filter((q) => !CONSENT_CODES.has(q.code))
+  )
+
+  return <WizardForm survey={survey} schema={schema} />
 }