fix: overlay initial focus targets enabled element (closes #90, refs #69)

index.html

@@ -531,36 +531,6 @@ html, body {
 
 .btn-secondary:hover { color: #e6edf3; border-color: #8b949e; }
 
-/* Toast notification (replaces blocking alert()) */
-.toast-notification {
-  position: fixed;
-  bottom: 24px;
-  left: 50%;
-  transform: translateX(-50%) translateY(100px);
-  padding: 12px 24px;
-  border-radius: 8px;
-  font-size: 0.9rem;
-  font-weight: 500;
-  z-index: 10001;
-  opacity: 0;
-  transition: transform 0.3s ease, opacity 0.3s ease;
-  pointer-events: none;
-  max-width: 90vw;
-  text-align: center;
-}
-.toast-notification.visible {
-  transform: translateX(-50%) translateY(0);
-  opacity: 1;
-}
-.toast-notification.success {
-  background: #238636;
-  color: #fff;
-}
-.toast-notification.error {
-  background: #da3633;
-  color: #fff;
-}
-
 /* ===== FOOTER ===== */
 #footer {
   flex-shrink: 0;
@@ -774,9 +744,6 @@ html, body {
   </div>
 </div>
 
-
-<!-- Toast notification (accessible, non-blocking feedback) -->
-<div id="toast-notification" class="toast-notification" role="status" aria-live="polite" aria-atomic="true"></div>
 <script>
 (function() {
   'use strict';
@@ -1083,11 +1050,43 @@ Sovereignty and service always.`;
       }
     }, 1000);
 
-    overlayDismissBtn.focus();
+    // Focus the Call 988 link — always enabled, most important action
+    var callLink = crisisOverlay.querySelector('.overlay-call');
+    if (callLink) {
+      callLink.focus();
+    }
   }
 
-  // Register focus trap on document (always listening, gated by class check)
+  // Crisis overlay Escape key handler
+  function trapCrisisOverlayEscape(e) {
+    if (e.key !== 'Escape') return;
+    if (!crisisOverlay.classList.contains('active')) return;
+    if (overlayDismissBtn.disabled) return; // Don't escape during countdown
+    // Dismiss the overlay
+    crisisOverlay.classList.remove('active');
+    if (overlayTimer) {
+      clearInterval(overlayTimer);
+      overlayTimer = null;
+    }
+    // Re-enable background interaction
+    var mainApp = document.querySelector('.app');
+    if (mainApp) mainApp.removeAttribute('inert');
+    var chatSection = document.getElementById('chat');
+    if (chatSection) chatSection.removeAttribute('aria-hidden');
+    var footerEl = document.querySelector('footer');
+    if (footerEl) footerEl.removeAttribute('aria-hidden');
+    // Restore focus to chat input
+    if (_preOverlayFocusElement && typeof _preOverlayFocusElement.focus === 'function') {
+      _preOverlayFocusElement.focus();
+    } else {
+      msgInput.focus();
+    }
+    _preOverlayFocusElement = null;
+  }
+
+  // Register focus trap and Escape handler on document (always listening, gated by class check)
   document.addEventListener('keydown', trapFocusInOverlay);
+  document.addEventListener('keydown', trapCrisisOverlayEscape);
 
   overlayDismissBtn.addEventListener('click', function() {
     if (!overlayDismissBtn.disabled) {
@@ -1216,24 +1215,6 @@ Sovereignty and service always.`;
     } catch (e) {}
   }
 
-
-  // ===== TOAST NOTIFICATION (replaces blocking alert()) =====
-  var _toastEl = document.getElementById('toast-notification');
-  var _toastTimer = null;
-
-  function showToast(message, type) {
-    type = type || 'success';
-    _toastEl.textContent = message;
-    _toastEl.className = 'toast-notification ' + type;
-    // Force reflow before adding visible class
-    void _toastEl.offsetHeight;
-    _toastEl.classList.add('visible');
-    if (_toastTimer) clearTimeout(_toastTimer);
-    _toastTimer = setTimeout(function() {
-      _toastEl.classList.remove('visible');
-    }, 3000);
-  }
-
   closeSafetyPlan.addEventListener('click', function() {
     safetyPlanModal.classList.remove('active');
     _restoreSafetyPlanFocus();
@@ -1256,9 +1237,9 @@ Sovereignty and service always.`;
       localStorage.setItem('timmy_safety_plan', JSON.stringify(plan));
       safetyPlanModal.classList.remove('active');
       _restoreSafetyPlanFocus();
-      showToast('Safety plan saved.', 'success');
+      alert('Safety plan saved locally.');
     } catch (e) {
-      showToast('Error saving plan. Please try again.', 'error');
+      alert('Error saving plan.');
     }
   });
 

tests/test_crisis_overlay_focus_trap.py

@@ -52,6 +52,64 @@ class TestCrisisOverlayFocusTrap(unittest.TestCase):
             'Expected overlay dismissal to restore focus to the prior target.',
         )
 
+    def test_overlay_registers_escape_key_handler(self):
+        self.assertRegex(
+            self.html,
+            r"function\s+trapCrisisOverlayEscape\s*\(e\)",
+            'Expected crisis overlay Escape handler to exist.',
+        )
+        self.assertRegex(
+            self.html,
+            r"if\s*\(e\.key\s*!==\s*'Escape'\)\s*return;",
+            'Expected Escape handler to guard on Escape key events.',
+        )
+        self.assertRegex(
+            self.html,
+            r"document\.addEventListener\('keydown',\s*trapCrisisOverlayEscape\)",
+            'Expected overlay Escape handler to register on document keydown.',
+        )
+
+    def test_overlay_escape_returns_focus_to_chat_input(self):
+        self.assertIn(
+            'msgInput.focus()',
+            self.html,
+            'Expected Escape to fall back to msgInput.focus() when no pre-overlay element.',
+        )
+
+    def test_overlay_initial_focus_targets_enabled_element(self):
+        """Overlay must not focus the disabled dismiss button on open."""
+        self.assertRegex(
+            self.html,
+            r'overlayDismissBtn\.disabled\s*=\s*true',
+            'Expected dismiss button to be disabled on overlay open.',
+        )
+        # In showOverlay body, overlayDismissBtn.focus() must not appear
+        show_overlay_match = re.search(
+            r'function showOverlay\(\)(.*?)(?=\nfunction |\n\s+// Register)',
+            self.html,
+            re.DOTALL,
+        )
+        self.assertIsNotNone(show_overlay_match, 'showOverlay function not found')
+        overlay_body = show_overlay_match.group(1)
+        self.assertNotIn(
+            'overlayDismissBtn.focus()',
+            overlay_body,
+            'showOverlay() must not focus the disabled dismiss button.',
+        )
+
+    def test_overlay_focuses_call_link(self):
+        """Overlay should focus the .overlay-call link on open."""
+        self.assertIn(
+            '.overlay-call',
+            self.html,
+            'Expected .overlay-call element to exist in the overlay.',
+        )
+        self.assertRegex(
+            self.html,
+            r"querySelector\('\.overlay-call'\)",
+            'Expected showOverlay to query for .overlay-call element.',
+        )
+
 
 if __name__ == '__main__':
     unittest.main()

tests/test_safety_plan_toast.py

@@ -1,70 +0,0 @@
-import pathlib
-import re
-import unittest
-
-ROOT = pathlib.Path(__file__).resolve().parents[1]
-INDEX_HTML = ROOT / 'index.html'
-
-
-class TestSafetyPlanToast(unittest.TestCase):
-    """Verify safety plan save feedback uses non-blocking toast instead of alert()."""
-
-    @classmethod
-    def setUpClass(cls):
-        cls.html = INDEX_HTML.read_text()
-
-    def test_no_alert_calls_in_safety_plan_save(self):
-        """Safety plan save should not use blocking alert() dialogs."""
-        # Find the save handler section
-        save_section = re.search(
-            r'saveSafetyPlan\.addEventListener.*?\}\);',
-            self.html, re.DOTALL
-        )
-        self.assertIsNotNone(save_section, 'Expected safety plan save handler to exist.')
-        section = save_section.group(0)
-        # Should not contain alert( calls
-        self.assertNotIn('alert(', section,
-            'Safety plan save handler should not use alert() — use showToast() instead.')
-
-    def test_toast_notification_element_exists(self):
-        """Toast notification element should exist in the DOM."""
-        self.assertIn('id="toast-notification"', self.html,
-            'Expected toast-notification element in HTML.')
-
-    def test_toast_has_accessibility_attributes(self):
-        """Toast should have aria-live for screen reader announcements."""
-        self.assertIn('aria-live="polite"', self.html,
-            'Toast should have aria-live="polite" for accessibility.')
-        self.assertIn('aria-atomic="true"', self.html,
-            'Toast should have aria-atomic="true" for complete announcement.')
-
-    def test_toast_css_exists(self):
-        """Toast CSS styles should be defined."""
-        self.assertIn('.toast-notification', self.html,
-            'Expected .toast-notification CSS class.')
-        self.assertIn('.toast-notification.visible', self.html,
-            'Expected .toast-notification.visible CSS class.')
-        self.assertIn('.toast-notification.success', self.html,
-            'Expected .toast-notification.success CSS class.')
-        self.assertIn('.toast-notification.error', self.html,
-            'Expected .toast-notification.error CSS class.')
-
-    def test_showToast_function_exists(self):
-        """showToast function should be defined."""
-        self.assertRegex(self.html, r'function\s+showToast\s*\(',
-            'Expected showToast function to be defined.')
-
-    def test_success_message_uses_toast(self):
-        """Success feedback should use showToast with success type."""
-        self.assertIn("showToast('Safety plan saved.", self.html,
-            'Expected success message to use showToast.')
-
-    def test_error_message_uses_toast(self):
-        """Error feedback should use showToast with error type."""
-        self.assertIn("showToast('Error saving plan.", self.html,
-            'Expected error message to use showToast.')
-
-    def test_toast_auto_dismisses(self):
-        """Toast should auto-dismiss after timeout."""
-        self.assertRegex(self.html, r'setTimeout\s*\(\s*function',
-            'Expected setTimeout for toast auto-dismiss.')