@atlashub/smartstack-cli 4.75.0 → 4.79.0

package/templates/skills/business-analyse/steps/step-04-consolidate.md

@@ -244,6 +244,120 @@ This includes:
 - 5 contract verification checks (BR formulas, computed attributes, UC counts, permission counts, versioned attributes)
 - Blocking rule: 0 ERROR → PASS, ≥1 ERROR → BLOCK (user must fix before proceeding)
 
+**BR-EXAMPLES-COMPLETE check — qualité test-ready (NEW):**
+```javascript
+for (const module of completedModules) {
+  const rules = module.rules || [];
+  if (rules.length === 0) continue;
+
+  // 1. Couverture : toutes les règles doivent avoir des exemples
+  const withExamples = rules.filter(r => r.examples?.length > 0);
+  const exampleRate = withExamples.length / rules.length;
+
+  if (exampleRate < 0.4) {
+    ERROR(`Module ${module.code}: ${withExamples.length}/${rules.length} BRs ont des exemples (${Math.round(exampleRate*100)}% < 40% minimum) — BLOQUANT`);
+  } else if (exampleRate < 0.7) {
+    WARNING(`Module ${module.code}: ${withExamples.length}/${rules.length} BRs ont des exemples (${Math.round(exampleRate*100)}% — cible: 100%)`);
+  }
+
+  // 2. Format test-ready : exemples avec given/when/then
+  const testReady = rules.filter(r =>
+    r.examples?.some(e => e.given && e.when && e.then)
+  );
+  const proseOnly = rules.filter(r =>
+    r.examples?.length > 0 && !r.examples.some(e => e.given && e.when && e.then)
+  );
+
+  if (testReady.length < 4 && module.featureType !== 'portal') {
+    WARNING(`Module ${module.code}: ${testReady.length}/4 BRs au format test-ready {given, when, then}`);
+  }
+  if (proseOnly.length > 0) {
+    WARNING(`Module ${module.code}: ${proseOnly.length} BRs avec exemples en prose — convertir en format test-ready pour génération de tests`);
+  }
+
+  // 3. BR-CALC : formule + exemple chiffré obligatoires
+  const calcRules = rules.filter(r => r.category === 'calculation');
+  const calcWithoutFormula = calcRules.filter(r => !r.formula);
+  const calcWithoutNumericExample = calcRules.filter(r =>
+    !r.examples?.some(e =>
+      (e.scenario === 'calculation') ||
+      (e.then && Object.values(e.then).some(v => typeof v === 'number'))
+    )
+  );
+
+  if (calcWithoutFormula.length > 0) {
+    ERROR(`Module ${module.code}: ${calcWithoutFormula.length} BR-CALC sans champ formula`);
+  }
+  if (calcWithoutNumericExample.length > 0) {
+    WARNING(`Module ${module.code}: ${calcWithoutNumericExample.length} BR-CALC sans exemple chiffré — les tests de calcul nécessitent des valeurs numériques`);
+  }
+
+  // 4. Couverture scénarios : chaque règle devrait avoir happy_path + error
+  const withBothScenarios = rules.filter(r =>
+    r.examples?.some(e => e.scenario === 'happy_path' || e.then?.result === 'success') &&
+    r.examples?.some(e => e.scenario === 'error' || e.then?.result === 'error')
+  );
+  if (withBothScenarios.length < rules.length * 0.5 && module.featureType !== 'portal') {
+    WARNING(`Module ${module.code}: ${withBothScenarios.length}/${rules.length} BRs couvrent happy_path + error — cible: 100%`);
+  }
+}
+```
+
+### 4b. Language Coherence Check (MANDATORY)
+
+Verify that ALL generated content respects `{language}` from config:
+
+```javascript
+const expectedLang = language; // from config.json
+
+// Heuristics for language detection
+const frIndicators = /\b(le|la|les|un|une|des|du|de|est|sont|doit|peut|dans|pour|avec|sur|par|cette|tout|qui)\b/i;
+const enIndicators = /\b(the|a|an|is|are|must|can|in|for|with|on|by|this|all|who|should|when|each)\b/i;
+
+function detectLang(text) {
+  if (!text || text.length < 10) return null;
+  const frScore = (text.match(frIndicators) || []).length;
+  const enScore = (text.match(enIndicators) || []).length;
+  if (frScore > enScore * 1.5) return 'fr';
+  if (enScore > frScore * 1.5) return 'en';
+  return null; // ambiguous
+}
+
+const langIssues = [];
+for (const module of completedModules) {
+  // Sample entity descriptions
+  (module.entities || []).forEach(e => {
+    const detected = detectLang(e.description);
+    if (detected && detected !== expectedLang) {
+      langIssues.push({ module: module.code, type: 'entity', name: e.name, detected, text: e.description?.substring(0, 60) });
+    }
+  });
+  // Sample BR statements
+  (module.rules || []).forEach(r => {
+    const detected = detectLang(r.statement);
+    if (detected && detected !== expectedLang) {
+      langIssues.push({ module: module.code, type: 'rule', name: r.id, detected, text: r.statement?.substring(0, 60) });
+    }
+  });
+  // Sample UC names
+  (module.useCases || module.usecases || []).forEach(u => {
+    const detected = detectLang(u.name);
+    if (detected && detected !== expectedLang) {
+      langIssues.push({ module: module.code, type: 'useCase', name: u.id || u.name, detected, text: u.name });
+    }
+  });
+}
+
+if (langIssues.length > 0) {
+  WARNING(`${langIssues.length} content items detected in wrong language (expected: ${expectedLang})`);
+  Display(langIssues.slice(0, 10).map(i => `  - ${i.module}/${i.type} "${i.name}": detected ${i.detected}, text: "${i.text}"`).join('\n'));
+
+  if (langIssues.length > completedModules.length * 3) {
+    BLOCKING_ERROR(`Too many language violations (${langIssues.length}). Re-specify affected modules in ${expectedLang}.`);
+  }
+}
+```
+
 ### 5. Data Model Consolidation
 
 Generate global entity relationship diagram:
