feat(iace): integrate ISO 12100 machine risk model with 4-factor assessment

Add dual-mode risk engine: legacy S×E×P (avoidance=0) and ISO mode S×F×P×A
(avoidance>=1) with new thresholds (low/medium/high/very_high/not_acceptable).

- 150+ hazard library entries across 28 categories incl. physical hazards
  (mechanical, electrical, thermal, pneumatic/hydraulic, noise/vibration,
  ergonomic, material/environmental)
- 160-entry protective measures library with 3-step hierarchy validation
  (design → protective → information)
- 25 lifecycle phases, 20 affected person roles, 50 evidence types
- 10 verification methods (expanded from 7)
- New API endpoints: lifecycle-phases, roles, evidence-types,
  protective-measures-library, validate-mitigation-hierarchy
- DB migrations 018+019 for extended schema
- Frontend: 4-slider risk assessment, hierarchy warnings, measures library modal
- MkDocs wiki updated with ISO mode docs and legal notice (no norm text)

All content uses original wording — norms referenced as methodology only.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

admin-compliance/app/sdk/iace/[projectId]/hazards/page.tsx

@@ -10,12 +10,21 @@ interface Hazard {
   component_id: string | null
   component_name: string | null
   category: string
+  sub_category: string
   status: string
   severity: number
   exposure: number
   probability: number
+  avoidance: number
   r_inherent: number
   risk_level: string
+  machine_module: string
+  lifecycle_phase: string
+  trigger_event: string
+  affected_person: string
+  possible_harm: string
+  hazardous_zone: string
+  review_status: string
   created_at: string
 }
 
@@ -24,31 +33,71 @@ interface LibraryHazard {
   name: string
   description: string
   category: string
+  sub_category: string
   default_severity: number
   default_exposure: number
   default_probability: number
+  default_avoidance: number
+  typical_causes: string[]
+  typical_harm: string
+  relevant_lifecycle_phases: string[]
+  recommended_measures_design: string[]
+  recommended_measures_technical: string[]
+  recommended_measures_information: string[]
 }
 
