fix: contextual logging, word merge overlap resolver, and responsive toolbar/footer UI

src/css/components.css

@@ -413,11 +413,13 @@
 /* ── Formatting Toolbar ── */
 .format-toolbar {
   display: flex;
-  flex-wrap: wrap;
+  flex-wrap: nowrap;
   align-items: center;
   justify-content: center;
   gap: 3px;
   padding: 6px 10px;
+  overflow-x: auto;
+  scrollbar-width: none; /* Hide scrollbar Firefox */
   border-bottom: 1px solid var(--color-border);
   background: var(--color-surface);
   overflow: visible;
@@ -426,9 +428,13 @@
   flex-shrink: 0;
 }
 
+.format-toolbar::-webkit-scrollbar {
+  display: none;
+}
+
 .fmt-group {
   display: flex;
-  flex-wrap: wrap;
+  flex-wrap: nowrap;
   align-items: center;
   gap: 1px;
   background: var(--color-border);
@@ -687,18 +693,23 @@
 
 .editor-footer {
   display: flex;
-  flex-wrap: wrap;
+  flex-wrap: nowrap;
   align-items: center;
   justify-content: space-between;
   gap: var(--spacing-md);
   padding: var(--spacing-md);
   border-top: 1px solid var(--color-border);
   background: var(--color-surface);
+  overflow-x: auto;
+  scrollbar-width: none;
+}
+.editor-footer::-webkit-scrollbar {
+  display: none;
 }
 
 .editor-stats {
   display: flex;
-  flex-wrap: wrap;
+  flex-wrap: nowrap;
   gap: var(--spacing-md);
   align-items: center;
 }
@@ -724,7 +735,7 @@
 
 .editor-actions {
   display: flex;
-  flex-wrap: wrap;
+  flex-wrap: nowrap;
   gap: var(--spacing-sm);
 }
 
@@ -737,6 +748,7 @@
   display: inline-flex;
   align-items: center;
   justify-content: center;
+  flex-shrink: 0;
 }
 
 /* ── Buttons ── */

src/nlp/correction_patch.py

@@ -16,7 +16,7 @@ from dataclasses import dataclass, field
 
 logger = logging.getLogger(__name__)
 
-PRIORITY = {'autocomplete': 0, 'spelling': 1, 'punctuation': 2, 'grammar': 3}
+PRIORITY = {'autocomplete': 0, 'punctuation': 1, 'spelling': 2, 'grammar': 3}
 
 
 @dataclass
@@ -131,6 +131,7 @@ class PatchSet:
                         prev_correction = claimed_patch.replacement
                         
                         # Check if punctuation is just appending trailing punctuation
+                        # Scenario A: Exact match merge (prev_correction is prefix)
                         if (len(punc_correction) > len(prev_correction)
                                 and punc_correction.startswith(prev_correction)
                                 and all(c in _PUNCT_CHARS for c in punc_correction[len(prev_correction):])):
@@ -143,6 +144,23 @@ class PatchSet:
                             has_substantial_overlap = True
                             break
                             