@@ -389,7 +503,98 @@ for (const step of flow.steps) {
 
 Store as `consolidation.mermaidDiagrams.sequences[{flowName}]` (string).
 
-#### 5b-iv. Storage
+#### 5b-iv. Use Case Diagrams (per module)
+
+For EACH module, generate a Mermaid use case diagram showing actors and their interactions:
+
+```javascript
+const useCaseDiagrams = {};
+
+for (const module of completedModules) {
+  const usecases = module.useCases || module.usecases || [];
+  if (usecases.length === 0) continue;
+
+  // Collect unique actors
+  const actors = [...new Set(usecases.map(uc => uc.primaryActor || uc.actor).filter(Boolean))];
+
+  // Build flowchart-based UC diagram (Mermaid does not have native usecase syntax)
+  let diagram = "flowchart LR\n";
+
+  // Add actors (left side)
+  actors.forEach((actor, i) => {
+    const actorId = 'actor_' + actor.replace(/[^a-zA-Z0-9]/g, '_');
+    diagram += `  ${actorId}[/"👤 ${actor}"\\]\n`;
+    diagram += `  style ${actorId} fill:#e1f5fe,stroke:#0288d1,color:#01579b\n`;
+  });
+
+  // Group UCs by section
+  const sections = [...new Set(usecases.map(uc => uc.sectionCode).filter(Boolean))];
+
+  sections.forEach(section => {
+    const sectionUCs = usecases.filter(uc => uc.sectionCode === section);
+    diagram += `  subgraph ${section}["${section}"]\n`;
+    sectionUCs.forEach(uc => {
+      const ucId = (uc.id || uc.name).replace(/[^a-zA-Z0-9]/g, '_');
+      diagram += `    ${ucId}(("${uc.name}"))\n`;
+    });
+    diagram += `  end\n`;
+  });
+
+  // UCs without section
+  const noSectionUCs = usecases.filter(uc => !uc.sectionCode);
+  noSectionUCs.forEach(uc => {
+    const ucId = (uc.id || uc.name).replace(/[^a-zA-Z0-9]/g, '_');
+    diagram += `  ${ucId}(("${uc.name}"))\n`;
+  });
+
+  // Connect actors to UCs
+  usecases.forEach(uc => {
+    const actor = uc.primaryActor || uc.actor;
+    if (!actor) return;
+    const actorId = 'actor_' + actor.replace(/[^a-zA-Z0-9]/g, '_');
+    const ucId = (uc.id || uc.name).replace(/[^a-zA-Z0-9]/g, '_');
+    diagram += `  ${actorId} --> ${ucId}\n`;
+  });
+
+  useCaseDiagrams[module.code] = diagram;
+}
+```
+
+Store as `consolidation.mermaidDiagrams.useCases` (object: moduleCode → diagram string).
+
+#### 5b-v. MCD (Modèle Conceptuel de Données)
+
+Generate a simplified conceptual data model showing ONLY entity names and named relationships with cardinalities. Unlike the ERD which shows all attributes, the MCD focuses on the conceptual structure.
+
+```javascript
+let mcd = "erDiagram\n";
+
+// Entities: name + PK only (no attributes)
+for (const ent of globalEntities) {
+  mcd += `  ${ent.name} {\n`;
+  mcd += `    ${ent.pk || 'guid'} Id PK\n`;
+  mcd += `  }\n`;
+}
+
+// Named relationships with cardinalities
+for (const rel of globalRelationships) {
+  const card = rel.cardinality === "1:N" ? "||--o{" :
+               rel.cardinality === "N:1" ? "}o--||" :
+               rel.cardinality === "N:M" ? "}o--o{" :
+               rel.cardinality === "1:1" ? "||--||" : "||--o{";
+
+  // Use description as relationship label, or derive from cardinality
+  const label = rel.description ||
+    (rel.cardinality === "1:N" ? "contient" :
+     rel.cardinality === "N:1" ? "appartient" : "associe");
+
+  mcd += `  ${rel.sourceEntity} ${card} ${rel.targetEntity} : "${label}"\n`;
+}
+```
+
+Store as `consolidation.mermaidDiagrams.mcd` (string).
+
+#### 5b-vi. Storage
 
 Write to `consolidation.json`:
 
@@ -397,6 +602,11 @@ Write to `consolidation.json`:
 {
   "mermaidDiagrams": {
     "erd": "erDiagram\n  Employee {\n    guid id\n    string code\n    ...\n  }\n  ...",
+    "mcd": "erDiagram\n  Employee {\n    guid Id PK\n  }\n  Employee ||--o{ Contract : \"contient\"\n  ...",
+    "useCases": {
+      "Employees": "flowchart LR\n  actor_RH[/\"👤 RH Admin\"\\]\n  ...",
+      "Absences": "flowchart LR\n  ..."
+    },
     "stateMachines": {
       "Absence": "stateDiagram-v2\n  [*] --> Draft\n  Draft --> Submitted : submit\n  ...",
       "Invoice": "stateDiagram-v2\n  [*] --> Draft\n  ..."

package/templates/skills/business-analyse/templates-react.md

@@ -120,15 +120,15 @@ const docData: DocData = {
   ]
 };
 
-// Priority Badge Component
+// Priority Badge Component (theme-aware via SmartStack status tokens)
 function PriorityBadge({ priority }: { priority: string }) {
   const colors = {
-    Must: 'bg-red-500/10 text-red-600',
-    Should: 'bg-yellow-500/10 text-yellow-600',
-    Could: 'bg-blue-500/10 text-blue-600'
+    Must:   'bg-[var(--error-bg)] text-[var(--error-text)] border border-[var(--error-border)]',
+    Should: 'bg-[var(--warning-bg)] text-[var(--warning-text)] border border-[var(--warning-border)]',
+    Could:  'bg-[var(--info-bg)] text-[var(--info-text)] border border-[var(--info-border)]'
   };
   return (
-    <span className={`px-2 py-0.5 rounded text-xs font-medium ${colors[priority as keyof typeof colors] || 'bg-gray-500/10 text-gray-600'}`}>
+    <span className={`px-2 py-0.5 rounded text-xs font-medium ${colors[priority as keyof typeof colors] || 'bg-[var(--bg-tertiary)] text-[var(--text-secondary)]'}`}>
       {priority}
     </span>
   );
@@ -186,7 +186,7 @@ export function {ModuleName}DocPage() {
           <span className="px-2 py-0.5 rounded bg-[var(--color-primary-600)]/10 text-[var(--color-primary-600)] text-xs font-medium">
             {docData.featureId}
           </span>
-          <span className="px-2 py-0.5 rounded bg-green-500/10 text-green-600 text-xs font-medium">
+          <span className="px-2 py-0.5 rounded bg-[var(--success-bg)] text-[var(--success-text)] border border-[var(--success-border)] text-xs font-medium">
             v{docData.version}
           </span>
         </div>
@@ -264,7 +264,7 @@ export function {ModuleName}DocPage() {
               </div>
               <p className="text-sm text-[var(--text-secondary)] mb-2">{uc.description}</p>
               <div className="flex items-center gap-2 text-xs">
-                <Shield className="w-3 h-3 text-amber-500" />
+                <Shield className="w-3 h-3 text-[var(--warning-text)]" />
                 <code className="bg-[var(--bg-secondary)] px-2 py-0.5 rounded">{uc.permission}</code>
               </div>
             </div>
@@ -318,11 +318,11 @@ export function {ModuleName}DocPage() {
           ))}
         </div>
 
-        {/* Permission Warning */}
-        <div className="mt-4 p-4 rounded-lg bg-amber-500/10 border border-amber-500/20 flex items-start gap-3">
-          <AlertTriangle className="w-5 h-5 text-amber-600 flex-shrink-0 mt-0.5" />
+        {/* Permission Warning (theme-aware) */}
+        <div className="mt-4 p-4 rounded-lg bg-[var(--warning-bg)] border border-[var(--warning-border)] flex items-start gap-3">
+          <AlertTriangle className="w-5 h-5 text-[var(--warning-text)] flex-shrink-0 mt-0.5" />
           <div>
-            <div className="font-medium text-amber-600">{t('warnings.permissionCheck')}</div>
+            <div className="font-medium text-[var(--warning-text)]">{t('warnings.permissionCheck')}</div>
             <p className="text-sm text-[var(--text-secondary)]">
               {t('warnings.permissionCheckDescription')}
             </p>
@@ -367,22 +367,22 @@ export function {ModuleName}DocPage() {
             </thead>
             <tbody>
               <tr>
-                <td className="py-2 px-3"><span className="px-2 py-0.5 rounded bg-green-500/10 text-green-600">GET</span></td>
+                <td className="py-2 px-3"><span className="px-2 py-0.5 rounded bg-[var(--success-bg)] text-[var(--success-text)] border border-[var(--success-border)]">GET</span></td>
                 <td className="py-2 px-3">/api/{'{module}'}</td>
                 <td className="py-2 px-3 text-[var(--text-secondary)]">.read</td>
               </tr>
               <tr className="bg-[var(--bg-secondary)]/50">
-                <td className="py-2 px-3"><span className="px-2 py-0.5 rounded bg-blue-500/10 text-blue-600">POST</span></td>
+                <td className="py-2 px-3"><span className="px-2 py-0.5 rounded bg-[var(--info-bg)] text-[var(--info-text)] border border-[var(--info-border)]">POST</span></td>
                 <td className="py-2 px-3">/api/{'{module}'}</td>
                 <td className="py-2 px-3 text-[var(--text-secondary)]">.create</td>
               </tr>
               <tr>
-                <td className="py-2 px-3"><span className="px-2 py-0.5 rounded bg-yellow-500/10 text-yellow-600">PUT</span></td>
+                <td className="py-2 px-3"><span className="px-2 py-0.5 rounded bg-[var(--warning-bg)] text-[var(--warning-text)] border border-[var(--warning-border)]">PUT</span></td>
                 <td className="py-2 px-3">/api/{'{module}'}/{'{id}'}</td>
                 <td className="py-2 px-3 text-[var(--text-secondary)]">.update</td>
               </tr>
               <tr className="bg-[var(--bg-secondary)]/50">
-                <td className="py-2 px-3"><span className="px-2 py-0.5 rounded bg-red-500/10 text-red-600">DELETE</span></td>
+                <td className="py-2 px-3"><span className="px-2 py-0.5 rounded bg-[var(--error-bg)] text-[var(--error-text)] border border-[var(--error-border)]">DELETE</span></td>
                 <td className="py-2 px-3">/api/{'{module}'}/{'{id}'}</td>
                 <td className="py-2 px-3 text-[var(--text-secondary)]">.delete</td>
               </tr>

package/templates/skills/business-analyse-handoff/references/agent-handoff-transform-prompt.md

@@ -47,6 +47,9 @@ When reading flat files, prefer canonical keys but fall back to alternatives:
 - `primaryActor`: `uc.primaryActor || uc.actor`
 - `mainScenario`: `uc.mainScenario || uc.steps` (if `steps[]` contains objects, extract `.action`)
 - `rules`: `data.rules || data.businessRules || []`
+- `rules[].examples`: prefer `rule.examples[]` (`{input, expected}`); fallback: wrap `rule.example` string as `[{input: rule.example, expected: ""}]`
+- `rules[].statement`: prefer `rule.statement`; fallback: `rule.description`
+- `rules[].id`: prefer `rule.id`; fallback: `rule.code`
 - `screens`: `data.sections || data.screens` (if `screens[]` exists, treat each screen as a section with 1 resource)
 
 This safety net handles pre-4.52 BA outputs. It should become unnecessary once step-03-specify enforces canonical keys.

package/templates/skills/business-analyse-html/html/ba-interactive.html

@@ -2646,6 +2646,70 @@ data.moduleSpecs = data.moduleSpecs || {};
     });
 });
 
+// Normalize permissions: convert any object format to "Role|Action" pipe-delimited strings
+// Handles 5 formats:
+// A: "Role|Action" strings (already correct)
+// B: {role, permissions: ["Read:all", ...]} with role-permission pairs
+// C: {role, permissions: ["Module.Entity.Read", ...]} with path-based permissions
+// D: {code, label, description} permission definitions without role assignment
+// E: {role: "", permissions: []} empty entries (skip)
+(data.modules || []).forEach(function(m) {
+    var spec = data.moduleSpecs[m.code];
+    if (!spec || !spec.permissions || spec.permissions.length === 0) return;
+    // Skip if already normalized (first element is a pipe-delimited string)
+    if (typeof spec.permissions[0] === 'string' && spec.permissions[0].indexOf('|') !== -1) return;
+    if (typeof spec.permissions[0] !== 'object') return;
+
+    var actionMap = {
+        'read': 'Consulter', 'create': 'Créer', 'update': 'Modifier',
+        'delete': 'Supprimer', 'approve': 'Valider', 'validate': 'Valider',
+        'export': 'Exporter', 'admin': 'Administrer', 'import': 'Importer',
+        'viewsalary': 'Consulter', 'assignteam': 'Modifier', 'cancel': 'Supprimer',
+        'viewbalance': 'Consulter', 'invoicetime': 'Valider'
+    };
+    var normalized = [];
+    var first = spec.permissions[0];
+
+    // Detect Format D: {code, label, description} — permission codes without roles
+    if (first.code && !first.role && !first.permissions) {
+        // Extract actions from permission codes, assign to stakeholder roles
+        var roles = (data.cadrage.stakeholders || []).map(function(s) { return s.role; }).filter(Boolean);
+        if (roles.length === 0) roles = ['Administrateur', 'Responsable', 'Contributeur', 'Lecteur'];
+        spec.permissions.forEach(function(permDef) {
+            var code = permDef.code || '';
+            var raw = code.split('.').pop(); // "Module.Entity.Read" → "Read"
+            var action = actionMap[raw.toLowerCase()] || raw;
+            // Assign to first role (admin) by default — better than empty
+            if (roles[0]) {
+                var key = roles[0] + '|' + action;
+                if (normalized.indexOf(key) === -1) normalized.push(key);
+            }
+        });
+    } else {
+        // Format B/C: {role, permissions: [...]}
+        spec.permissions.forEach(function(entry) {
+            var role = entry.role || entry.name || '';
+            if (!role) return; // Skip Format E (empty role)
+            var perms = entry.permissions || entry.actions || [];
+            if (perms.length === 0 && entry.permissionPattern && entry.permissionPattern.endsWith('*')) {
+                ['Consulter', 'Créer', 'Modifier', 'Supprimer', 'Valider', 'Exporter'].forEach(function(a) {
+                    normalized.push(role + '|' + a);
+                });
+                return;
+            }
+            perms.forEach(function(perm) {
+                if (typeof perm !== 'string') return;
+                var raw = perm.split(':')[0]; // "Read:all" → "Read"
+                if (raw.indexOf('.') !== -1) raw = raw.split('.').pop(); // "Module.Entity.Read" → "Read"
+                var action = actionMap[raw.toLowerCase()] || raw;
+                var key = role + '|' + action;
+                if (normalized.indexOf(key) === -1) normalized.push(key);
+            });
+        });
+    }
+    spec.permissions = normalized;
+});
+
 // Detect if modules use section-level specs (hierarchical mode)
 function hasHierarchicalSpecs(mod) {
     return (mod.anticipatedSections || []).some(function(s) {
@@ -3693,6 +3757,11 @@ function renderModuleSpecSection(mod) {
 }
 
 function renderUseCase(code, uc, index) {
+    var preconditions = uc.preconditions || [];
+    var postconditions = uc.postconditions || [];
+    var errorScenarios = uc.errorScenarios || [];
+    var description = uc.description || '';
+
     return `
         <div class="uc-item">
             <div class="uc-header">
