fix: add chat-header safety plan access (#38)

Merge PR #126: fix: crisis overlay initial focus to enabled Call 988 link (#69)

index.html

@@ -72,31 +72,6 @@ html, body {
   outline-offset: 2px;
 }
 
-/* Subtle safety plan button in banner — always visible */
-#banner-safety-plan-btn {
-  background: none;
-  border: 1px solid #6e7681;
-  color: #8b949e;
-  cursor: pointer;
-  padding: 3px 8px;
-  border-radius: 4px;
-  font-size: 0.75rem;
-  display: flex;
-  align-items: center;
-  gap: 4px;
-  transition: background 0.2s, border-color 0.2s, color 0.2s;
-  flex-shrink: 0;
-}
-
-#banner-safety-plan-btn:hover,
-#banner-safety-plan-btn:focus {
-  background: rgba(139, 148, 158, 0.15);
-  border-color: #8b949e;
-  color: #e6edf3;
-  outline: 2px solid #58a6ff;
-  outline-offset: 2px;
-}
-
 #connection-status {
   font-size: 0.7rem;
   color: #6e7681;
@@ -266,6 +241,48 @@ html, body {
   opacity: 0.5;
 }
 
+/* ===== CHAT HEADER ===== */
+#chat-header {
+  flex-shrink: 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  padding: 10px 12px;
+  border-bottom: 1px solid #21262d;
+  background: #11161d;
+}
+
+.chat-header-title {
+  font-size: 0.85rem;
+  color: #8b949e;
+  font-weight: 600;
+  letter-spacing: 0.02em;
+}
+
+#chat-safety-plan-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 8px 12px;
+  min-height: 36px;
+  border: 1px solid #30363d;
+  border-radius: 999px;
+  background: transparent;
+  color: #c9d1d9;
+  font-size: 0.8rem;
+  font-weight: 600;
+  cursor: pointer;
+}
+
+#chat-safety-plan-btn:hover,
+#chat-safety-plan-btn:focus {
+  border-color: #58a6ff;
+  background: rgba(88, 166, 255, 0.12);
+  outline: 2px solid #58a6ff;
+  outline-offset: 2px;
+}
+
 /* ===== CHAT AREA ===== */
 #chat-area {
   flex: 1;
@@ -650,10 +667,6 @@ html, body {
     <a href="tel:988" aria-label="Call 988 Suicide and Crisis Lifeline">
       988 Suicide &amp; Crisis Lifeline — Call or text 988
     </a>
-    <button id="banner-safety-plan-btn" aria-label="Open my safety plan" title="My Safety Plan">
-      <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/><polyline points="10 9 9 9 8 9"/></svg>
-      <span class="sr-only">My Safety Plan</span>
-    </button>
     <div id="connection-status" aria-hidden="true">
       <span class="status-dot"></span>
       <span id="status-text">Online</span>
@@ -678,6 +691,14 @@ html, body {
     </div>
   </div>
 
+  <div id="chat-header">
+    <div class="chat-header-title" aria-hidden="true">Conversation</div>
+    <button id="chat-safety-plan-btn" type="button" aria-label="Open My Safety Plan from chat header">
+      <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/><polyline points="10 9 9 9 8 9"/></svg>
+      My Safety Plan
+    </button>
+  </div>
+
   <!-- Chat messages -->
   <div id="chat-area" role="log" aria-label="Chat messages" aria-live="polite" tabindex="0">
     <!-- Messages inserted here -->
@@ -837,13 +858,14 @@ Sovereignty and service always.`;
   var crisisPanel = document.getElementById('crisis-panel');
   var crisisOverlay = document.getElementById('crisis-overlay');
   var overlayDismissBtn = document.getElementById('overlay-dismiss-btn');
+  var overlayCallLink = document.querySelector('.overlay-call');
   var statusDot = document.querySelector('.status-dot');
   var statusText = document.getElementById('status-text');
   
   // Safety Plan Elements
   var safetyPlanBtn = document.getElementById('safety-plan-btn');
+  var chatSafetyPlanBtn = document.getElementById('chat-safety-plan-btn');
   var crisisSafetyPlanBtn = document.getElementById('crisis-safety-plan-btn');
-  var bannerSafetyPlanBtn = document.getElementById('banner-safety-plan-btn');
   var safetyPlanModal = document.getElementById('safety-plan-modal');
   var closeSafetyPlan = document.getElementById('close-safety-plan');
   var cancelSafetyPlan = document.getElementById('cancel-safety-plan');
@@ -1080,7 +1102,8 @@ Sovereignty and service always.`;
       }
     }, 1000);
 
-    overlayDismissBtn.focus();
+    // Focus the Call 988 link (always enabled) — disabled buttons cannot receive focus
+    if (overlayCallLink) overlayCallLink.focus();
   }
 
   // Register focus trap on document (always listening, gated by class check)