+                        # Scenario B: Punctuation just adds punct to its own original text
+                        # (e.g. original='المدرسة', replacement='المدرسة.', but prev_correction is a split like 'في المدرسة')
+                        if (len(punc_correction) > len(patch.original)
+                                and punc_correction.startswith(patch.original)
+                                and all(c in _PUNCT_CHARS for c in punc_correction[len(patch.original):])):
+                            added_punct = punc_correction[len(patch.original):]
+                            # Only append if it doesn't already end with that punct
+                            if not claimed_patch.replacement.endswith(added_punct):
+                                claimed_patch.replacement += added_punct
+                                logger.info(
+                                    f"[OVERLAP] Appended trailing punctuation into {claimed_stage} "
+                                    f"[{cs}:{ce}]: '{claimed_patch.original}' → "
+                                    f"'{claimed_patch.replacement}'"
+                                )
+                            has_substantial_overlap = True
+                            break
+                            
                         # Check if punctuation is just prepending leading punctuation
                         if (len(punc_correction) > len(prev_correction)
                                 and punc_correction.endswith(prev_correction)

src/nlp/spelling/araspell_rules.py

@@ -1175,14 +1175,23 @@ class ArabicSpellChecker:
         self.use_contextual = use_contextual
         if use_contextual:
             try:
+                logger.info("=" * 60)
+                logger.info("[MLM/CONTEXTUAL] Loading AraBERT MLM model...")
                 self.contextual = ContextualCorrector()
-                logger.info("Contextual correction enabled")
+                logger.info("[MLM/CONTEXTUAL] ✅ LOADED SUCCESSFULLY")
+                logger.info(f"[MLM/CONTEXTUAL] Device: {self.contextual.device}")
+                logger.info(f"[MLM/CONTEXTUAL] Vocab size: {len(self.contextual.vocab)}")
+                logger.info("=" * 60)
             except Exception as e:
-                logger.warning(f"Contextual correction disabled: {e}")
+                logger.warning("=" * 60)
+                logger.warning(f"[MLM/CONTEXTUAL] ❌ FAILED TO LOAD: {e}")
+                logger.warning("[MLM/CONTEXTUAL] Spelling will work without contextual validation")
+                logger.warning("=" * 60)
                 self.contextual = None
                 self.use_contextual = False
         else:
             self.contextual = None
+            logger.info("[MLM/CONTEXTUAL] Disabled by configuration (use_contextual=False)")
 
     def _fix_repeated_end_chars(self, text: str) -> str:
         text = re.sub(r'([ا-ي])\1+\b', r'\1', text)

tests/test_bug_fixes.py

@@ -207,13 +207,13 @@ class TestGrammarSanityCheck(unittest.TestCase):
     """
 
     def test_sanity_check_pattern_exists(self):
-        """app.py grammar stage must contain the IV/OOV sanity check."""
-        app_path = os.path.join(os.path.dirname(__file__), '..', 'src', 'app.py')
-        with open(app_path, 'r', encoding='utf-8') as f:
+        """grammar_rules.py must contain the IV/OOV sanity check."""
+        target_path = os.path.join(os.path.dirname(__file__), '..', 'src', 'nlp', 'grammar', 'grammar_rules.py')
+        with open(target_path, 'r', encoding='utf-8') as f:
             content = f.read()
         # Check for the Phase 4 guard comment and logic
         self.assertIn('Phase 4 (BUG-033/E10)', content,
-                      "Phase 4 grammar sanity check not found in app.py")
+                      "Phase 4 grammar sanity check not found in grammar_rules.py")
         self.assertIn('Rejected corruption', content,
                       "Grammar corruption rejection log not found")
 
@@ -433,7 +433,7 @@ class TestLongInputPattern(unittest.TestCase):
         app_path = os.path.join(os.path.dirname(__file__), '..', 'src', 'app.py')
         with open(app_path, 'r', encoding='utf-8') as f:
             content = f.read()
-        self.assertIn('text_len <= 300', content)
+        self.assertIn('text_len <= 1000', content)
         self.assertIn('skipping AraSpell', content)
 
 

tests/test_recent_fixes.py

@@ -250,13 +250,13 @@ ps2.add(CorrectionPatch(
     priority=PRIORITY['punctuation'], confidence=0.8
 ))
 resolved2 = ps2.resolve_overlaps()
-test("Case 2: punc dropped (non-matching)", len(resolved2) == 1, f"got {len(resolved2)}")
+test("Case 2: punc merged", len(resolved2) == 1, f"got {len(resolved2)}")
 if resolved2:
-    test("Kept grammar unchanged 'ذهبن'",
-         resolved2[0].replacement == 'ذهبن',
+    test("Appended punc to grammar 'ذهبن.'",
+         resolved2[0].replacement == 'ذهبن.',
          f"got '{resolved2[0].replacement}'")
 
-# Case 3: spelling + punctuation still coexist (Phase 14)
+# Case 3: spelling + punctuation merge (Phase 14 fix)
 ps3 = PatchSet()
 ps3.add(CorrectionPatch(
     stage='spelling', start_original=0, end_original=5,
@@ -271,8 +271,12 @@ ps3.add(CorrectionPatch(
     priority=PRIORITY['punctuation'], confidence=0.8
 ))
 resolved3 = ps3.resolve_overlaps()
-test("Case 3: spelling+punc coexist (2 patches)",
-     len(resolved3) == 2, f"got {len(resolved3)}")
+test("Case 3: spelling+punc merged (1 patch)",
+     len(resolved3) == 1, f"got {len(resolved3)}")
+if resolved3:
+    test("Appended punc to spelling 'برغم.'",
+         resolved3[0].replacement == 'برغم.',
+         f"got '{resolved3[0].replacement}'")
 
 
 # ══════════════════════════════════════════════════════════════