+interface LifecyclePhase {
+  id: string
+  label_de: string
+  label_en: string
+  sort_order: number
+}
+
+interface RoleInfo {
+  id: string
+  label_de: string
+  label_en: string
+  sort_order: number
+}
+
+// ISO 12100 Hazard Categories (A-J)
 const HAZARD_CATEGORIES = [
-  'mechanical', 'electrical', 'thermal', 'noise', 'vibration',
-  'radiation', 'material', 'ergonomic', 'software', 'ai_specific',
-  'cybersecurity', 'functional_safety', 'environmental',
+  'mechanical', 'electrical', 'thermal',
+  'pneumatic_hydraulic', 'noise_vibration', 'ergonomic',
+  'material_environmental', 'software_control', 'cyber_network',
+  'ai_specific',
 ]
 
 const CATEGORY_LABELS: Record<string, string> = {
-  mechanical: 'Mechanisch',
-  electrical: 'Elektrisch',
-  thermal: 'Thermisch',
-  noise: 'Laerm',
-  vibration: 'Vibration',
-  radiation: 'Strahlung',
-  material: 'Stoffe/Materialien',
-  ergonomic: 'Ergonomie',
-  software: 'Software',
-  ai_specific: 'KI-spezifisch',
-  cybersecurity: 'Cybersecurity',
-  functional_safety: 'Funktionale Sicherheit',
-  environmental: 'Umgebung',
+  // Primary categories (new naming)
+  mechanical: 'A. Mechanisch',
+  electrical: 'B. Elektrisch',
+  thermal: 'C. Thermisch',
+  pneumatic_hydraulic: 'D. Pneumatik/Hydraulik',
+  noise_vibration: 'E. Laerm/Vibration',
+  ergonomic: 'F. Ergonomie',
+  material_environmental: 'G. Stoffe/Umwelt',
+  software_control: 'H. Software/Steuerung',
+  cyber_network: 'I. Cyber/Netzwerk',
+  ai_specific: 'J. KI-spezifisch',
+  // Legacy names (backward compat for existing data)
+  mechanical_hazard: 'A. Mechanisch',
+  electrical_hazard: 'B. Elektrisch',
+  thermal_hazard: 'C. Thermisch',
+  software_fault: 'H. Software/Steuerung',
+  safety_function_failure: 'H. Sicherheitsfunktionen',
+  false_classification: 'J. KI-spezifisch',
+  unauthorized_access: 'I. Cyber/Netzwerk',
+  configuration_error: 'H. Konfiguration',
+  hmi_error: 'H. HMI-Fehler',
+  integration_error: 'H. Integration',
+  communication_failure: 'I. Kommunikation',
+  sensor_spoofing: 'I. Sensormanipulation',
+  model_drift: 'J. Modelldrift',
+  data_poisoning: 'J. Daten-Poisoning',
+  emc_hazard: 'B. EMV',
+  maintenance_hazard: 'F. Wartung',
+  update_failure: 'H. Update-Fehler',
 }
 
 const STATUS_LABELS: Record<string, string> = {
@@ -59,8 +108,18 @@ const STATUS_LABELS: Record<string, string> = {
   closed: 'Geschlossen',
 }
 
+const REVIEW_STATUS_LABELS: Record<string, string> = {
+  draft: 'Entwurf',
+  in_review: 'In Pruefung',
+  reviewed: 'Geprueft',
+  approved: 'Freigegeben',
+  rejected: 'Abgelehnt',
+}
+
 function getRiskColor(level: string): string {
   switch (level) {
+    case 'not_acceptable': return 'bg-red-200 text-red-900 border-red-300'
+    case 'very_high': return 'bg-red-100 text-red-700 border-red-200'
     case 'critical': return 'bg-red-100 text-red-700 border-red-200'
     case 'high': return 'bg-orange-100 text-orange-700 border-orange-200'
     case 'medium': return 'bg-yellow-100 text-yellow-700 border-yellow-200'
@@ -69,7 +128,17 @@ function getRiskColor(level: string): string {
   }
 }
 
-function getRiskLevel(r: number): string {
+// ISO 12100 mode risk levels (S×F×P×A, max 625)
+function getRiskLevelISO(r: number): string {
+  if (r > 300) return 'not_acceptable'
+  if (r >= 151) return 'very_high'
+  if (r >= 61) return 'high'
+  if (r >= 21) return 'medium'
+  return 'low'
+}
+
+// Legacy mode (S×E×P, max 125)
+function getRiskLevelLegacy(r: number): string {
   if (r >= 100) return 'critical'
   if (r >= 50) return 'high'
   if (r >= 20) return 'medium'
@@ -78,6 +147,8 @@ function getRiskLevel(r: number): string {
 
 function getRiskLevelLabel(level: string): string {
   switch (level) {
+    case 'not_acceptable': return 'Nicht akzeptabel'
+    case 'very_high': return 'Sehr hoch'
     case 'critical': return 'Kritisch'
     case 'high': return 'Hoch'
     case 'medium': return 'Mittel'
@@ -94,6 +165,21 @@ function RiskBadge({ level }: { level: string }) {
   )
 }
 
+function ReviewStatusBadge({ status }: { status: string }) {
+  const colors: Record<string, string> = {
+    draft: 'bg-gray-100 text-gray-600 border-gray-200',
+    in_review: 'bg-blue-100 text-blue-600 border-blue-200',
+    reviewed: 'bg-indigo-100 text-indigo-600 border-indigo-200',
+    approved: 'bg-green-100 text-green-600 border-green-200',
+    rejected: 'bg-red-100 text-red-600 border-red-200',
+  }
+  return (
+    <span className={`inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium border ${colors[status] || colors.draft}`}>
+      {REVIEW_STATUS_LABELS[status] || status}
+    </span>
+  )
+}
+
 interface HazardFormData {
   name: string
   description: string
@@ -102,27 +188,52 @@ interface HazardFormData {
   severity: number
   exposure: number
   probability: number
+  avoidance: number
+  lifecycle_phase: string
+  trigger_event: string
+  affected_person: string
+  possible_harm: string
+  hazardous_zone: string
+  machine_module: string
 }
 
 function HazardForm({
   onSubmit,
   onCancel,
+  lifecyclePhases,
+  roles,
 }: {
   onSubmit: (data: HazardFormData) => void
   onCancel: () => void
+  lifecyclePhases: LifecyclePhase[]
+  roles: RoleInfo[]
 }) {
   const [formData, setFormData] = useState<HazardFormData>({
     name: '',
     description: '',
-    category: 'mechanical',
+    category: 'mechanical_hazard',
     component_id: '',
     severity: 3,
     exposure: 3,
     probability: 3,
+    avoidance: 3,
+    lifecycle_phase: '',
+    trigger_event: '',
+    affected_person: '',
+    possible_harm: '',
+    hazardous_zone: '',
+    machine_module: '',
   })
 
-  const rInherent = formData.severity * formData.exposure * formData.probability
-  const riskLevel = getRiskLevel(rInherent)
+  const [showExtended, setShowExtended] = useState(false)
+
+  // ISO 12100 mode: S × F × P × A when avoidance is set
+  const isISOMode = formData.avoidance > 0
+  const rInherent = isISOMode
+    ? formData.severity * formData.exposure * formData.probability * formData.avoidance
+    : formData.severity * formData.exposure * formData.probability
+  const riskLevel = isISOMode ? getRiskLevelISO(rInherent) : getRiskLevelLegacy(rInherent)
+  const formulaLabel = isISOMode ? 'R = S × F × P × A' : 'R = S × E × P'
 
   return (
     <div className="bg-white dark:bg-gray-800 rounded-xl border border-gray-200 dark:border-gray-700 p-6">
@@ -164,42 +275,120 @@ function HazardForm({
           />
         </div>
 
-        {/* S/E/P Sliders */}
+        {/* Lifecycle Phase */}
+        <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+          <div>
+            <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Lebensphase</label>
+            <select
+              value={formData.lifecycle_phase}
+              onChange={(e) => setFormData({ ...formData, lifecycle_phase: e.target.value })}
+              className="w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500 focus:border-transparent dark:bg-gray-700 dark:border-gray-600 dark:text-white"
+            >
+              <option value="">-- Keine Auswahl --</option>
+              {lifecyclePhases.map((p) => (
+                <option key={p.id} value={p.id}>{p.label_de}</option>
+              ))}
+            </select>
+          </div>
+          <div>
+            <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Betroffene Personen</label>
+            <select
+              value={formData.affected_person}
+              onChange={(e) => setFormData({ ...formData, affected_person: e.target.value })}
+              className="w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500 focus:border-transparent dark:bg-gray-700 dark:border-gray-600 dark:text-white"
+            >
+              <option value="">-- Bitte waehlen --</option>
+              {roles.map((r) => (
+                <option key={r.id} value={r.id}>{r.label_de}</option>
+              ))}
+            </select>
+          </div>
+        </div>
+
+        {/* Extended fields toggle */}
+        <button
+          type="button"
+          onClick={() => setShowExtended(!showExtended)}
+          className="text-sm text-purple-600 hover:text-purple-700 font-medium"
+        >
+          {showExtended ? 'Weniger Felder anzeigen' : 'Weitere Felder anzeigen (Ausloeser, Gefahrenzone, Modul...)'}
+        </button>
+
+        {showExtended && (
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-4 p-4 bg-gray-50 dark:bg-gray-750 rounded-lg">
+            <div>
+              <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Ausloeseereignis</label>
+              <input
+                type="text"
+                value={formData.trigger_event}
+                onChange={(e) => setFormData({ ...formData, trigger_event: e.target.value })}
+                placeholder="z.B. Schutztuer offen bei Betrieb"
+                className="w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500 focus:border-transparent dark:bg-gray-700 dark:border-gray-600 dark:text-white"
+              />
+            </div>
+            <div>
+              <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Moeglicher Schaden</label>
+              <input
+                type="text"
+                value={formData.possible_harm}
+                onChange={(e) => setFormData({ ...formData, possible_harm: e.target.value })}
+                placeholder="z.B. Schwere Quetschverletzung"
+                className="w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500 focus:border-transparent dark:bg-gray-700 dark:border-gray-600 dark:text-white"
+              />
+            </div>
+            <div>
+              <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Gefahrenzone</label>
+              <input
+                type="text"
+                value={formData.hazardous_zone}
+                onChange={(e) => setFormData({ ...formData, hazardous_zone: e.target.value })}
+                placeholder="z.B. Roboter-Arbeitsbereich"
+                className="w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500 focus:border-transparent dark:bg-gray-700 dark:border-gray-600 dark:text-white"
+              />
+            </div>
+            <div>
+              <label className="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Maschinenmodul</label>
+              <input
+                type="text"
+                value={formData.machine_module}
+                onChange={(e) => setFormData({ ...formData, machine_module: e.target.value })}
+                placeholder="z.B. Antriebseinheit"
+                className="w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-purple-500 focus:border-transparent dark:bg-gray-700 dark:border-gray-600 dark:text-white"
+              />
+            </div>
+          </div>
+        )}
+
+        {/* S/F/P/A Sliders */}
         <div className="bg-gray-50 dark:bg-gray-750 rounded-lg p-4">
-          <h4 className="text-sm font-medium text-gray-700 dark:text-gray-300 mb-3">Risikobewertung (S x E x P)</h4>
-          <div className="grid grid-cols-1 md:grid-cols-3 gap-6">
+          <h4 className="text-sm font-medium text-gray-700 dark:text-gray-300 mb-3">
+            Risikobewertung ({formulaLabel})
+          </h4>
+          <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
             <div>
               <label className="block text-sm text-gray-600 dark:text-gray-400 mb-1">
                 Schwere (S): <span className="font-bold">{formData.severity}</span>
               </label>
               <input
-                type="range"
-                min={1}
-                max={5}
-                value={formData.severity}
+                type="range" min={1} max={5} value={formData.severity}
                 onChange={(e) => setFormData({ ...formData, severity: Number(e.target.value) })}
                 className="w-full accent-purple-600"
               />
               <div className="flex justify-between text-xs text-gray-400">
-                <span>Gering</span>
-                <span>Toedlich</span>
+                <span>Gering</span><span>Toedlich</span>
               </div>
             </div>
             <div>
               <label className="block text-sm text-gray-600 dark:text-gray-400 mb-1">
-                Exposition (E): <span className="font-bold">{formData.exposure}</span>
+                Haeufigkeit (F): <span className="font-bold">{formData.exposure}</span>
               </label>
               <input
-                type="range"
-                min={1}
-                max={5}
-                value={formData.exposure}
+                type="range" min={1} max={5} value={formData.exposure}
                 onChange={(e) => setFormData({ ...formData, exposure: Number(e.target.value) })}
                 className="w-full accent-purple-600"
               />
               <div className="flex justify-between text-xs text-gray-400">
-                <span>Selten</span>
-                <span>Staendig</span>
+                <span>Selten</span><span>Staendig</span>
               </div>
             </div>
             <div>
@@ -207,23 +396,32 @@ function HazardForm({
                 Wahrscheinlichkeit (P): <span className="font-bold">{formData.probability}</span>
               </label>
               <input
-                type="range"
-                min={1}
-                max={5}
-                value={formData.probability}
+                type="range" min={1} max={5} value={formData.probability}
                 onChange={(e) => setFormData({ ...formData, probability: Number(e.target.value) })}
                 className="w-full accent-purple-600"
               />
               <div className="flex justify-between text-xs text-gray-400">
-                <span>Unwahrscheinlich</span>
-                <span>Sehr wahrscheinlich</span>
+                <span>Unwahrscheinlich</span><span>Sehr wahrscheinlich</span>
+              </div>
+            </div>
+            <div>
+              <label className="block text-sm text-gray-600 dark:text-gray-400 mb-1">
+                Vermeidbarkeit (A): <span className="font-bold">{formData.avoidance}</span>
+              </label>
+              <input
+                type="range" min={1} max={5} value={formData.avoidance}
+                onChange={(e) => setFormData({ ...formData, avoidance: Number(e.target.value) })}
+                className="w-full accent-purple-600"
+              />
+              <div className="flex justify-between text-xs text-gray-400">
+                <span>Leicht</span><span>Unmoeglich</span>
               </div>
             </div>
           </div>
 
           <div className={`mt-4 p-3 rounded-lg border ${getRiskColor(riskLevel)}`}>
             <div className="flex items-center justify-between">
-              <span className="text-sm font-medium">R_inherent = S x E x P</span>
+              <span className="text-sm font-medium">{formulaLabel}</span>
               <div className="flex items-center gap-2">
                 <span className="text-lg font-bold">{rInherent}</span>
                 <RiskBadge level={riskLevel} />
@@ -264,6 +462,7 @@ function LibraryModal({
 }) {
   const [search, setSearch] = useState('')
   const [filterCat, setFilterCat] = useState('')
+  const [expandedId, setExpandedId] = useState<string | null>(null)
 
   const filtered = library.filter((h) => {
     const matchSearch = !search || h.name.toLowerCase().includes(search.toLowerCase()) || h.description.toLowerCase().includes(search.toLowerCase())
@@ -273,10 +472,10 @@ function LibraryModal({
 
   return (
     <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50 p-4">
-      <div className="bg-white dark:bg-gray-800 rounded-xl w-full max-w-2xl max-h-[80vh] flex flex-col">
+      <div className="bg-white dark:bg-gray-800 rounded-xl w-full max-w-3xl max-h-[85vh] flex flex-col">
         <div className="p-6 border-b border-gray-200 dark:border-gray-700">
           <div className="flex items-center justify-between mb-4">
-            <h3 className="text-lg font-semibold text-gray-900 dark:text-white">Gefaehrdungsbibliothek</h3>
+            <h3 className="text-lg font-semibold text-gray-900 dark:text-white">Gefaehrdungsbibliothek ({filtered.length} Eintraege)</h3>
             <button onClick={onClose} className="p-1 text-gray-400 hover:text-gray-600 rounded">
               <svg className="w-5 h-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
                 <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M6 18L18 6M6 6l12 12" />
@@ -306,24 +505,62 @@ function LibraryModal({
         <div className="flex-1 overflow-auto p-4 space-y-2">
           {filtered.length > 0 ? (
             filtered.map((item) => (
-              <div
-                key={item.id}
-                className="flex items-center justify-between p-3 rounded-lg border border-gray-200 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-750"
-              >
-                <div className="flex-1 min-w-0 mr-3">
-                  <div className="text-sm font-medium text-gray-900 dark:text-white">{item.name}</div>
-                  <div className="text-xs text-gray-500 truncate">{item.description}</div>
-                  <div className="flex items-center gap-2 mt-1">
-                    <span className="text-xs text-gray-400">{CATEGORY_LABELS[item.category] || item.category}</span>
-                    <span className="text-xs text-gray-400">S:{item.default_severity} E:{item.default_exposure} P:{item.default_probability}</span>
+              <div key={item.id} className="rounded-lg border border-gray-200 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-750">
+                <div className="flex items-center justify-between p-3">
+                  <div
+                    className="flex-1 min-w-0 mr-3 cursor-pointer"
+                    onClick={() => setExpandedId(expandedId === item.id ? null : item.id)}
+                  >
+                    <div className="text-sm font-medium text-gray-900 dark:text-white">{item.name}</div>
+                    <div className="text-xs text-gray-500 truncate">{item.description}</div>
+                    <div className="flex items-center gap-2 mt-1">
+                      <span className="text-xs text-gray-400">{CATEGORY_LABELS[item.category] || item.category}</span>
+                      <span className="text-xs text-gray-400">
+                        S:{item.default_severity} F:{item.default_exposure || 3} P:{item.default_probability} A:{item.default_avoidance || 3}
+                      </span>
+                    </div>
                   </div>
+                  <button
+                    onClick={() => onAdd(item)}
+                    className="flex-shrink-0 px-3 py-1.5 text-xs bg-purple-600 text-white rounded-lg hover:bg-purple-700 transition-colors"
+                  >
+                    Hinzufuegen
+                  </button>
                 </div>
-                <button
-                  onClick={() => onAdd(item)}
-                  className="flex-shrink-0 px-3 py-1.5 text-xs bg-purple-600 text-white rounded-lg hover:bg-purple-700 transition-colors"
-                >
-                  Hinzufuegen
-                </button>
+                {expandedId === item.id && (
+                  <div className="px-3 pb-3 space-y-2 text-xs">
+                    {item.typical_causes && item.typical_causes.length > 0 && (
+                      <div>
+                        <span className="font-medium text-gray-600">Typische Ursachen: </span>
+                        <span className="text-gray-500">{item.typical_causes.join(', ')}</span>
+                      </div>
+                    )}
+                    {item.typical_harm && (
+                      <div>
+                        <span className="font-medium text-gray-600">Typischer Schaden: </span>
+                        <span className="text-gray-500">{item.typical_harm}</span>
+                      </div>
+                    )}
+                    {item.recommended_measures_design && item.recommended_measures_design.length > 0 && (
+                      <div>
+                        <span className="font-medium text-blue-600">Konstruktiv: </span>
+                        <span className="text-gray-500">{item.recommended_measures_design.join(', ')}</span>
+                      </div>
+                    )}
+                    {item.recommended_measures_technical && item.recommended_measures_technical.length > 0 && (
+                      <div>
+                        <span className="font-medium text-green-600">Technisch: </span>
+                        <span className="text-gray-500">{item.recommended_measures_technical.join(', ')}</span>
+                      </div>
+                    )}
+                    {item.recommended_measures_information && item.recommended_measures_information.length > 0 && (
+                      <div>
+                        <span className="font-medium text-yellow-600">Information: </span>
+                        <span className="text-gray-500">{item.recommended_measures_information.join(', ')}</span>
+                      </div>
+                    )}
+                  </div>
+                )}
               </div>
             ))
           ) : (
@@ -340,6 +577,8 @@ export default function HazardsPage() {
   const projectId = params.projectId as string
   const [hazards, setHazards] = useState<Hazard[]>([])
   const [library, setLibrary] = useState<LibraryHazard[]>([])
+  const [lifecyclePhases, setLifecyclePhases] = useState<LifecyclePhase[]>([])
+  const [roles, setRoles] = useState<RoleInfo[]>([])
   const [loading, setLoading] = useState(true)
   const [showForm, setShowForm] = useState(false)
   const [showLibrary, setShowLibrary] = useState(false)
@@ -347,6 +586,8 @@ export default function HazardsPage() {
 
   useEffect(() => {
     fetchHazards()
+    fetchLifecyclePhases()
+    fetchRoles()
   }, [projectId])
 
   async function fetchHazards() {
@@ -363,12 +604,36 @@ export default function HazardsPage() {
     }
   }
 
+  async function fetchLifecyclePhases() {
+    try {
+      const res = await fetch('/api/sdk/v1/iace/lifecycle-phases')
+      if (res.ok) {
+        const json = await res.json()
+        setLifecyclePhases(json.lifecycle_phases || [])
+      }
+    } catch (err) {
+      console.error('Failed to fetch lifecycle phases:', err)
+    }
+  }
+
+  async function fetchRoles() {
+    try {
+      const res = await fetch('/api/sdk/v1/iace/roles')
+      if (res.ok) {
+        const json = await res.json()
+        setRoles(json.roles || [])
+      }
+    } catch (err) {
+      console.error('Failed to fetch roles:', err)
+    }
+  }
+
   async function fetchLibrary() {
     try {
       const res = await fetch('/api/sdk/v1/iace/hazard-library')
       if (res.ok) {
         const json = await res.json()
-        setLibrary(json.hazards || json || [])
+        setLibrary(json.hazard_library || json.hazards || json || [])
       }
     } catch (err) {
       console.error('Failed to fetch hazard library:', err)
@@ -385,9 +650,11 @@ export default function HazardsPage() {
           name: item.name,
           description: item.description,
           category: item.category,
+          sub_category: item.sub_category || '',
           severity: item.default_severity,
-          exposure: item.default_exposure,
+          exposure: item.default_exposure || 3,
           probability: item.default_probability,
+          avoidance: item.default_avoidance || 3,
         }),
       })
       if (res.ok) {
@@ -458,7 +725,7 @@ export default function HazardsPage() {
         <div>
           <h1 className="text-2xl font-bold text-gray-900 dark:text-white">Hazard Log</h1>
           <p className="mt-1 text-sm text-gray-500 dark:text-gray-400">
-            Gefaehrdungsanalyse mit Risikobewertung nach S x E x P Methode.
+            Gefaehrdungsanalyse mit 4-Faktor-Risikobewertung (S x F x P x A).
           </p>
         </div>
         <div className="flex items-center gap-2">
@@ -499,14 +766,18 @@ export default function HazardsPage() {
 
       {/* Stats */}
       {hazards.length > 0 && (
-        <div className="grid grid-cols-2 md:grid-cols-5 gap-3">
+        <div className="grid grid-cols-2 md:grid-cols-7 gap-3">
           <div className="bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 p-4 text-center">
             <div className="text-2xl font-bold text-gray-900 dark:text-white">{hazards.length}</div>
             <div className="text-xs text-gray-500">Gesamt</div>
           </div>
+          <div className="bg-white dark:bg-gray-800 rounded-lg border border-red-300 p-4 text-center">
+            <div className="text-2xl font-bold text-red-800">{hazards.filter((h) => h.risk_level === 'not_acceptable').length}</div>
+            <div className="text-xs text-red-800">Nicht akzeptabel</div>
+          </div>
           <div className="bg-white dark:bg-gray-800 rounded-lg border border-red-200 p-4 text-center">
-            <div className="text-2xl font-bold text-red-600">{hazards.filter((h) => h.risk_level === 'critical').length}</div>
-            <div className="text-xs text-red-600">Kritisch</div>
+            <div className="text-2xl font-bold text-red-600">{hazards.filter((h) => h.risk_level === 'very_high' || h.risk_level === 'critical').length}</div>
+            <div className="text-xs text-red-600">Sehr hoch/Kritisch</div>
           </div>
           <div className="bg-white dark:bg-gray-800 rounded-lg border border-orange-200 p-4 text-center">
             <div className="text-2xl font-bold text-orange-600">{hazards.filter((h) => h.risk_level === 'high').length}</div>
@@ -520,12 +791,21 @@ export default function HazardsPage() {
             <div className="text-2xl font-bold text-green-600">{hazards.filter((h) => h.risk_level === 'low').length}</div>
             <div className="text-xs text-green-600">Niedrig</div>
           </div>
+          <div className="bg-white dark:bg-gray-800 rounded-lg border border-gray-200 p-4 text-center">
+            <div className="text-2xl font-bold text-gray-500">{hazards.filter((h) => h.risk_level === 'negligible').length}</div>
+            <div className="text-xs text-gray-500">Vernachlaessigbar</div>
+          </div>
         </div>
       )}
 
       {/* Form */}
       {showForm && (
-        <HazardForm onSubmit={handleSubmit} onCancel={() => setShowForm(false)} />
+        <HazardForm
+          onSubmit={handleSubmit}
+          onCancel={() => setShowForm(false)}
+          lifecyclePhases={lifecyclePhases}
+          roles={roles}
+        />
       )}
 
       {/* Library Modal */}
@@ -546,19 +826,20 @@ export default function HazardsPage() {
                 <tr className="bg-gray-50 dark:bg-gray-750 border-b border-gray-200 dark:border-gray-700">
                   <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Bezeichnung</th>
                   <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Kategorie</th>
-                  <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Komponente</th>
                   <th className="px-4 py-3 text-center text-xs font-medium text-gray-500 uppercase tracking-wider">S</th>
-                  <th className="px-4 py-3 text-center text-xs font-medium text-gray-500 uppercase tracking-wider">E</th>
+                  <th className="px-4 py-3 text-center text-xs font-medium text-gray-500 uppercase tracking-wider">F</th>
                   <th className="px-4 py-3 text-center text-xs font-medium text-gray-500 uppercase tracking-wider">P</th>
+                  <th className="px-4 py-3 text-center text-xs font-medium text-gray-500 uppercase tracking-wider">A</th>
                   <th className="px-4 py-3 text-center text-xs font-medium text-gray-500 uppercase tracking-wider">R</th>
                   <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Risiko</th>
+                  <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Review</th>
                   <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Status</th>
                   <th className="px-4 py-3 text-right text-xs font-medium text-gray-500 uppercase tracking-wider">Aktionen</th>
                 </tr>
               </thead>
               <tbody className="divide-y divide-gray-200 dark:divide-gray-700">
                 {hazards
-                  .sort((a, b) => b.r_inherent - a.r_inherent)
+                  .sort((a, b) => (b.r_inherent || 0) - (a.r_inherent || 0))
                   .map((hazard) => (
                     <tr key={hazard.id} className="hover:bg-gray-50 dark:hover:bg-gray-750 transition-colors">
                       <td className="px-4 py-3">
@@ -566,14 +847,20 @@ export default function HazardsPage() {
                         {hazard.description && (
                           <div className="text-xs text-gray-500 truncate max-w-[250px]">{hazard.description}</div>
                         )}
+                        {hazard.lifecycle_phase && (
+                          <div className="text-xs text-purple-500 mt-0.5">
+                            {lifecyclePhases.find(p => p.id === hazard.lifecycle_phase)?.label_de || hazard.lifecycle_phase}
+                          </div>
+                        )}
                       </td>
                       <td className="px-4 py-3 text-sm text-gray-600">{CATEGORY_LABELS[hazard.category] || hazard.category}</td>
-                      <td className="px-4 py-3 text-sm text-gray-600">{hazard.component_name || '--'}</td>
                       <td className="px-4 py-3 text-sm text-gray-900 dark:text-white text-center font-medium">{hazard.severity}</td>
                       <td className="px-4 py-3 text-sm text-gray-900 dark:text-white text-center font-medium">{hazard.exposure}</td>
                       <td className="px-4 py-3 text-sm text-gray-900 dark:text-white text-center font-medium">{hazard.probability}</td>
+                      <td className="px-4 py-3 text-sm text-gray-900 dark:text-white text-center font-medium">{hazard.avoidance || '-'}</td>
                       <td className="px-4 py-3 text-sm text-gray-900 dark:text-white text-center font-bold">{hazard.r_inherent}</td>
                       <td className="px-4 py-3"><RiskBadge level={hazard.risk_level} /></td>
+                      <td className="px-4 py-3"><ReviewStatusBadge status={hazard.review_status || 'draft'} /></td>
                       <td className="px-4 py-3">
                         <span className="text-xs text-gray-500">{STATUS_LABELS[hazard.status] || hazard.status}</span>
                       </td>