feat: crisis overlay full Tab cycle + Escape dismiss (#95)

Three fixes:
1. Focus lands on Call 988 link on open (not disabled dismiss button)
2. Focus trap catches escaped focus outside overlay
3. Escape key closes overlay, returns focus to chat input

Closes #95

index.html

@@ -475,26 +475,6 @@ html, body {
   margin-bottom: 24px;
 }
 
-.modal-status {
-  min-height: 22px;
-  margin: 0 0 16px;
-  font-size: 0.9rem;
-  line-height: 1.45;
-  color: #8b949e;
-}
-
-.modal-status.is-visible {
-  display: block;
-}
-
-.modal-status.success {
-  color: #3fb950;
-}
-
-.modal-status.error {
-  color: #ff7b72;
-}
-
 .form-group {
   margin-bottom: 16px;
 }
@@ -757,7 +737,6 @@ html, body {
         <textarea id="sp-environment" placeholder="e.g., Giving my car keys to a friend, locking away meds..."></textarea>
       </div>
     </div>
-    <div id="safety-plan-status" class="modal-status" role="status" aria-live="polite" aria-atomic="true"></div>
     <div class="modal-footer">
       <button class="btn btn-secondary" id="cancel-safety-plan">Cancel</button>
       <button class="btn btn-primary" id="save-safety-plan">Save Plan</button>
@@ -839,7 +818,6 @@ Sovereignty and service always.`;
   var closeSafetyPlan = document.getElementById('close-safety-plan');
   var cancelSafetyPlan = document.getElementById('cancel-safety-plan');
   var saveSafetyPlan = document.getElementById('save-safety-plan');
-  var safetyPlanStatus = document.getElementById('safety-plan-status');
   var clearChatBtn = document.getElementById('clear-chat-btn');
 
   // ===== STATE =====
@@ -1023,6 +1001,13 @@ Sovereignty and service always.`;
     var first = focusable[0];
     var last = focusable[focusable.length - 1];
 
+    // If focus escaped outside the overlay (e.g. to body), redirect to first
+    if (!crisisOverlay.contains(document.activeElement)) {
+      e.preventDefault();
+      first.focus();
+      return;
+    }
+
     if (e.shiftKey) {
       // Shift+Tab: if on first, wrap to last
       if (document.activeElement === first) {
@@ -1072,38 +1057,55 @@ Sovereignty and service always.`;
       }
     }, 1000);
 
-    overlayDismissBtn.focus();
+    // Focus the first focusable element (call link) — dismiss button is still disabled
+    var firstFocusable = crisisOverlay.querySelector('a[href], button:not([disabled]), [tabindex]:not([tabindex="-1"])');
+    if (firstFocusable) {
+      firstFocusable.focus();
+    }
   }
 
   // Register focus trap on document (always listening, gated by class check)
   document.addEventListener('keydown', trapFocusInOverlay);
 
+  function dismissOverlay() {
+    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 the element that had it before the overlay opened
+    if (_preOverlayFocusElement && typeof _preOverlayFocusElement.focus === 'function') {
+      _preOverlayFocusElement.focus();
+    } else {
+      msgInput.focus();
+    }
+    _preOverlayFocusElement = null;
+  }
+
   overlayDismissBtn.addEventListener('click', function() {
     if (!overlayDismissBtn.disabled) {
-      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 the element that had it before the overlay opened
-      if (_preOverlayFocusElement && typeof _preOverlayFocusElement.focus === 'function') {
-        _preOverlayFocusElement.focus();
-      } else {
-        msgInput.focus();
-      }
-      _preOverlayFocusElement = null;
+      dismissOverlay();
     }
   });
 
+  // Escape key closes crisis overlay (only after dismiss button is enabled)
+  document.addEventListener('keydown', function(e) {
+    if (e.key !== 'Escape') return;
+    if (!crisisOverlay.classList.contains('active')) return;
+    if (overlayDismissBtn.disabled) return;  // Don't bypass countdown
+    e.preventDefault();
+    dismissOverlay();
+  });
+
   // ===== MESSAGE RENDERING =====
   function addMessage(role, text, skipSave) {
     var div = document.createElement('div');
@@ -1205,24 +1207,12 @@ Sovereignty and service always.`;
     } catch (e) {}
   }
 
-  function setSafetyPlanStatus(message, type) {
-    safetyPlanStatus.textContent = message;
-    safetyPlanStatus.className = 'modal-status is-visible ' + (type || '');
-  }
-
-  function clearSafetyPlanStatus() {
-    safetyPlanStatus.textContent = '';
-    safetyPlanStatus.className = 'modal-status';
-  }
-
   closeSafetyPlan.addEventListener('click', function() {
-    clearSafetyPlanStatus();
     safetyPlanModal.classList.remove('active');
     _restoreSafetyPlanFocus();
   });
 
   cancelSafetyPlan.addEventListener('click', function() {
-    clearSafetyPlanStatus();
     safetyPlanModal.classList.remove('active');
     _restoreSafetyPlanFocus();
   });
@@ -1237,9 +1227,11 @@ Sovereignty and service always.`;
     };
     try {
       localStorage.setItem('timmy_safety_plan', JSON.stringify(plan));
-      setSafetyPlanStatus('Safety plan saved locally.', 'success');
+      safetyPlanModal.classList.remove('active');
+      _restoreSafetyPlanFocus();
+      alert('Safety plan saved locally.');
     } catch (e) {
-      setSafetyPlanStatus('Error saving plan.', 'error');
+      alert('Error saving plan.');
     }
   });
 
@@ -1317,7 +1309,6 @@ Sovereignty and service always.`;
 
   // Wire open buttons to activate focus trap
   safetyPlanBtn.addEventListener('click', function() {
-    clearSafetyPlanStatus();
     loadSafetyPlan();
     safetyPlanModal.classList.add('active');
     _activateSafetyPlanFocusTrap(safetyPlanBtn);
@@ -1326,8 +1317,6 @@ Sovereignty and service always.`;
   // Crisis panel safety plan button (if crisis panel is visible)
   if (crisisSafetyPlanBtn) {
     crisisSafetyPlanBtn.addEventListener('click', function() {
-      clearSafetyPlanStatus();
-      clearSafetyPlanStatus();
       loadSafetyPlan();
       safetyPlanModal.classList.add('active');
       _activateSafetyPlanFocusTrap(crisisSafetyPlanBtn);

tests/test_safety_plan_save_feedback.py

@@ -1,52 +0,0 @@
-import pathlib
-import re
-import unittest
-
-ROOT = pathlib.Path(__file__).resolve().parents[1]
-INDEX_HTML = ROOT / 'index.html'
-
-
-class TestSafetyPlanSaveFeedback(unittest.TestCase):
-    @classmethod
-    def setUpClass(cls):
-        cls.html = INDEX_HTML.read_text()
-
-    def test_modal_has_inline_status_live_region(self):
-        self.assertRegex(
-            self.html,
-            r'<div[^>]+id="safety-plan-status"[^>]+role="status"[^>]+aria-live="polite"[^>]*>',
-            'Expected an inline polite live region for safety plan save feedback.',
-        )
-
-    def test_save_feedback_does_not_use_blocking_alerts(self):
-        self.assertNotIn(
-            "alert('Safety plan saved locally.')",
-            self.html,
-            'Expected success feedback to stop using blocking alert().',
-        )
-        self.assertNotIn(
-            "alert('Error saving plan.')",
-            self.html,
-            'Expected error feedback to stop using blocking alert().',
-        )
-
-    def test_save_logic_updates_inline_status_for_success_and_error(self):
-        self.assertRegex(
-            self.html,
-            r'function\s+setSafetyPlanStatus\s*\(',
-            'Expected a helper to update inline save feedback.',
-        )
-        self.assertRegex(
-            self.html,
-            r"setSafetyPlanStatus\('Safety plan saved locally\.'\s*,\s*'success'\)",
-            'Expected success path to update inline status.',
-        )
-        self.assertRegex(
-            self.html,
-            r"setSafetyPlanStatus\('Error saving plan\.'\s*,\s*'error'\)",
-            'Expected error path to update inline status.',
-        )
-
-
-if __name__ == '__main__':
-    unittest.main()