@@ -3703,8 +3772,12 @@ function renderUseCase(code, uc, index) {
                 </div>
             </div>
             <div class="uc-actors"><div class="uc-actor">${escapeHtml(uc.actor)}</div></div>
-            ${uc.steps ? `<div class="uc-detail-label">Déroulement</div><div class="uc-detail">${escapeHtml(uc.steps).replace(/\n/g, '<br>')}</div>` : ''}
-            ${uc.alternative ? `<div class="uc-detail-label">En cas de problème</div><div class="uc-detail" style="color:var(--warning);">${escapeHtml(uc.alternative)}</div>` : ''}
+            ${description ? `<div class="uc-detail-label">Description</div><div class="uc-detail" style="font-style:italic;color:var(--text-muted);">${escapeHtml(description)}</div>` : ''}
+            ${preconditions.length > 0 ? `<div class="uc-detail-label">Préconditions</div><div class="uc-detail"><ul style="margin:0;padding-left:1.2rem;">${preconditions.map(p => '<li>' + escapeHtml(typeof p === 'string' ? p : p.description || '') + '</li>').join('')}</ul></div>` : ''}
+            ${uc.steps ? `<div class="uc-detail-label">Déroulement principal</div><div class="uc-detail">${escapeHtml(uc.steps).replace(/\n/g, '<br>')}</div>` : ''}
+            ${uc.alternative ? `<div class="uc-detail-label">Scénarios alternatifs</div><div class="uc-detail" style="color:var(--warning);">${escapeHtml(uc.alternative)}</div>` : ''}
+            ${errorScenarios.length > 0 ? `<div class="uc-detail-label">Scénarios d'erreur</div><div class="uc-detail" style="color:var(--danger);"><ul style="margin:0;padding-left:1.2rem;">${errorScenarios.map(e => '<li><strong>' + escapeHtml(typeof e === 'string' ? e : e.name || '') + '</strong>' + (typeof e === 'object' && e.steps ? ' : ' + escapeHtml(Array.isArray(e.steps) ? e.steps.join(', ') : e.steps) : '') + '</li>').join('')}</ul></div>` : ''}
+            ${postconditions.length > 0 ? `<div class="uc-detail-label">Postconditions</div><div class="uc-detail"><ul style="margin:0;padding-left:1.2rem;">${postconditions.map(p => '<li>' + escapeHtml(typeof p === 'string' ? p : p.description || '') + '</li>').join('')}</ul></div>` : ''}
             <div style="padding:0.5rem 0.75rem;border-top:1px solid var(--border);background:var(--bg-input);border-radius:0 0 8px 8px;">
                 <label style="font-size:0.75rem;color:var(--text-muted);display:block;margin-bottom:0.25rem;">Commentaire / Feedback :</label>
                 <textarea class="form-textarea" placeholder="Ajouter un commentaire sur ce cas d'utilisation..."
@@ -3797,15 +3870,16 @@ function renderEntity(code, ent, index) {
             </div>
             ${(ent.attributes || []).length > 0 ? `
             <table class="attr-table">
-                <thead><tr><th>Information</th><th>Description</th></tr></thead>
+                <thead><tr><th>Information</th><th style="width:100px;">Type</th><th>Description</th></tr></thead>
                 <tbody>
-                    ${ent.attributes.map(a => `<tr><td style="font-weight:500;color:var(--text-bright);">${escapeHtml(a.name)}</td><td>${escapeHtml(a.description || '')}</td></tr>`).join('')}
+                    ${ent.attributes.map(a => `<tr><td style="font-weight:500;color:var(--text-bright);">${escapeHtml(a.name)}</td><td style="font-family:monospace;font-size:0.8rem;color:var(--accent);">${escapeHtml(a.type || 'string')}</td><td>${escapeHtml(a.description || '')}</td></tr>`).join('')}
                 </tbody>
             </table>` : ''}
             <div style="padding:0.3rem 0.75rem;">
                 <button class="add-btn" style="font-size:0.75rem;padding:0.4rem;" onclick="toggleForm('${attrFormId}')">+ Ajouter un attribut</button>
                 <div class="inline-form" id="${attrFormId}">
                     <div class="form-group"><label class="form-label">Nom de l'attribut</label><input type="text" class="form-input" id="attr-name-${code}-${index}" placeholder="Nom de l'attribut"></div>
+                    <div class="form-group"><label class="form-label">Type</label><input type="text" class="form-input" id="attr-type-${code}-${index}" placeholder="string, guid, int, decimal, date, enum, boolean" value="string"></div>
                     <div class="form-group"><label class="form-label">Description (optionnel)</label><input type="text" class="form-input" id="attr-desc-${code}-${index}" placeholder="Description"></div>
                     <div class="form-actions"><button class="btn" onclick="toggleForm('${attrFormId}')">Annuler</button><button class="btn btn-primary" onclick="addEntityAttribute('${code}',${index})">Ajouter</button></div>
                 </div>
@@ -3830,7 +3904,7 @@ function addEntity(code) {
 
     const attrs = document.getElementById('ent-attrs-' + code).value.split('\n').filter(l => l.trim()).map(l => {
         const parts = l.split(' - ');
-        return { name: parts[0]?.trim() || l.trim(), description: parts.slice(1).join(' - ').trim() };
+        return { name: parts[0]?.trim() || l.trim(), type: parts[1]?.trim() || 'string', description: parts.slice(2).join(' - ').trim() || parts.slice(1).join(' - ').trim() };
     });
     const rels = document.getElementById('ent-rels-' + code).value.split('\n').filter(l => l.trim());
 
@@ -3854,13 +3928,14 @@ function removeEntity(code, index) {
 
 function addEntityAttribute(code, entityIndex) {
     var attrName = document.getElementById('attr-name-' + code + '-' + entityIndex);
+    var attrType = document.getElementById('attr-type-' + code + '-' + entityIndex);
     var attrDesc = document.getElementById('attr-desc-' + code + '-' + entityIndex);
     if (!attrName || !attrName.value.trim()) return;
     if (!data.moduleSpecs[code]?.entities?.[entityIndex]) return;
     if (!data.moduleSpecs[code].entities[entityIndex].attributes) {
         data.moduleSpecs[code].entities[entityIndex].attributes = [];
     }
-    data.moduleSpecs[code].entities[entityIndex].attributes.push({ name: attrName.value.trim(), description: (attrDesc?.value || '').trim() });
+    data.moduleSpecs[code].entities[entityIndex].attributes.push({ name: attrName.value.trim(), type: (attrType?.value || 'string').trim(), description: (attrDesc?.value || '').trim() });
     renderAllModuleSpecs();
     autoSave();
 }
@@ -3971,13 +4046,68 @@ function toggleWireframeView(wireframeId, view) {
     }
 }
 
+// Normalize permissions array: handles 3 formats:
+// Format 1 (string): "Role|Action" → already correct
+// Format 2 (object): {role, permissions: ["Read:all", "Create:all", ...]}
+// Format 3 (object): {role, permissions: ["Module.Entity.Read", ...]}
+function normalizePermissions(permsArray) {
+    if (!permsArray || permsArray.length === 0) return [];
+    // If first element is a string with '|', already normalized
+    if (typeof permsArray[0] === 'string' && permsArray[0].includes('|')) return permsArray;
+    // If first element is a string without '|', return as-is (unknown format)
+    if (typeof permsArray[0] === 'string') return permsArray;
+    // Format 2/3: objects with {role, permissions[]}
+    const actionMap = {
+        'read': 'Consulter', 'create': 'Créer', 'update': 'Modifier',
+        'delete': 'Supprimer', 'approve': 'Valider', 'validate': 'Valider',
+        'export': 'Exporter', 'admin': 'Administrer', 'import': 'Importer',
+        'viewsalary': 'Consulter', 'assignteam': 'Modifier', 'cancel': 'Supprimer'
+    };
+    const normalized = [];
+    permsArray.forEach(function(entry) {
+        if (typeof entry !== 'object' || !entry) return;
+        var role = entry.role || entry.name || '';
+        if (!role) return;
+        var perms = entry.permissions || entry.actions || [];
+        if (perms.length === 0 && entry.permissionPattern && entry.permissionPattern.endsWith('*')) {
+            // Wildcard: expand to all standard actions
+            ['Consulter', 'Créer', 'Modifier', 'Supprimer', 'Valider', 'Exporter'].forEach(function(a) {
+                normalized.push(role + '|' + a);
+            });
+            return;
+        }
+        perms.forEach(function(perm) {
+            var action = '';
+            if (typeof perm === 'string') {
+                // "Read:all" → extract "Read"
+                var raw = perm.split(':')[0];
+                // "Module.Entity.Read" → extract "Read"
+                if (raw.includes('.')) raw = raw.split('.').pop();
+                action = actionMap[raw.toLowerCase()] || raw;
+            }
+            if (action) {
+                var key = role + '|' + action;
+                if (normalized.indexOf(key) === -1) normalized.push(key);
+            }
+        });
+    });
+    return normalized;
+}
+
 function getPermRoles() {
-    // Extract roles from actual permission data (handles English role names from JSON data)
+    // Extract roles from actual permission data (handles multiple formats)
     const rolesFromPerms = [];
     const seen = new Set();
     data.modules.forEach(m => {
-        (data.moduleSpecs[m.code]?.permissions || []).forEach(p => {
-            const role = p.split('|')[0];
+        var perms = data.moduleSpecs[m.code]?.permissions || [];
+        // Handle object format directly for role extraction
+        perms.forEach(p => {
+            var role = '';
+            if (typeof p === 'string') {
+                role = p.split('|')[0];
+            } else if (typeof p === 'object' && p) {
+                role = p.role || p.name || '';
+            }
             if (role && !seen.has(role)) { seen.add(role); rolesFromPerms.push(role); }
         });
     });
@@ -4000,7 +4130,9 @@ function renderPermissionGrid(code) {
     const baseRolesCount = roles.length - (data.customRoles || []).length;
     const baseActionsCount = 6;
 
-    const perms = data.moduleSpecs[code]?.permissions || [];
+    // Normalize permissions to "Role|Action" format (handles object and string formats)
+    const rawPerms = data.moduleSpecs[code]?.permissions || [];
+    const perms = normalizePermissions(rawPerms);
 
     return `
         <table class="mock-table" style="background:var(--bg-card);border-radius:8px;overflow:hidden;">
@@ -4205,7 +4337,8 @@ function renderModuleMockups(code) {
     }) : [];
 
     // Priority 1: HTML mockups from screens[] specs (wireframes NOT shown when screens exist)
-    if (screens.length > 0) {
+    var hasResources = screens.some(function(s) { return (s.resources || []).length > 0; });
+    if (screens.length > 0 && hasResources) {
         var html = '';
         if (typeof renderScreenMockups === 'function') {
             html = renderScreenMockups(code);
@@ -4353,9 +4486,9 @@ function renderDataModel() {
                     ${ent.description ? `<div class="dm-entity-desc">${escapeHtml(ent.description)}</div>` : ''}
                     ${attrs.length > 0 ? `
                     <table class="dm-attr-table">
-                        <thead><tr><th>Champ</th><th>Description</th></tr></thead>
+                        <thead><tr><th>Champ</th><th style="width:100px;">Type</th><th>Description</th></tr></thead>
                         <tbody>
-                            ${attrs.map(a => `<tr><td class="dm-attr-name">${escapeHtml(a.name)}</td><td class="dm-attr-desc">${escapeHtml(a.description || '')}</td></tr>`).join('')}
+                            ${attrs.map(a => `<tr><td class="dm-attr-name">${escapeHtml(a.name)}</td><td style="font-family:monospace;font-size:0.8rem;color:var(--accent);">${escapeHtml(a.type || 'string')}</td><td class="dm-attr-desc">${escapeHtml(a.description || '')}</td></tr>`).join('')}
                         </tbody>
                     </table>` : ''}
                     ${rels.length > 0 ? `
@@ -4495,13 +4628,16 @@ function renderScreenMockups(code) {
 
     return screens.map(function(screen, si) {
         var resources = screen.resources || [];
+        var content = resources.length > 0
+            ? resources.map(function(res, ri) {
+                return renderResourceMockup(code, screen.sectionCode, res, ri);
+            }).join('')
+            : '<div class="card" style="padding:1.5rem;color:var(--text-muted);text-align:center;"><p>Maquette en attente de spécification pour cette section.</p></div>';
         return '<div class="screen-section" id="screen-' + code + '-' + screen.sectionCode + '" style="margin-bottom:2rem;">' +
             '<h3 style="color:var(--text-bright);font-size:1rem;margin-bottom:1rem;">' +
             '<span style="color:var(--accent);">&#9656;</span> ' + escapeHtml(screen.sectionLabel || screen.sectionCode) +
             '</h3>' +
-            resources.map(function(res, ri) {
-                return renderResourceMockup(code, screen.sectionCode, res, ri);
-            }).join('') +
+            content +
         '</div>';
     }).join('');
 }
@@ -5856,6 +5992,24 @@ function renderMermaidDiagrams() {
         }
     }
 
+    // 1b. MCD (Modèle Conceptuel de Données) — after ERD
+    if (diagrams.mcd) {
+        var erdContainer = document.getElementById('dataModelContainer');
+        if (erdContainer) {
+            var mcdDiv = document.createElement('div');
+            mcdDiv.className = 'diagram-container diagram-mcd';
+            mcdDiv.innerHTML =
+                '<div class="diagram-section-header" style="font-size:0.95rem;font-weight:600;color:var(--text-bright);margin-bottom:0.75rem;">Mod\u00e8le Conceptuel de Donn\u00e9es (MCD)</div>' +
+                '<div class="mermaid">' + escapeHtml(diagrams.mcd) + '</div>';
+            var erdDiv = erdContainer.querySelector('.diagram-erd');
+            if (erdDiv && erdDiv.nextSibling) {
+                erdContainer.insertBefore(mcdDiv, erdDiv.nextSibling);
+            } else {
+                erdContainer.appendChild(mcdDiv);
+            }
+        }
+    }
+
     // 2. State machine diagrams — inject in module spec sections or consol-datamodel
     if (diagrams.stateMachines && Object.keys(diagrams.stateMachines).length > 0) {
         const smContainer = document.getElementById('dataModelContainer');
@@ -5878,6 +6032,34 @@ function renderMermaidDiagrams() {
         }
     }
 
+    // 2b. Use Case diagrams — inject in each module's UC tab
+    if (diagrams.useCases && Object.keys(diagrams.useCases).length > 0) {
+        Object.entries(diagrams.useCases).forEach(function(entry) {
+            var moduleCode = entry[0];
+            var def = entry[1];
+            var ucTab = document.getElementById('tab-' + moduleCode + '-uc');
+            if (!ucTab) {
+                // Try kebab-case version
+                var kebab = moduleCode.replace(/([a-z0-9])([A-Z])/g, '$1-$2').toLowerCase();
+                ucTab = document.getElementById('tab-' + kebab + '-uc');
+            }
+            if (ucTab) {
+                var ucDiagramDiv = document.createElement('div');
+                ucDiagramDiv.className = 'diagram-container diagram-usecase';
+                ucDiagramDiv.innerHTML =
+                    '<div class="diagram-section-header" style="font-size:0.95rem;font-weight:600;color:var(--text-bright);margin-bottom:0.75rem;">Diagramme de cas d\'utilisation</div>' +
+                    '<div class="mermaid">' + escapeHtml(def) + '</div>';
+                // Insert after the first paragraph (description text)
+                var firstP = ucTab.querySelector('p');
+                if (firstP && firstP.nextSibling) {
+                    ucTab.insertBefore(ucDiagramDiv, firstP.nextSibling);
+                } else {
+                    ucTab.insertBefore(ucDiagramDiv, ucTab.firstChild);
+                }
+            }
+        });
+    }
+
     // 3. Sequence diagrams in consol-flows
     if (diagrams.sequences && Object.keys(diagrams.sequences).length > 0) {
         var flowsContainer = document.getElementById('consolFlowsContainer');