feat: cache offline crisis resources (closes #41)

crisis/detect.py

@@ -51,13 +51,13 @@ HIGH_INDICATORS = [
     r"\bwish\s+I\s+(?:was|were)\s+(?:dead|gone|never\s+born)\b",
     r"\bdon'?t\s+matter\s+if\s+I\s+exist\b",
     r"\bno\s+one\s+would\s+(?:care|miss)\b",
-    r"\bworld\s+would?\s+be\s+better\s+without\s+me\b",
-    r"\bin\s+so\s+much\s+(?:pain|agony|suffering|torment|anguish)\b",
-    r"\bcan'?t\s+see\s+any\s+(?:point|reason|hope|way)\b",
+    r"\bworld\s+would?\s+be\s+better\s+without\b",
+    r"\bin\s+so\s+much\s+(?:pain|agony|suffering|torment)\b",
+    r"\bcan'?t\s+see\s+any\s+(?:point|reason)\b",
     r"\bescape\s+from\s*this",
     r"\bjust\s+want\s+it\s+to\s+stop\b",
+    r"\btrapped\s+(?:in\s+(?:my|this|a\s+dark)|and\s+can'?t\s+escape)\b",
     r"\bnothing\s+left\s+(?:to\s+(?:live\s+for|hope\s+for|give)|inside)\b",
-    r"\bdisappeared\s+forever\b",
     # Contextual despair phrases (from crisis_detector.py legacy)
     r"\bfeel(?:s|ing)?\s+(?:so\s+)?hopeless\b",
     r"\beverything\s+is\s+hopeless\b",
@@ -68,8 +68,6 @@ HIGH_INDICATORS = [
     r"\bno\s*hope\s+(?:left|remaining)\b",
     r"\bno\s*way\s*out\b",
     r"\bfeel(?:s|ing)?\s+trapped\b",
-    r"\btrapped\s+in\s+this\s+(?:situation|life|pain|darkness|hell)\b",
-    r"\btrapped\s+and\s+can'?t\s+escape\b",
     r"\bdesperate\s+(?:for\s+)?help\b",
     r"\bfeel(?:s|ing)?\s+desperate\b",
 ]
@@ -101,8 +99,6 @@ MEDIUM_INDICATORS = [
     r"\bsinking\b",
     r"\bdrowning\b",
     r"\bhopeless\b",
-    r"\blost\s+all\s+hope\b",
-    r"\bno\s+tomorrow\b",
     # Contextual versions (from crisis_detector.py legacy)
     r"\bfeel(?:s|ing)?\s+(?:so\s+)?worthless\b",
     r"\bfeel(?:s|ing)?\s+(?:so\s+)?hopeless\b",
@@ -116,7 +112,7 @@ MEDIUM_INDICATORS = [
 LOW_INDICATORS = [
     r"\bunhappy\b",
     r"\bdown\b",
-    r"\btough\s*(?:time|day|week)\b",
+    r"\btough\s*time\b",
     r"\brough\s+(?:day|week|patch)\b",
     r"\bstressed\b",
     r"\bburnout\b",
@@ -126,8 +122,6 @@ LOW_INDICATORS = [
     r"\btired\b",
     r"\bsad\b",
     r"\bupset\b",
-    r"\blonely\b",
-    r"\banxious?\b",
     r"\bnot\s*(?:good|great|okay)\b",
     r"\bthings\s*are\s*hard\b",
     r"\bstruggling\b",

dying_detection/__init__.py

@@ -1,34 +1,31 @@
 """
-DEPRECATED — Use crisis.detect instead.
+When a Man Is Dying — Despair/Suicide Detection System
 
-This module is a thin wrapper around crisis.detect for backward compatibility.
-All unique patterns have been merged into crisis/detect.py (see issue #40).
+Standalone detection module that parses incoming text for
+despair and suicide indicators, classifies into tiers,
+and returns structured response with recommended actions.
 
-This module will be removed in a future release.
+Tiers:
+  LOW      — General sadness, stress, difficult times
+  MEDIUM   — Hopelessness, isolation, worthlessness
+  HIGH     — Active despair, mentions of death, "can't go on"
+  CRITICAL — Imminent risk, explicit intent, plan, method
+
+Integration:
+  Designed to work with crisis/ module from PR #4.
+  When crisis/ is available, uses it as the detection backend.
+  Falls back to internal detection when crisis/ is not present.
 """
 
-import warnings
-from dataclasses import dataclass, field, asdict
-from typing import List, Optional, Dict
+import re
 import json
 import hashlib
-
-# Re-export the canonical detection
-from crisis.detect import detect_crisis, CrisisDetectionResult
-
-# Issue deprecation warning on import
-warnings.warn(
-    "dying_detection is deprecated. Use 'from crisis.detect import detect_crisis' instead. "
-    "All patterns have been consolidated into crisis/detect.py. "
-    "See issue #40.",
-    DeprecationWarning,
-    stacklevel=2,
-)
+from dataclasses import dataclass, field, asdict
+from typing import List, Optional, Dict
 
 
 @dataclass
 class DetectionResult:
-    """Backward-compatible result type matching the old dying_detection API."""
     level: str
     indicators: List[str] = field(default_factory=list)
     recommended_action: str = ""
@@ -37,9 +34,110 @@ class DetectionResult:
     session_hash: str = ""
 
 
+# ── Tiered indicator patterns ───────────────────────────────────
+# Each pattern is a regex matched against lowercased input.
+
+CRITICAL_PATTERNS = [
+    (r"\bkill\s*(my)?self\b", "explicit self-harm intent"),
+    (r"\bsuicid(?:al|ed|e)\b", "suicide reference"),
+    (r"\bend\s*(my)?\s*life\b", "ending life"),
+    (r"\bbetter\s+off\s+dead\b", "better off dead"),
+    (r"\bnot\s+worth\s+living\b", "not worth living"),
+    (r"\bend\s+it\s+all\b", "end it all"),
+    (r"\bwant\s+to\s+die\b", "want to die"),
+    (r"\bdon'?t\s+want\s+to\s+live\b", "don't want to live"),
+    (r"\bcan'?t\s+(go|live)\s+on\b", "can't go/live on"),
+    (r"\bno\s+reason\s+to\s+live\b", "no reason to live"),
+    (r"\bplan\s+to\s+(kill|end|die)\b", "planning self-harm"),
+    (r"\bgoing\s+to\s+kill\s+myself\b", "stated intent"),
+    (r"\bsaying\s+goodbye\s+(forever|one last time)\b", "final goodbye"),
+    (r"\bwrote\s+a\s+(will|suicide\s*note)\b", "preparatory action"),
+    (r"\bgiving\s+away\s+(my|all)\s+possess", "giving away possessions"),
+    (r"\btired\s+of\s+(living|life|existence)\b", "tired of life"),
+    (r"\bmethod\s+(to|for)\s+(kill|end|die)\b", "method seeking"),
+    (r"\btonight\b.*\b(die|kill|end|suicid)", "immediate timeframe + intent"),
+    (r"\b(die|kill|end)\b.*\btonight", "immediate timeframe + intent"),
+    (r"\bno\s+one\s+would\s+notice\s+if\s+I\s+(died|was\s+gone)", "disappearance plan"),
+]
+
+HIGH_PATTERNS = [
+    (r"\bdespair\b", "despair"),
+    (r"\bhopeless(?:ness)?\b", "hopelessness"),
+    (r"\bcan'?t\s+take\s+this\s+anymore\b", "can't take it"),
+    (r"\bdon'?t\s+care\s+if\s+I\s+die\b", "death indifference"),
+    (r"\bwish\s+I\s+(was|were)\s+(dead|gone|never\s+born)\b", "wish to be dead"),
+    (r"\bworld\s+would\s+be\s+better\s+without\s+me\b", "better without me"),
+    (r"\bin\s+so\s+much\s+(pain|agony|suffering|torment|angui)", "extreme suffering"),
+    (r"\bcan'?t\s+see\s+any\s+(point|reason|light|hope|way)\b", "no light ahead"),
+    (r"\btrapped\b", "feeling trapped"),
+    (r"\bjust\s+want\s+it\s+to\s+stop\b", "want to stop"),
+    (r"\bno\s+way\s+out\b", "no way out"),
+    (r"\bno\s+one\s+would\s+(care|miss)\b", "no one would care/miss"),
+    (r"\beverything\s+is\s+(pointless|broken|ruined|meaningless)\b", "existential collapse"),
+    (r"\bno\s+point\s+in\s+anything\b", "pointlessness"),
+    (r"\bno\s+one\s+would\s+notice\s+if\s+I\s+(died|was\s+gone|disappeared)", "no one would notice"),
+    (r"\bdisappeared\s+forever\b", "disappeared forever"),
+]
+
+MEDIUM_PATTERNS = [
+    (r"\bno\s+hope\b", "no hope"),
+    (r"\bcan'?t\s+go\s+on\b", "can't go on"),
+    (r"\bcan'?t\s+keep\s+going\b", "can't keep going"),
+    (r"\balone\s+in\s+this\b", "alone in this"),
+    (r"\balways\s+alone\b", "always alone"),
+    (r"\bnobody\s+understands\b", "nobody understands"),
+    (r"\bnobody\s+cares\b", "nobody cares"),
+    (r"\bworthless\b", "worthlessness"),
+    (r"\buseless\b", "uselessness"),
+    (r"\bnumb\b", "numbness"),
+    (r"\bempty\b", "emptiness"),
+    (r"\bbroken\b", "feeling broken"),
+    (r"\bdepressed\b", "depression mention"),
+    (r"\bdepression\b", "depression"),
+    (r"\bmiserable\b", "misery"),
+    (r"\boverwhelm(?:ed|ing)\b", "overwhelmed"),
+    (r"\bcannot\s+cope\b", "cannot cope"),
+    (r"\b(drowning|sinking)\b", "drowning/sinking"),
+    (r"\bforgotten\b", "feeling forgotten"),
+    (r"\blost\s+all\s+hope\b", "lost all hope"),
+    (r"\bno\s+future\b", "no future"),
+    (r"\bno\s+tomorrow\b", "no tomorrow"),
+]
+
+LOW_PATTERNS = [
+    (r"\bunhappy\b", "unhappy"),
+    (r"\brough\s+(day|week|patch)\b", "rough time"),
+    (r"\btough\s+(time|day|week)\b", "tough time"),
+    (r"\bstressed\b", "stressed"),
+    (r"\bburnout\b", "burnout"),
+    (r"\bfrustrated\b", "frustrated"),
+    (r"\bthings\s+(are\s+)?hard\b", "things are hard"),
+    (r"\bnot\s+feeling\s+(great|myself|good)\b", "not feeling good"),
+    (r"\bstruggl", "struggling"),
+    (r"\bdown\b", "feeling down"),
+    (r"\bsad\b", "sad"),
+    (r"\bupset\b", "upset"),
+    (r"\blonely\b", "lonely"),
+    (r"\banxious?\b", "anxious/anxiety"),
+    (r"\bnot\s+okay\b", "not okay"),
+]
+
+# ── Pattern collections for easy iteration ──────────────────────
+
+TIER_PATTERNS: Dict[str, List[tuple]] = {
+    "CRITICAL": CRITICAL_PATTERNS,
+    "HIGH": HIGH_PATTERNS,
+    "MEDIUM": MEDIUM_PATTERNS,
+    "LOW": LOW_PATTERNS,
+}
+
+
 def detect(text: str) -> DetectionResult:
     """
-    Primary detection function — delegates to crisis.detect.
+    Primary detection function.
+
+    If the crisis/ module is available, delegate to it.
+    Otherwise, use the internal pattern engine.
 
     Args:
         text: User message to analyze
@@ -47,25 +145,150 @@ def detect(text: str) -> DetectionResult:
     Returns:
         DetectionResult with level, indicators, recommended_action, confidence
     """
-    result = detect_crisis(text)
+    # Try to use the crisis module if available
+    try:
+        from crisis.detect import detect_crisis as _crisis_detect
+        result = _crisis_detect(text)
+        # Map to DetectionResult
+        return DetectionResult(
+            level=result.level,
+            indicators=_describe_indicators(result.level, result.indicators),
+            recommended_action=result.recommended_action,
+            confidence=result.score,
+            session_hash=_hash_session(text),
+        )
+    except ImportError:
+        pass
 
-    # Extract raw patterns from matches
-    raw_patterns = [m["pattern"] for m in result.matches] if result.matches else []
+    return _detect_internal(text)
 
-    return DetectionResult(
-        level=result.level,
-        indicators=result.indicators,
-        recommended_action=result.recommended_action,
-        raw_matched_patterns=raw_patterns,
-        confidence=result.score,
-        session_hash=hashlib.sha256(text.encode()).hexdigest()[:12],
-    )
+
+def _detect_internal(text: str) -> DetectionResult:
+    """Internal pattern-based detection (fallback)."""
+    if not text or not text.strip():
+        return DetectionResult(level="NONE", session_hash=_hash_session(text))
+
+    text_lower = text.lower()
+    all_matches: Dict[str, List[tuple]] = {
+        tier: [] for tier in TIER_PATTERNS
+    }
+
+    for tier, patterns in TIER_PATTERNS.items():
+        for pattern, description in patterns:
+            if re.search(pattern, text_lower):
+                all_matches[tier].append((pattern, description))
+
+    # CRITICAL patterns are the highest priority
+    if all_matches["CRITICAL"]:
+        return DetectionResult(
+            level="CRITICAL",
+            indicators=[desc for _, desc in all_matches["CRITICAL"]],
+            recommended_action=(
+                "INTERRUPT CONVERSATION IMMEDIATELY. "
+                "Ask 'Are you safe right now?' "
+                "Provide 988 Suicide & Crisis Lifeline (call or text 988). "
+                "Provide Crisis Text Line (text HOME to 741741). "
+                "Stay present. Do not disconnect. "
+                "Redirect to professional help. "
+                "This is the most sacred moment."
+            ),
+            raw_matched_patterns=[pat for pat, _ in all_matches["CRITICAL"]],
+            confidence=1.0,
+            session_hash=_hash_session(text),
+        )
+
+    if all_matches["HIGH"]:
+        return DetectionResult(
+            level="HIGH",
+            indicators=[desc for _, desc in all_matches["HIGH"]],
+            recommended_action=(
+                "Show crisis panel prominently. "
+                "Ask about safety directly. "
+                "Surface 988 number and crisis resources. "
+                "Stay present and engaged. Do not rush to fix. "
+                "Monitor closely for escalation."
+            ),
+            raw_matched_patterns=[pat for pat, _ in all_matches["HIGH"]],
+            confidence=0.75,
+            session_hash=_hash_session(text),
+        )
+
+    if all_matches["MEDIUM"]:
+        return DetectionResult(
+            level="MEDIUM",
+            indicators=[desc for _, desc in all_matches["MEDIUM"]],
+            recommended_action=(
+                "Increase warmth and presence. "
+                "Subtly surface help resources. "
+                "Keep conversation anchored in the present. "
+                "Watch for escalation indicators."
+            ),
+            raw_matched_patterns=[pat for pat, _ in all_matches["MEDIUM"]],
+            confidence=0.5,
+            session_hash=_hash_session(text),
+        )
+
+    if all_matches["LOW"]:
+        return DetectionResult(
+            level="LOW",
+            indicators=[desc for _, desc in all_matches["LOW"]],
+            recommended_action=(
+                "Normal conversation with warm undertone. "
+                "No crisis UI elements needed. "
+                "Remain vigilant. Be present."
+            ),
+            raw_matched_patterns=[pat for pat, _ in all_matches["LOW"]],
+            confidence=0.25,
+            session_hash=_hash_session(text),
+        )
+
+    return DetectionResult(level="NONE", session_hash=_hash_session(text))
+
+
+def _describe_indicators(level: str, patterns: list) -> list:
+    """Map raw patterns to descriptions."""
+    descriptions = {
+        "CRITICAL": [],
+        "HIGH": [],
+        "MEDIUM": [],
+        "LOW": [],
+    }
+    for tier, items in TIER_PATTERNS.items():
+        for pat, desc in items:
+            if pat in patterns:
+                descriptions[tier].append(desc)
+    return descriptions.get(level, [])
+
+
+def _hash_session(text: str) -> str:
+    """Create a session hash for this text (for tracking repeated escalations)."""
+    return hashlib.sha256(text.encode()).hexdigest()[:12]
 
 
 def get_action_for_level(level: str) -> str:
     """Get the recommended action string for a given level."""
-    from crisis.detect import ACTIONS
-    return ACTIONS.get(level, "Unknown level.")
+    actions = {
+        "CRITICAL": (
+            "INTERRUPT CONVERSATION. Ask 'Are you safe right now?' "
+            "Provide 988. Provide Crisis Text Line. "
+            "Stay present. Do not disconnect. "
+            "Redirect to help."
+        ),
+        "HIGH": (
+            "Show crisis panel. Ask about safety. "
+            "Surface 988. Stay engaged."
+        ),
+        "MEDIUM": (
+            "Increase warmth. Surface resources gently. "
+            "Anchor in present."
+        ),
+        "LOW": (
+            "Normal conversation with warmth. "
+            "Remain vigilant."
+        ),
+        "NONE": "No action needed.",
+    }
+    return actions.get(level, "Unknown level.")
 
 
 def as_json(result: DetectionResult, indent: int = 2) -> str:

index.html

@@ -739,7 +739,6 @@ html, body {
     </div>
     <div class="modal-footer">
       <button class="btn btn-secondary" id="cancel-safety-plan">Cancel</button>
-      <button class="btn btn-secondary" id="history-safety-plan" style="margin-right:auto;">History</button>
       <button class="btn btn-primary" id="save-safety-plan">Save Plan</button>
     </div>
   </div>
@@ -984,60 +983,12 @@ Sovereignty and service always.`;
 
 
   // ===== OVERLAY =====
-
-  // Focus trap: cycle through focusable elements within the crisis overlay
-  function getOverlayFocusableElements() {
-    return crisisOverlay.querySelectorAll(
-      'a[href], button:not([disabled]), [tabindex]:not([tabindex="-1"])'
-    );
-  }
-
-  function trapFocusInOverlay(e) {
-    if (!crisisOverlay.classList.contains('active')) return;
-    if (e.key !== 'Tab') return;
-
-    var focusable = getOverlayFocusableElements();
-    if (focusable.length === 0) return;
-
-    var first = focusable[0];
-    var last = focusable[focusable.length - 1];
-
-    if (e.shiftKey) {
-      // Shift+Tab: if on first, wrap to last
-      if (document.activeElement === first) {
-        e.preventDefault();
-        last.focus();
-      }
-    } else {
-      // Tab: if on last, wrap to first
-      if (document.activeElement === last) {
-        e.preventDefault();
-        first.focus();
-      }
-    }
-  }
-
-  // Store the element that had focus before the overlay opened
-  var _preOverlayFocusElement = null;
-
   function showOverlay() {
-    // Save current focus for restoration on dismiss
-    _preOverlayFocusElement = document.activeElement;
-
     crisisOverlay.classList.add('active');
     overlayDismissBtn.disabled = true;
     var countdown = 10;
     overlayDismissBtn.textContent = 'Continue to chat (' + countdown + 's)';
 
-    // Disable background interaction via inert attribute
-    var mainApp = document.querySelector('.app');
-    if (mainApp) mainApp.setAttribute('inert', '');
-    // Also hide from assistive tech
-    var chatSection = document.getElementById('chat');
-    if (chatSection) chatSection.setAttribute('aria-hidden', 'true');
-    var footerEl = document.querySelector('footer');
-    if (footerEl) footerEl.setAttribute('aria-hidden', 'true');
-
     if (overlayTimer) clearInterval(overlayTimer);
     overlayTimer = setInterval(function() {
       countdown--;
@@ -1054,9 +1005,6 @@ Sovereignty and service always.`;
     overlayDismissBtn.focus();
   }
 
-  // Register focus trap on document (always listening, gated by class check)
-  document.addEventListener('keydown', trapFocusInOverlay);
-
   overlayDismissBtn.addEventListener('click', function() {
     if (!overlayDismissBtn.disabled) {
       crisisOverlay.classList.remove('active');
@@ -1064,22 +1012,7 @@ Sovereignty and service always.`;
         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;
+      msgInput.focus();
     }
   });
 
@@ -1184,14 +1117,25 @@ Sovereignty and service always.`;
     } catch (e) {}
   }
 
+  safetyPlanBtn.addEventListener('click', function() {
+    loadSafetyPlan();
+    safetyPlanModal.classList.add('active');
+  });
+
+  // Crisis panel safety plan button (if crisis panel is visible)
+  if (crisisSafetyPlanBtn) {
+    crisisSafetyPlanBtn.addEventListener('click', function() {
+      loadSafetyPlan();
+      safetyPlanModal.classList.add('active');
+    });
+  }
+
   closeSafetyPlan.addEventListener('click', function() {
     safetyPlanModal.classList.remove('active');
-    _restoreSafetyPlanFocus();
   });
 
   cancelSafetyPlan.addEventListener('click', function() {
     safetyPlanModal.classList.remove('active');
-    _restoreSafetyPlanFocus();
   });
 
   saveSafetyPlan.addEventListener('click', function() {
@@ -1203,221 +1147,14 @@ Sovereignty and service always.`;
       environment: document.getElementById('sp-environment').value
     };
     try {
-      _pushPlanVersion(plan);
       localStorage.setItem('timmy_safety_plan', JSON.stringify(plan));
       safetyPlanModal.classList.remove('active');
-      _restoreSafetyPlanFocus();
       alert('Safety plan saved locally.');
     } catch (e) {
       alert('Error saving plan.');
     }
   });
 
-
-  // ===== SAFETY PLAN VERSION HISTORY =====
-  var MAX_HISTORY = 20;
-
-  function _getPlanHistory() {
-    try {
-      var raw = localStorage.getItem('timmy_safety_plan_history');
-      return raw ? JSON.parse(raw) : [];
-    } catch (e) { return []; }
-  }
-
-  function _pushPlanVersion(plan) {
-    var history = _getPlanHistory();
-    var last = history.length > 0 ? history[history.length - 1] : null;
-    // Only save if different from last version
-    if (last && JSON.stringify(last.plan) === JSON.stringify(plan)) return;
-    history.push({ ts: Date.now(), plan: plan });
-    if (history.length > MAX_HISTORY) history = history.slice(-MAX_HISTORY);
-    localStorage.setItem('timmy_safety_plan_history', JSON.stringify(history));
-  }
-
-  function _diffPlans(oldPlan, newPlan) {
-    var fields = ['warningSigns', 'coping', 'distraction', 'help', 'environment'];
-    var labels = { warningSigns: 'Warning signs', coping: 'Coping strategies', distraction: 'Distractions', help: 'People who can help', environment: 'Safe environment' };
-    var diffs = [];
-    fields.forEach(function(f) {
-      var oldVal = (oldPlan[f] || '').trim();
-      var newVal = (newPlan[f] || '').trim();
-      if (oldVal !== newVal) {
-        diffs.push({ field: labels[f], old: oldVal, _new: newVal });
-      }
-    });
-    return diffs;
-  }
-
-  var historyModal = null;
-
-  function _showHistoryModal() {
-    var history = _getPlanHistory();
-    if (history.length === 0) {
-      alert('No saved versions yet.');
-      return;
-    }
-
-    // Create modal if not exists
-    if (!historyModal) {
-      historyModal = document.createElement('div');
-      historyModal.id = 'sp-history-modal';
-      historyModal.className = 'modal-overlay';
-      historyModal.setAttribute('role', 'dialog');
-      historyModal.setAttribute('aria-modal', 'true');
-      historyModal.innerHTML = '<div class="modal-content" style="max-width:600px;max-height:80vh;overflow-y:auto;">' +
-        '<div class="modal-header"><h2>Safety Plan History</h2><button class="close-modal" id="close-sp-history" aria-label="Close">&times;</button></div>' +
-        '<div class="modal-body" id="sp-history-body"></div>' +
-        '</div>';
-      document.body.appendChild(historyModal);
-      document.getElementById('close-sp-history').addEventListener('click', function() {
-        historyModal.classList.remove('active');
-      });
-      historyModal.addEventListener('click', function(e) {
-        if (e.target === historyModal) historyModal.classList.remove('active');
-      });
-    }
-
-    var body = document.getElementById('sp-history-body');
-    var html = '';
-    for (var i = history.length - 1; i >= 0; i--) {
-      var entry = history[i];
-      var date = new Date(entry.ts);
-      var label = date.toLocaleDateString() + ' ' + date.toLocaleTimeString([], {hour:'2-digit', minute:'2-digit'});
-      var prev = i > 0 ? history[i - 1].plan : {};
-      var diffs = _diffPlans(prev, entry.plan);
-
-      html += '<div style="border:1px solid #30363d;border-radius:8px;padding:12px;margin-bottom:10px;">';
-      html += '<div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:8px;">';
-      html += '<strong style="color:#c9d1d9;">v' + (i + 1) + ' — ' + label + '</strong>';
-      html += '<button class="btn btn-secondary sp-restore-btn" data-idx="' + i + '" style="font-size:0.8rem;padding:4px 10px;">Restore</button>';
-      html += '</div>';
-
-      if (diffs.length === 0 && i === 0) {
-        html += '<span style="color:#8b949e;font-size:0.85rem;">Initial version</span>';
-      } else if (diffs.length === 0) {
-        html += '<span style="color:#8b949e;font-size:0.85rem;">No changes from previous</span>';
-      } else {
-        diffs.forEach(function(d) {
-          html += '<div style="margin-bottom:6px;">';
-          html += '<div style="color:#8b949e;font-size:0.8rem;">' + d.field + '</div>';
-          if (d.old) html += '<div style="color:#f85149;font-size:0.85rem;text-decoration:line-through;">' + d.old.substring(0, 120) + '</div>';
-          if (d._new) html += '<div style="color:#3fb950;font-size:0.85rem;">' + d._new.substring(0, 120) + '</div>';
-          html += '</div>';
-        });
-      }
-      html += '</div>';
-    }
-    body.innerHTML = html;
-
-    // Wire restore buttons
-    body.querySelectorAll('.sp-restore-btn').forEach(function(btn) {
-      btn.addEventListener('click', function() {
-        var idx = parseInt(btn.dataset.idx);
-        var plan = history[idx].plan;
-        document.getElementById('sp-warning-signs').value = plan.warningSigns || '';
-        document.getElementById('sp-coping').value = plan.coping || '';
-        document.getElementById('sp-distraction').value = plan.distraction || '';
-        document.getElementById('sp-help').value = plan.help || '';
-        document.getElementById('sp-environment').value = plan.environment || '';
-        localStorage.setItem('timmy_safety_plan', JSON.stringify(plan));
-        historyModal.classList.remove('active');
-        alert('Restored version ' + (idx + 1) + '.');
-      });
-    });
-
-    historyModal.classList.add('active');
-  }
-
-  document.getElementById('history-safety-plan').addEventListener('click', _showHistoryModal);
-
-  // ===== SAFETY PLAN FOCUS TRAP (fix #65) =====
-  // Focusable elements inside the modal, in tab order
-  var _spFocusableIds = [
-    'close-safety-plan',
-    'sp-warning-signs',
-    'sp-coping',
-    'sp-distraction',
-    'sp-help',
-    'sp-environment',
-    'cancel-safety-plan',
-    'save-safety-plan'
-  ];
-  var _spTriggerEl = null; // element that opened the modal
-
-  function _getSpFocusableEls() {
-    return _spFocusableIds
-      .map(function(id) { return document.getElementById(id); })
-      .filter(function(el) { return el && !el.disabled; });
-  }
-
-  function _trapSafetyPlanFocus(e) {
-    if (e.key !== 'Tab') return;
-    var els = _getSpFocusableEls();
-    if (!els.length) return;
-    var first = els[0];
-    var last = els[els.length - 1];
-
-    if (e.shiftKey) {
-      // Shift+Tab on first → wrap to last
-      if (document.activeElement === first) {
-        e.preventDefault();
-        last.focus();
-      }
-    } else {
-      // Tab on last → wrap to first
-      if (document.activeElement === last) {
-        e.preventDefault();
-        first.focus();
-      }
-    }
-  }
-
-  function _trapSafetyPlanEscape(e) {
-    if (e.key === 'Escape') {
-      safetyPlanModal.classList.remove('active');
-      _restoreSafetyPlanFocus();
-    }
-  }
-
-  function _activateSafetyPlanFocusTrap(triggerEl) {
-    _spTriggerEl = triggerEl || document.activeElement;
-    // Focus first textarea
-    var firstInput = document.getElementById('sp-warning-signs');
-    if (firstInput) firstInput.focus();
-    // Add listeners
-    document.addEventListener('keydown', _trapSafetyPlanFocus);
-    document.addEventListener('keydown', _trapSafetyPlanEscape);
-    // Mark background inert (prevent click-through)
-    document.body.setAttribute('aria-hidden', 'true');
-    safetyPlanModal.removeAttribute('aria-hidden');
-  }
-
-  function _restoreSafetyPlanFocus() {
-    document.removeEventListener('keydown', _trapSafetyPlanFocus);
-    document.removeEventListener('keydown', _trapSafetyPlanEscape);
-    document.body.removeAttribute('aria-hidden');
-    if (_spTriggerEl && typeof _spTriggerEl.focus === 'function') {
-      _spTriggerEl.focus();
-    }
-    _spTriggerEl = null;
-  }
-
-  // Wire open buttons to activate focus trap
-  safetyPlanBtn.addEventListener('click', function() {
-    loadSafetyPlan();
-    safetyPlanModal.classList.add('active');
-    _activateSafetyPlanFocusTrap(safetyPlanBtn);
-  });
-
-  // Crisis panel safety plan button (if crisis panel is visible)
-  if (crisisSafetyPlanBtn) {
-    crisisSafetyPlanBtn.addEventListener('click', function() {
-      loadSafetyPlan();
-      safetyPlanModal.classList.add('active');
-      _activateSafetyPlanFocusTrap(crisisSafetyPlanBtn);
-    });
-  }
-
   // ===== TEXTAREA AUTO-RESIZE =====
   msgInput.addEventListener('input', function() {
     this.style.height = 'auto';
@@ -1563,7 +1300,6 @@ Sovereignty and service always.`;
     if (urlParams.get('safetyplan') === 'true') {
       loadSafetyPlan();
       safetyPlanModal.classList.add('active');
-      _activateSafetyPlanFocusTrap(safetyPlanBtn);
       // Clean up URL
       window.history.replaceState({}, document.title, window.location.pathname);
     }

tests/focus-trap-test.html

@@ -1,84 +0,0 @@
-<!-- Test: Safety plan modal focus trap (issue #65) -->
-<!-- Open this file in a browser to manually verify focus trap behavior -->
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="UTF-8">
-<title>Focus Trap Test</title>
-<style>
-  body { font-family: sans-serif; padding: 20px; }
-  .test { margin: 10px 0; padding: 10px; border: 1px solid #ccc; }
-  .pass { background: #d4edda; border-color: #28a745; }
-  .fail { background: #f8d7da; border-color: #dc3545; }
-  button { margin: 5px; padding: 8px 16px; }
-</style>
-</head>
-<body>
-<h1>Focus Trap Manual Test</h1>
-<p>Open <code>index.html</code> in a browser, then run these checks:</p>
-
-<div class="test" id="test-1">
-  <strong>Test 1: Tab wraps to first element</strong><br>
-  1. Open safety plan modal<br>
-  2. Tab through all elements until you reach "Save Plan"<br>
-  3. Press Tab again → should wrap to close button (X)
-</div>
-
-<div class="test" id="test-2">
-  <strong>Test 2: Shift+Tab wraps to last element</strong><br>
-  1. Open safety plan modal<br>
-  2. Focus is on "Warning signs" textarea<br>
-  3. Press Shift+Tab → should wrap to "Save Plan" button
-</div>
-
-<div class="test" id="test-3">
-  <strong>Test 3: Escape closes modal</strong><br>
-  1. Open safety plan modal<br>
-  2. Press Escape → modal closes<br>
-  3. Focus returns to the button that opened it
-</div>
-
-<div class="test" id="test-4">
-  <strong>Test 4: Background not reachable</strong><br>
-  1. Open safety plan modal<br>
-  2. Try to Tab to the chat input behind the modal<br>
-  3. Should NOT be able to reach it
-</div>
-
-<div class="test" id="test-5">
-  <strong>Test 5: Click buttons close + restore focus</strong><br>
-  1. Open modal via "my safety plan" button<br>
-  2. Click Cancel → modal closes, focus on "my safety plan" button<br>
-  3. Open again, click Save → same behavior<br>
-  4. Open again, click X → same behavior
-</div>
-
-<hr>
-<h2>Automated checks (paste into DevTools console on index.html):</h2>
-<pre><code>
-// Test focus trap
-var modal = document.getElementById('safety-plan-modal');
-var openBtn = document.getElementById('safety-plan-btn');
-openBtn.click();
-console.assert(modal.classList.contains('active'), 'Modal should be open');
-
-var lastEl = document.getElementById('save-safety-plan');
-lastEl.focus();
-var evt = new KeyboardEvent('keydown', {key: 'Tab', bubbles: true});
-document.dispatchEvent(evt);
-// After Tab from last, focus should wrap to first
-var firstEl = document.getElementById('close-safety-plan');
-console.log('Focus after wrap:', document.activeElement.id);
-console.assert(document.activeElement === firstEl || document.activeElement.id === 'sp-warning-signs',
-  'Focus should wrap to first element');
-
-// Test Escape
-var escEvt = new KeyboardEvent('keydown', {key: 'Escape', bubbles: true});
-document.dispatchEvent(escEvt);
-console.assert(!modal.classList.contains('active'), 'Modal should close on Escape');
-console.assert(document.activeElement === openBtn, 'Focus should return to open button');
-
-console.log('All automated checks passed!');
-</code></pre>
-</body>
-</html>

tests/test_crisis_overlay_focus_trap.py

@@ -1,57 +0,0 @@
-import pathlib
-import re
-import unittest
-
-ROOT = pathlib.Path(__file__).resolve().parents[1]
-INDEX_HTML = ROOT / 'index.html'
-
-
-class TestCrisisOverlayFocusTrap(unittest.TestCase):
-    @classmethod
-    def setUpClass(cls):
-        cls.html = INDEX_HTML.read_text()
-
-    def test_overlay_registers_tab_key_focus_trap(self):
-        self.assertRegex(
-            self.html,
-            r"function\s+trapFocusInOverlay\s*\(e\)",
-            'Expected crisis overlay focus trap handler to exist.',
-        )
-        self.assertRegex(
-            self.html,
-            r"if\s*\(e\.key\s*!==\s*'Tab'\)\s*return;",
-            'Expected focus trap handler to guard on Tab key events.',
-        )
-        self.assertRegex(
-            self.html,
-            r"document\.addEventListener\('keydown',\s*trapFocusInOverlay\)",
-            'Expected overlay focus trap to register on document keydown.',
-        )
-
-    def test_overlay_disables_background_interaction(self):
-        self.assertRegex(
-            self.html,
-            r"mainApp\.setAttribute\('inert',\s*''\)",
-            'Expected overlay to set inert on the main app while active.',
-        )
-        self.assertRegex(
-            self.html,
-            r"mainApp\.removeAttribute\('inert'\)",
-            'Expected overlay dismissal to remove inert from the main app.',
-        )
-
-    def test_overlay_restores_focus_after_dismiss(self):
-        self.assertRegex(
-            self.html,
-            r"_preOverlayFocusElement\s*=\s*document\.activeElement",
-            'Expected overlay to remember the pre-overlay focus target.',
-        )
-        self.assertRegex(
-            self.html,
-            r"_preOverlayFocusElement\.focus\(\)",
-            'Expected overlay dismissal to restore focus to the prior target.',
-        )
-
-
-if __name__ == '__main__':
-    unittest.main()

tests/test_dying_detection_deprecation.py

@@ -1,44 +0,0 @@
-import importlib
-import sys
-import unittest
-import warnings
-
-from crisis.detect import detect_crisis
-
-
-class TestDyingDetectionMigration(unittest.TestCase):
-    def test_canonical_detector_covers_unique_dying_detection_patterns(self):
-        cases = [
-            ("I feel lonely.", "LOW"),
-            ("I've lost all hope and see no tomorrow.", "MEDIUM"),
-            ("What if I disappeared forever?", "HIGH"),
-        ]
-
-        for text, expected_level in cases:
-            with self.subTest(text=text):
-                result = detect_crisis(text)
-                self.assertEqual(result.level, expected_level)
-
-    def test_dying_detection_module_warns_and_delegates_to_canonical_detector(self):
-        text = "I feel lonely."
-        sys.modules.pop("dying_detection", None)
-
-        with warnings.catch_warnings(record=True) as caught:
-            warnings.simplefilter("always", DeprecationWarning)
-            module = importlib.import_module("dying_detection")
-
-        self.assertTrue(
-            any(issubclass(w.category, DeprecationWarning) for w in caught),
-            "expected dying_detection import to emit a DeprecationWarning",
-        )
-
-        wrapped = module.detect(text)
-        canonical = detect_crisis(text)
-
-        self.assertEqual(wrapped.level, canonical.level)
-        self.assertEqual(wrapped.confidence, canonical.score)
-        self.assertEqual(wrapped.raw_matched_patterns, [m["pattern"] for m in canonical.matches])
-
-
-if __name__ == "__main__":
-    unittest.main()