@@ -1313,28 +1336,25 @@ Sovereignty and service always.`;
     _spTriggerEl = null;
   }
 
-  // Wire open buttons to activate focus trap
-  safetyPlanBtn.addEventListener('click', function() {
+  function openSafetyPlan(triggerEl) {
     loadSafetyPlan();
     safetyPlanModal.classList.add('active');
-    _activateSafetyPlanFocusTrap(safetyPlanBtn);
+    _activateSafetyPlanFocusTrap(triggerEl || document.activeElement);
+  }
+
+  // Wire open buttons to activate focus trap
+  safetyPlanBtn.addEventListener('click', function() {
+    openSafetyPlan(safetyPlanBtn);
+  });
+
+  chatSafetyPlanBtn.addEventListener('click', function() {
+    openSafetyPlan(chatSafetyPlanBtn);
   });
 
   // Crisis panel safety plan button (if crisis panel is visible)
   if (crisisSafetyPlanBtn) {
     crisisSafetyPlanBtn.addEventListener('click', function() {
-      loadSafetyPlan();
-      safetyPlanModal.classList.add('active');
-      _activateSafetyPlanFocusTrap(crisisSafetyPlanBtn);
-    });
-  }
-
-  // Banner safety plan button — always visible in header
-  if (bannerSafetyPlanBtn) {
-    bannerSafetyPlanBtn.addEventListener('click', function() {
-      loadSafetyPlan();
-      safetyPlanModal.classList.add('active');
-      _activateSafetyPlanFocusTrap(bannerSafetyPlanBtn);
+      openSafetyPlan(crisisSafetyPlanBtn);
     });
   }
 
@@ -1481,9 +1501,7 @@ Sovereignty and service always.`;
     // Check for URL params (e.g., ?safetyplan=true for PWA shortcut)
     var urlParams = new URLSearchParams(window.location.search);
     if (urlParams.get('safetyplan') === 'true') {
-      loadSafetyPlan();
-      safetyPlanModal.classList.add('active');
-      _activateSafetyPlanFocusTrap(safetyPlanBtn);
+      openSafetyPlan(chatSafetyPlanBtn || safetyPlanBtn);
       // Clean up URL
       window.history.replaceState({}, document.title, window.location.pathname);
     }

tests/test_crisis_overlay_focus_trap.py

@@ -52,6 +52,34 @@ class TestCrisisOverlayFocusTrap(unittest.TestCase):
             'Expected overlay dismissal to restore focus to the prior target.',
         )
 
+    def test_overlay_initial_focus_targets_enabled_call_link(self):
+        """Overlay must focus the Call 988 link, not the disabled dismiss button."""
+        # Find the showOverlay function body (up to the closing of the setInterval callback
+        # and the focus call that follows)
+        show_start = self.html.find('function showOverlay()')
+        self.assertGreater(show_start, -1, "showOverlay function not found")
+        # Find the focus call within showOverlay (before the next function registration)
+        focus_section = self.html[show_start:show_start + 2000]
+        self.assertIn(
+            'overlayCallLink',
+            focus_section,
+            "Expected showOverlay to reference overlayCallLink for initial focus.",
+        )
+        # Ensure the old buggy pattern is gone
+        focus_line_region = self.html[show_start + 800:show_start + 1200]
+        self.assertNotIn(
+            'overlayDismissBtn.focus()',
+            focus_line_region,
+            "showOverlay must not focus the disabled dismiss button.",
+        )
+
+    def test_overlay_call_link_variable_is_declared(self):
+        self.assertIn(
+            "querySelector('.overlay-call')",
+            self.html,
+            "Expected a JS reference to the .overlay-call link element.",
+        )
+
 
 if __name__ == '__main__':
     unittest.main()

tests/test_safety_plan_chat_header.py

@@ -0,0 +1,20 @@
+from pathlib import Path
+
+INDEX = Path("index.html")
+
+
+def test_chat_header_has_persistent_safety_plan_button():
+    html = INDEX.read_text()
+    assert 'id="chat-header"' in html
+    assert 'id="chat-safety-plan-btn"' in html
+    assert 'aria-label="Open My Safety Plan from chat header"' in html
+    assert 'My Safety Plan' in html
+
+
+def test_chat_header_button_opens_existing_safety_plan_modal():
+    html = INDEX.read_text()
+    assert "var chatSafetyPlanBtn = document.getElementById('chat-safety-plan-btn');" in html
+    assert "chatSafetyPlanBtn.addEventListener('click'" in html
+    assert "function openSafetyPlan(triggerEl)" in html
+    assert "safetyPlanModal.classList.add('active');" in html
+    assert "openSafetyPlan(chatSafetyPlanBtn);" in html

tests/test_service_worker_offline.py

@@ -50,6 +50,22 @@ class TestCrisisOfflinePage(unittest.TestCase):
         for phrase in required_phrases:
             self.assertIn(phrase, self.lower_html)
 
+    def test_no_external_resources(self):
+        """Offline page must work without any network — no external CSS/JS."""
+        import re
+        html = self.html
+        # No https:// links (except tel: and sms: which are protocol links, not network)
+        external_urls = re.findall(r'href=["\']https://|src=["\']https://', html)
+        self.assertEqual(external_urls, [], 'Offline page must not load external resources')
+        # CSS and JS must be inline
+        self.assertIn('<style>', html, 'CSS must be inline')
+        self.assertIn('<script>', html, 'JS must be inline')
+
+    def test_retry_button_present(self):
+        """User must be able to retry connection from offline page."""
+        self.assertIn('retry-connection', self.html)
+        self.assertIn('Retry connection', self.html)
+
 
 if __name__ == '__main__':
     unittest.main()