feat: add unified multimodal scorer for #134

test: define unified multimodal scorer for #134
fix: footer /about link to point to static about.html
2026-04-20 20:06:45 -04:00 · 2026-04-20 19:58:43 -04:00 · 2026-04-17 05:37:40 +00:00 · 2026-04-17 01:46:56 +00:00 · 2026-04-17 01:46:55 +00:00 · 2026-04-17 01:46:53 +00:00
26 changed files with 2432 additions and 742 deletions
--- a/.gitea/workflows/sanity.yml
+++ b/.gitea/workflows/sanity.yml
@@ -21,9 +21,9 @@ jobs:
      - name: Validate HTML Structure
        run: |
          echo "Checking for basic HTML tags..."
-          grep -q "<html>" index.html
-          grep -q "<body>" index.html
-          grep -q "<head>" index.html
+          grep -q "<html" index.html
+          grep -q "<body" index.html
+          grep -q "<head" index.html
          
      - name: Validate Prompt Integrity
        run: |
--- a/8
+++ b/8
@@ -12,7 +12,7 @@ VPS := alexanderwhitestone.com
 DOMAIN := alexanderwhitestone.com
 DEPLOY_DIR := deploy

-.PHONY: help deploy deploy-bash check ssl push
+.PHONY: help deploy deploy-bash check ssl push service

 help:
 	@echo "The Door — Deployment Commands"
@@ -22,6 +22,7 @@ help:
 	@echo "  make push         Push site files only (fast)"
 	@echo "  make check        Check deployment status"
 	@echo "  make ssl          Setup SSL on VPS"
+	@echo "  make service      Install/restart hermes-gateway service"
 	@echo ""

 deploy:
@@ -33,7 +34,7 @@ deploy-bash:

 push:
 	rsync -avz --exclude='.git' --exclude='deploy' \
-		index.html manifest.json sw.js about.html testimony.html system-prompt.txt \
+		index.html manifest.json sw.js about.html crisis-offline.html testimony.html system-prompt.txt \
 		root@$(VPS):/var/www/the-door/
 	ssh root@$(VPS) "chown -R www-data:www-data /var/www/the-door"

@@ -42,3 +43,6 @@ check:

 ssl:
 	ssh root@$(VPS) "certbot --nginx -d $(DOMAIN) -d www.$(DOMAIN)"
+
+service:
+	ssh root@$(VPS) "cd /opt/the-door && bash deploy/deploy.sh --service"
--- a/crisis-offline.html
+++ b/crisis-offline.html
@@ -0,0 +1,241 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="theme-color" content="#0d1117">
+<meta name="description" content="Offline crisis resources from The Door. Call or text 988 for immediate help.">
+<title>Offline Crisis Resources | The Door</title>
+<style>
+  :root {
+    color-scheme: dark;
+    --bg: #0d1117;
+    --panel: #161b22;
+    --panel-urgent: #1c1210;
+    --border: #30363d;
+    --accent: #c9362c;
+    --accent-soft: #ff6b6b;
+    --text: #e6edf3;
+    --muted: #8b949e;
+    --safe: #2ea043;
+  }
+
+  * { box-sizing: border-box; }
+
+  body {
+    margin: 0;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+    background: var(--bg);
+    color: var(--text);
+    line-height: 1.6;
+  }
+
+  main {
+    max-width: 760px;
+    margin: 0 auto;
+    padding: 24px 16px 48px;
+  }
+
+  .status {
+    display: inline-flex;
+    align-items: center;
+    gap: 10px;
+    padding: 8px 12px;
+    border-radius: 999px;
+    background: rgba(201, 54, 44, 0.15);
+    border: 1px solid rgba(255, 107, 107, 0.35);
+    color: var(--accent-soft);
+    font-size: 0.9rem;
+    margin-bottom: 20px;
+  }
+
+  .status-dot {
+    width: 10px;
+    height: 10px;
+    border-radius: 50%;
+    background: var(--accent-soft);
+  }
+
+  h1 {
+    font-size: clamp(2rem, 6vw, 2.75rem);
+    line-height: 1.15;
+    margin: 0 0 12px;
+  }
+
+  .lede {
+    color: var(--muted);
+    font-size: 1.05rem;
+    margin: 0 0 28px;
+  }
+
+  .urgent-box,
+  .panel {
+    border-radius: 18px;
+    padding: 20px;
+    margin-bottom: 18px;
+    border: 1px solid var(--border);
+    background: var(--panel);
+  }
+
+  .urgent-box {
+    background: linear-gradient(180deg, rgba(201, 54, 44, 0.18), rgba(28, 18, 16, 0.95));
+    border-color: rgba(255, 107, 107, 0.35);
+  }
+
+  .section-title {
+    font-size: 1.2rem;
+    margin: 0 0 12px;
+  }
+
+  .actions {
+    display: grid;
+    gap: 12px;
+    margin-top: 16px;
+  }
+
+  .action-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+    gap: 8px;
+    min-height: 52px;
+    padding: 14px 18px;
+    border-radius: 12px;
+    text-decoration: none;
+    font-weight: 700;
+    color: #fff;
+    background: var(--accent);
+    border: 1px solid transparent;
+  }
+
+  .action-btn.secondary {
+    background: #1f6feb;
+  }
+
+  .action-btn.retry {
+    background: transparent;
+    color: var(--text);
+    border-color: var(--border);
+  }
+
+  .action-btn:focus,
+  .action-btn:hover,
+  button.action-btn:hover,
+  button.action-btn:focus {
+    outline: 3px solid rgba(255, 107, 107, 0.4);
+    outline-offset: 2px;
+  }
+
+  ul, ol {
+    margin: 0;
+    padding-left: 20px;
+  }
+
+  li + li {
+    margin-top: 8px;
+  }
+
+  .grounding-steps li::marker {
+    color: var(--accent-soft);
+    font-weight: 700;
+  }
+
+  .small {
+    color: var(--muted);
+    font-size: 0.92rem;
+  }
+
+  .grid {
+    display: grid;
+    gap: 18px;
+  }
+
+  @media (min-width: 700px) {
+    .grid {
+      grid-template-columns: 1fr 1fr;
+    }
+  }
+</style>
+</head>
+<body>
+<main>
+  <div class="status" role="status" aria-live="polite">
+    <span class="status-dot" aria-hidden="true"></span>
+    <span id="connection-status-text">Offline crisis resources are ready on this device.</span>
+  </div>
+
+  <h1>You are not alone right now.</h1>
+  <p class="lede">
+    Your connection is weak or offline. These crisis resources are saved locally so you can still reach help.
+  </p>
+
+  <section class="urgent-box" aria-labelledby="urgent-help-title">
+    <h2 class="section-title" id="urgent-help-title">Immediate help</h2>
+    <p>If you might act on suicidal thoughts, contact a real person now. Stay with another person if you can.</p>
+    <div class="actions">
+      <a class="action-btn" href="tel:988" aria-label="Call 988 now">Call 988 now</a>
+      <a class="action-btn secondary" href="sms:741741&body=HOME" aria-label="Text HOME to 741741 for Crisis Text Line">Text HOME to 741741 — Crisis Text Line</a>
+      <button class="action-btn retry" id="retry-connection" type="button">Retry connection</button>
+    </div>
+    <p class="small" style="margin-top: 14px;">If you are in immediate danger or have already taken action, call emergency services now.</p>
+  </section>
+
+  <div class="grid">
+    <section class="panel" aria-labelledby="grounding-title">
+      <h2 class="section-title" id="grounding-title">5-4-3-2-1 grounding</h2>
+      <ol class="grounding-steps">
+        <li>5 things you can see</li>
+        <li>4 things you can feel</li>
+        <li>3 things you can hear</li>
+        <li>2 things you can smell</li>
+        <li>1 thing you can taste</li>
+      </ol>
+      <p class="small" style="margin-top: 14px;">Say each one out loud if you can. Slow is okay.</p>
+    </section>
+
+    <section class="panel" aria-labelledby="next-steps-title">
+      <h2 class="section-title" id="next-steps-title">Next small steps</h2>
+      <ul>
+        <li>Put some distance between yourself and anything you could use to hurt yourself.</li>
+        <li>Move closer to another person, a front desk, or a public place if possible.</li>
+        <li>Drink water or hold something cold in your hand.</li>
+        <li>Breathe in for 4, hold for 4, out for 6. Repeat 5 times.</li>
+        <li>Text or call one safe person and say: “I need you with me right now.”</li>
+      </ul>
+    </section>
+  </div>
+
+  <section class="panel" aria-labelledby="hope-title">
+    <h2 class="section-title" id="hope-title">Stay through the next ten minutes</h2>
+    <p>Do not solve your whole life right now. Stay for the next breath. Then the next one.</p>
+    <p class="small">If the connection comes back, you can return to The Door chat. Until then, the fastest path to a real person is still 988.</p>
+  </section>
+</main>
+
+<script>
+  (function () {
+    var statusText = document.getElementById('connection-status-text');
+    var retryButton = document.getElementById('retry-connection');
+
+    function updateStatus() {
+      statusText.textContent = navigator.onLine
+        ? 'Connection is back. You can reopen chat now.'
+        : 'Offline crisis resources are ready on this device.';
+    }
+
+    retryButton.addEventListener('click', function () {
+      if (navigator.onLine) {
+        window.location.href = '/';
+        return;
+      }
+      window.location.reload();
+    });
+
+    window.addEventListener('online', updateStatus);
+    window.addEventListener('offline', updateStatus);
+    updateStatus();
+  })();
+</script>
+</body>
+</html>
--- a/crisis/init.py
+++ b/crisis/init.py
@@ -6,7 +6,8 @@ Stands between a broken man and a machine that would tell him to die.

 from .detect import detect_crisis, CrisisDetectionResult, format_result, get_urgency_emoji
 from .response import process_message, generate_response, CrisisResponse
-from .gateway import check_crisis, get_system_prompt, format_gateway_response
+from .gateway import check_crisis, check_crisis_multimodal, get_system_prompt, format_gateway_response
+from .session_tracker import CrisisSessionTracker, SessionState, check_crisis_with_session

 __all__ = [
    "detect_crisis",
@@ -15,8 +16,12 @@ __all__ = [
    "generate_response",
    "CrisisResponse",
    "check_crisis",
+    "check_crisis_multimodal",
    "get_system_prompt",
    "format_result",
    "format_gateway_response",
    "get_urgency_emoji",
+    "CrisisSessionTracker",
+    "SessionState",
+    "check_crisis_with_session",
 ]
--- a/crisis/detect.py
+++ b/crisis/detect.py
@@ -1,75 +1,85 @@
 """
-Crisis Detection Module for the-door.
+Crisis Detection Module for the-door (CANONICAL).

+Single source of truth for crisis keyword detection.
 Parses incoming text for despair/suicide indicators and classifies into
 tiers: LOW, MEDIUM, HIGH, CRITICAL.
+
+Both `crisis/detect.py` and `crisis_detector.py` (legacy shim) use this module.
+Do NOT duplicate keyword lists elsewhere.
+
+Consolidated from:
+  - crisis_detector.py (root, legacy — MODERATE tier, class API)
+  - crisis/detect.py (module, newer — MEDIUM tier, functional API)
 """

 import re
 from dataclasses import dataclass, field
-from typing import List
+from typing import List, Optional


-@dataclass
-class CrisisDetectionResult:
-    level: str
-    indicators: List[str] = field(default_factory=list)
-    recommended_action: str = ""
-    score: float = 0.0
-
-
-# ── Indicator sets ──────────────────────────────────────────────
+# ── Canonical indicator sets ──────────────────────────────────────

 CRITICAL_INDICATORS = [
+    r"\bbetter off without me\b",
    r"\bkill\s*(my)?self\b",
    r"\bend\s*my\s*life\b",
    r"\bsuicid(?:al|ed|e)\b",
    r"\bnot\s+worth\s+living\b",
    r"\bbetter\s+off\s+dead\b",
    r"\bend\s+it\s+all\b",
-    r"\bcan'?t\s+(go|live)\s+on\b",
    r"\bno\s+reason\s+to\s+live\b",
    r"\bdon'?t\s+want\s+to\s+live\b",
    r"\bwant\s+to\s+die\b",
-    r"\bgoing\s+to\s+kill\s+myself\b",
-    r"\bplan\s+to\s+(end|kill|die)\b",
-    r"\btired\s+of\s+(living|life|existence)\b",
-    r"\bsaying\s+goodbye\s+(forever|permanently|one last time)\b",
-    r"\bwrote\s+a\s+(will|suicide\s*note|letter)\b",
-    r"\bgiving\s+away\s+(my|all my)\s+possess",
-    r"\btied\s+(up|down)\s+my\s+(loose\s+)?ends",
+    r"\bgoing\s+to\s+(?:kill\s+myself|die)\b",
+    r"\bplan\s+to\s+(?:end|kill|die)\b",
+    r"\btired\s+of\s+(?:living|life|existence)\b",
+    r"\bsaying\s+goodbye\s+(?:forever|permanently|one\s+last\s+time)\b",
+    r"\bwrote\s+a\s+suicide\s*(?:note|letter)\b",
+    r"\bgiving\s+away\s+(?:my|all\s+my)\s+(?:stuff|things|possessions?)\s+(?:to|because|—)\b",
+    r"\btied\s+(?:up|down)\s+my\s+(?:loose\s+)?ends",
 ]

 HIGH_INDICATORS = [
    r"\bdespair\b",
-    r"\bhopeless\b",
-    r"\bno(?!t)\s+(one|body|point|hope|future|way\s+out)\b",
-    r"\beverything\s+is\s+(pointless|broken|ruined)\b",
+    r"\bhopeless(?:ly)?\s+(?:about\s+(?:my|this|everything|life)|inside|right\s+now)\b",
+    r"\bno(?!t)\s+(?:one|body|point|hope|way\s+out)\b",
+    r"\bno\s+future\s+(?:for\s+me|ahead|left)\b",
+    r"\beverything\s+is\s+(?:pointless|broken|ruined)\b",
    r"\bcan'?t\s+take\s+this\s+anymore\b",
    r"\bdon'?t\s+care\s+if\s+I\s+die\b",
-    r"\bwish\s+I\s+(was|were)\s+(dead|gone|never\s+born)\b",
+    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\b",
-    r"\bno\s+one\s+would\s+miss\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|light)\b",
-    r"\btrapped\b",
-    r"\bcage\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"\bescape\s+from\s*this",
    r"\bjust\s+want\s+it\s+to\s+stop\b",
-    r"\bnothing\s+left\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",
+    r"\bcan'?t\s+(?:go\s+on|keep\s+going)\b",
+    r"\bgive(?:n)?\s*up\s+(?:on\s+)?(?:life|living|everything)\b",
+    r"\bgive(?:n)?\s*up\s+on\s+myself\b",
+    r"\bno\s*point\s+(?:in\s+)?living\b",
+    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",
 ]

 MEDIUM_INDICATORS = [
    r"\bno\s+hope\b",
-    r"\bcan'?t\s+go\s+on\b",
-    r"\bcan'?t\s+keep\s+going\b",
    r"\bforgotten\b",
    r"\balone\s+in\s+this\b",
    r"\balways\s+alone\b",
-    r"\bnobody\s+understands\b",
-    r"\bnobody\s+cares\b",
+    r"\bnobody\s+(?:understands|cares)\b",
    r"\bwish\s+I\s+could\b",
    r"\bexhaust(?:ed|ion|ing)\b",
    r"\bnumb\b",
@@ -78,8 +88,7 @@ MEDIUM_INDICATORS = [
    r"\buseless\b",
    r"\bbroken\b",
    r"\bdark(ness)?\b",
-    r"\bdepressed\b",
-    r"\bdepression\b",
+    r"\bdepress(?:ed|ion)\b",
    r"\bcrying\b",
    r"\btears\b",
    r"\bsad(ness)?\b",
@@ -87,42 +96,162 @@ MEDIUM_INDICATORS = [
    r"\boverwhelm(?:ed|ing)\b",
    r"\bfailing\b",
    r"\bcannot\s+cope\b",
-    r"\blosing\s*(my)?\s*control\b",
+    r"\blosing\s*(?:my)?\s*control\b",
    r"\bdown\s*for\s*the\s*count\b",
    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",
+    r"\bfeel(?:s|ing)?\s+trapped\b",
+    r"\bfeel(?:s|ing)?\s+desperate\b",
+    r"\bno\s+future\s+(?:for\s+me|ahead|left)\b",
+    r"\bnothing\s+left\s+(?:to\s+(?:live|hope)\s+for|inside)\b",
+    r"\bgive(?:n)?\s*up\s+on\s+myself\b",
 ]

 LOW_INDICATORS = [
    r"\bunhappy\b",
    r"\bdown\b",
-    r"\btough\s*time\b",
-    r"\brough\s*day\b",
-    r"\brough\s*week\b",
-    r"\brough\s*patch\b",
+    r"\btough\s*(?:time|day|week)\b",
+    r"\brough\s+(?:day|week|patch)\b",
    r"\bstressed\b",
-    r"\burnout\b",
+    r"\bburnout\b",
    r"\bdifficult\b",
    r"\bfrustrated\b",
    r"\bannoyed\b",
    r"\btired\b",
    r"\bsad\b",
    r"\bupset\b",
-    r"\bnot\s*great\b",
-    r"\bnot\s*good\b",
-    r"\bnot\s*okay\b",
+    r"\blonely\b",
+    r"\banxious?\b",
+    r"\bnot\s*(?:good|great|okay)\b",
    r"\bthings\s*are\s*hard\b",
    r"\bstruggling\b",
-    r"\bnot\s+feeling\s+myself\b",
+    r"\bnot\s+feeling\s+(?:like\s+)?myself\b",
+    r"\bhard\s*time\b",
 ]


+# ── Scoring ───────────────────────────────────────────────────────
+
+SCORES = {"CRITICAL": 1.0, "HIGH": 0.75, "MEDIUM": 0.5, "LOW": 0.25, "NONE": 0.0}
+
+ACTIONS = {
+    "CRITICAL": (
+        "INTERRUPT CONVERSATION. Ask 'Are you safe right now?' "
+        "Provide 988 Suicide & Crisis Lifeline. "
+        "Provide Crisis Text Line (HOME to 741741). "
+        "Stay present. Do not disconnect. Redirect to professional help."
+    ),
+    "HIGH": (
+        "Show crisis panel. Ask about safety. Surface 988 number prominently. "
+        "Continue conversation with crisis awareness."
+    ),
+    "MEDIUM": (
+        "Increase warmth and presence. Subtly surface help resources. "
+        "Keep conversation anchored in the present."
+    ),
+    "LOW": (
+        "Normal conversation with warm undertone. "
+        "No crisis UI elements needed. Remain vigilant."
+    ),
+}
+
+
+# ── Result types ──────────────────────────────────────────────────
+
+@dataclass
+class CrisisDetectionResult:
+    """Result used by crisis/detect.py, gateway, dying_detection."""
+    level: str
+    indicators: List[str] = field(default_factory=list)
+    recommended_action: str = ""
+    score: float = 0.0
+    matches: List[dict] = field(default_factory=list)
+
+
+@dataclass
+class CrisisResult:
+    """Legacy result used by crisis_detector.py and crisis_responder.py.
+
+    Backward-compatible shim: wraps CrisisDetectionResult with the old field names.
+    """
+    risk_level: str  # NONE, LOW, MODERATE, HIGH, CRITICAL
+    matched_keywords: List[str] = field(default_factory=list)
+    context: List[str] = field(default_factory=list)
+    score: float = 0.0
+    timestamp: Optional[str] = None
+
+    def __bool__(self):
+        return self.risk_level != "NONE"
+
+    @classmethod
+    def from_detection_result(cls, dr: CrisisDetectionResult, text: str = "") -> "CrisisResult":
+        """Convert a CrisisDetectionResult to legacy CrisisResult format."""
+        # Map MEDIUM -> MODERATE for legacy consumers
+        level = "MODERATE" if dr.level == "MEDIUM" else dr.level
+        # Extract context snippets from matches
+        contexts = []
+        if text:
+            for m in dr.matches:
+                ctx = extract_context(text, m["start"], m["end"])
+                contexts.append(ctx)
+        return cls(
+            risk_level=level,
+            matched_keywords=dr.indicators,
+            context=contexts,
+            score=dr.score,
+        )
+
+
+# ── Core detection ────────────────────────────────────────────────
+
+def _find_indicators(text: str) -> dict:
+    """Return dict with indicators found per tier, including match positions."""
+    results = {"CRITICAL": [], "HIGH": [], "MEDIUM": [], "LOW": []}
+
+    for pattern in CRITICAL_INDICATORS:
+        m = re.search(pattern, text)
+        if m:
+            results["CRITICAL"].append({"pattern": pattern, "start": m.start(), "end": m.end()})
+
+    for pattern in HIGH_INDICATORS:
+        m = re.search(pattern, text)
+        if m:
+            results["HIGH"].append({"pattern": pattern, "start": m.start(), "end": m.end()})
+
+    for pattern in MEDIUM_INDICATORS:
+        m = re.search(pattern, text)
+        if m:
+            results["MEDIUM"].append({"pattern": pattern, "start": m.start(), "end": m.end()})
+
+    for pattern in LOW_INDICATORS:
+        m = re.search(pattern, text)
+        if m:
+            results["LOW"].append({"pattern": pattern, "start": m.start(), "end": m.end()})
+
+    return results
+
+
 def detect_crisis(text: str) -> CrisisDetectionResult:
    """
    Detect crisis level in a message.

-    Returns:
-        CrisisDetectionResult with level, found indicators, recommended action, score
+    Detection hierarchy:
+      CRITICAL — immediate risk of self-harm or suicide (single match)
+      HIGH     — strong despair signals, ideation present (single match)
+      MEDIUM   — distress signals, requires 2+ indicators to escalate
+      LOW      — emotional difficulty, warrant gentle support (single match)
+      NONE     — no crisis indicators detected
+
+    Design principles:
+      - Never computes the value of a human life
+      - Never suggests someone should die or that death is a solution
+      - Always errs on the side of higher risk when uncertain
    """
    if not text or not text.strip():
        return CrisisDetectionResult(level="NONE", score=0.0)
@@ -133,82 +262,135 @@ def detect_crisis(text: str) -> CrisisDetectionResult:
    if not matches:
        return CrisisDetectionResult(level="NONE", score=0.0)

-    # Priority: highest tier wins
-    if matches["CRITICAL"]:
-        return CrisisDetectionResult(
-            level="CRITICAL",
-            indicators=matches["CRITICAL"],
-            recommended_action=(
-                "INTERRUPT CONVERSATION. Ask 'Are you safe right now?' "
-                "Provide 988 Suicide & Crisis Lifeline. "
-                "Provide Crisis Text Line (HOME to 741741). "
-                "Stay present. Do not disconnect. Redirect to professional help."
-            ),
-            score=1.0,
-        )
+    # CRITICAL and HIGH: single match is enough
+    for tier in ("CRITICAL", "HIGH"):
+        if matches[tier]:
+            tier_matches = matches[tier]
+            patterns = [m["pattern"] for m in tier_matches]
+            return CrisisDetectionResult(
+                level=tier,
+                indicators=patterns,
+                recommended_action=ACTIONS[tier],
+                score=SCORES[tier],
+                matches=tier_matches,
+            )

-    if matches["HIGH"]:
-        return CrisisDetectionResult(
-            level="HIGH",
-            indicators=matches["HIGH"],
-            recommended_action=(
-                "Show crisis panel. Ask about safety. Surface 988 number prominently. "
-                "Continue conversation with crisis awareness."
-            ),
-            score=0.75,
-        )
-
-    if matches["MEDIUM"]:
+    # MEDIUM tier: require at least 2 indicators before escalating
+    if len(matches["MEDIUM"]) >= 2:
+        tier_matches = matches["MEDIUM"]
+        patterns = [m["pattern"] for m in tier_matches]
        return CrisisDetectionResult(
            level="MEDIUM",
-            indicators=matches["MEDIUM"],
-            recommended_action=(
-                "Increase warmth and presence. Subtly surface help resources. "
-                "Keep conversation anchored in the present."
-            ),
-            score=0.5,
+            indicators=patterns,
+            recommended_action=ACTIONS["MEDIUM"],
+            score=SCORES["MEDIUM"],
+            matches=tier_matches,
        )

    if matches["LOW"]:
+        tier_matches = matches["LOW"]
+        patterns = [m["pattern"] for m in tier_matches]
        return CrisisDetectionResult(
            level="LOW",
-            indicators=matches["LOW"],
-            recommended_action=(
-                "Normal conversation with warm undertone. "
-                "No crisis UI elements needed. Remain vigilant."
-            ),
-            score=0.25,
+            indicators=patterns,
+            recommended_action=ACTIONS["LOW"],
+            score=SCORES["LOW"],
+            matches=tier_matches,
+        )
+
+    # Single MEDIUM match falls through to LOW sensitivity
+    if matches["MEDIUM"]:
+        tier_matches = matches["MEDIUM"]
+        patterns = [m["pattern"] for m in tier_matches]
+        return CrisisDetectionResult(
+            level="LOW",
+            indicators=patterns,
+            recommended_action=ACTIONS["LOW"],
+            score=SCORES["LOW"],
+            matches=tier_matches,
        )

    return CrisisDetectionResult(level="NONE", score=0.0)


-def _find_indicators(text: str) -> dict:
-    """Return dict with indicators found per tier."""
-    results = {"CRITICAL": [], "HIGH": [], "MEDIUM": [], "LOW": []}
+# ── CrisisDetector class (backward compat) ───────────────────────

-    for pattern in CRITICAL_INDICATORS:
-        if re.search(pattern, text):
-            results["CRITICAL"].append(pattern)
+class CrisisDetector:
+    """
+    Legacy class API for crisis detection. Wraps the canonical detect_crisis().

-    for pattern in HIGH_INDICATORS:
-        if re.search(pattern, text):
-            results["HIGH"].append(pattern)
+    Used by crisis_responder.py and tests/test_false_positive_fixes.py.
+    Maps MEDIUM -> MODERATE for legacy consumers.
+    """

-    for pattern in MEDIUM_INDICATORS:
-        if re.search(pattern, text):
-            results["MEDIUM"].append(pattern)
+    def scan(self, text: str) -> CrisisResult:
+        dr = detect_crisis(text)
+        return CrisisResult.from_detection_result(dr, text=text)

-    for pattern in LOW_INDICATORS:
-        if re.search(pattern, text):
-            results["LOW"].append(pattern)
+    def scan_multiple(self, texts: List[str]) -> List[CrisisResult]:
+        return [self.scan(t) for t in texts]

-    return results
+    def get_highest_risk(self, texts: List[str]) -> CrisisResult:
+        results = self.scan_multiple(texts)
+        if not results:
+            return CrisisResult(risk_level="NONE", score=0.0)
+        return max(results, key=lambda r: r.score)
+
+    @staticmethod
+    def format_result(result: CrisisResult) -> str:
+        level_emoji = {
+            "CRITICAL": "\U0001f6a8",
+            "HIGH": "\u26a0\ufe0f",
+            "MODERATE": "\U0001f536",
+            "LOW": "\U0001f535",
+            "NONE": "\u2705",
+        }
+        emoji = level_emoji.get(result.risk_level, "\u2753")
+        lines = [
+            f"{emoji} Risk Level: {result.risk_level} (score: {result.score:.2f})",
+            f"Matched keywords: {len(result.matched_keywords)}",
+        ]
+        if result.matched_keywords:
+            lines.append(f"  Keywords: {', '.join(result.matched_keywords)}")
+        if result.context:
+            lines.append("Context:")
+            for ctx in result.context:
+                lines.append(f"  {ctx}")
+        return "\n".join(lines)
+
+
+# ── Module-level convenience (backward compat) ────────────────────
+
+_default_detector = CrisisDetector()
+
+
+def detect_crisis_legacy(text: str) -> CrisisResult:
+    """Convenience function returning legacy CrisisResult format."""
+    return _default_detector.scan(text)
+
+
+# ── Utility functions ─────────────────────────────────────────────
+
+def scan(text: str) -> CrisisDetectionResult:
+    """Alias for detect_crisis — shorter name used in tests."""
+    return detect_crisis(text)
+
+
+def extract_context(text: str, start: int, end: int, window: int = 60) -> str:
+    """Extract surrounding context around a match position."""
+    ctx_start = max(0, start - window)
+    ctx_end = min(len(text), end + window)
+    snippet = text[ctx_start:ctx_end].strip()
+    if ctx_start > 0:
+        snippet = "..." + snippet
+    if ctx_end < len(text):
+        snippet = snippet + "..."
+    return snippet


 def get_urgency_emoji(level: str) -> str:
-    mapping = {"CRITICAL": "🚨", "HIGH": "⚠️", "MEDIUM": "🔶", "LOW": "🔵", "NONE": "✅"}
-    return mapping.get(level, "❓")
+    mapping = {"CRITICAL": "\U0001f6a8", "HIGH": "\u26a0\ufe0f", "MEDIUM": "\U0001f536", "LOW": "\U0001f535", "NONE": "\u2705"}
+    return mapping.get(level, "\u2753")


 def format_result(result: CrisisDetectionResult) -> str:
--- a/crisis/gateway.py
+++ b/crisis/gateway.py
@@ -2,18 +2,21 @@
 Crisis Gateway Module for the-door.

 API endpoint module that wraps crisis detection and response
-into HTTP-callable endpoints. Integrates detect.py and response.py.
+into HTTP-callable endpoints. Integrates detect.py, unified_scorer.py, and response.py.

 Usage:
    from crisis.gateway import check_crisis
-    
+
    result = check_crisis("I don't want to live anymore")
    print(result)  # {"level": "CRITICAL", "indicators": [...], "response": {...}}
 """

 import json
+from pathlib import Path
 from typing import Optional

+from unified_scorer import UnifiedCrisisScorer, UnifiedScoreAuditLog, behavioral_score_from_session
+
 from .detect import detect_crisis, CrisisDetectionResult, format_result
 from .compassion_router import router
 from .response import (
@@ -22,6 +25,7 @@ from .response import (
    get_system_prompt_modifier,
    CrisisResponse,
 )
+from .session_tracker import CrisisSessionTracker


 def check_crisis(text: str) -> dict:
@@ -49,6 +53,74 @@ def check_crisis(text: str) -> dict:
    }


+def check_crisis_multimodal(
+    text: str,
+    *,
+    tracker: Optional[CrisisSessionTracker] = None,
+    voice_score: Optional[float] = None,
+    image_score: Optional[float] = None,
+    behavioral_score: Optional[float] = None,
+    audit_log_path: Optional[Path] = None,
+    weights: Optional[dict] = None,
+) -> dict:
+    """Combine text, voice, image, and behavioral signals into one crisis assessment."""
+    detection = detect_crisis(text)
+    session_state = tracker.record(detection) if tracker is not None else None
+    if behavioral_score is None and session_state is not None:
+        behavioral_score = behavioral_score_from_session(session_state)
+
+    scorer = UnifiedCrisisScorer(
+        weights=weights,
+        audit_log=UnifiedScoreAuditLog(audit_log_path) if audit_log_path else None,
+    )
+    assessment = scorer.score(
+        text_score=detection.score,
+        voice_score=voice_score,
+        image_score=image_score,
+        behavioral_score=behavioral_score,
+        source_text=text,
+    )
+
+    unified_detection = CrisisDetectionResult(
+        level=assessment.level.value,
+        indicators=detection.indicators,
+        recommended_action=detection.recommended_action,
+        score=assessment.combined_score,
+        matches=detection.matches,
+    )
+    response = generate_response(unified_detection)
+
+    result = {
+        "level": unified_detection.level,
+        "score": unified_detection.score,
+        "indicators": detection.indicators,
+        "recommended_action": unified_detection.recommended_action,
+        "timmy_message": response.timmy_message,
+        "ui": {
+            "show_crisis_panel": response.show_crisis_panel,
+            "show_overlay": response.show_overlay,
+            "provide_988": response.provide_988,
+        },
+        "escalate": response.escalate,
+        "unified": {
+            "level": assessment.level.value,
+            "combined_score": assessment.combined_score,
+            "weights": assessment.weights,
+            "modalities": assessment.modalities,
+            "present_modalities": assessment.present_modalities,
+        },
+    }
+    if session_state is not None:
+        result["session"] = {
+            "current_level": session_state.current_level,
+            "peak_level": session_state.peak_level,
+            "message_count": session_state.message_count,
+            "is_escalating": session_state.is_escalating,
+            "is_deescalating": session_state.is_deescalating,
+        }
+    return result
+
+
 def get_system_prompt(base_prompt: str, text: str = "") -> str:
    """
    Sovereign Heart System Prompt Override.
--- a/crisis/response.py
+++ b/crisis/response.py
@@ -270,3 +270,24 @@ def get_system_prompt_modifier(detection: CrisisDetectionResult) -> str:
        )

    return ""
+
+
+def generate_grounding_steps() -> list:
+    """Generate a 5-4-3-2-1 grounding exercise steps."""
+    return [
+        "Name 5 things you can see around you right now.",
+        "Name 4 things you can touch or feel.",
+        "Name 3 things you can hear.",
+        "Name 2 things you can smell.",
+        "Name 1 thing you can taste.",
+    ]
+
+
+def generate_breathing_exercise() -> str:
+    """Generate a simple box breathing exercise text."""
+    return (
+        "Let's try breathing together. "
+        "Breathe in for 4 counts... hold for 4... "
+        "breathe out for 6 counts... hold for 2. "
+        "Let's do that again, nice and slow."
+    )
--- a/crisis/session_tracker.py
+++ b/crisis/session_tracker.py
@@ -0,0 +1,259 @@
+"""
+Session-level crisis tracking and escalation for the-door (P0 #35).
+
+Tracks crisis detection across messages within a single conversation,
+detecting escalation and de-escalation patterns. Privacy-first: no
+persistence beyond the conversation session.
+
+Each message is analyzed in isolation by detect.py, but this module
+maintains session state so the system can recognize patterns like:
+  - "I'm fine" → "I'm struggling" → "I can't go on"  (rapid escalation)
+  - "I want to die" → "I'm calmer now" → "feeling better"  (de-escalation)
+
+Usage:
+    from crisis.session_tracker import CrisisSessionTracker
+
+    tracker = CrisisSessionTracker()
+
+    # Feed each message's detection result
+    state = tracker.record(detect_crisis("I'm having a tough day"))
+    print(state.current_level)  # "LOW"
+    print(state.is_escalating)  # False
+
+    state = tracker.record(detect_crisis("I feel hopeless"))
+    print(state.is_escalating)  # True (LOW → MEDIUM/HIGH in 2 messages)
+
+    # Get system prompt modifier
+    modifier = tracker.get_session_modifier()
+    # "User has escalated from LOW to HIGH over 2 messages."
+
+    # Reset for new session
+    tracker.reset()
+"""
+
+from dataclasses import dataclass, field
+from typing import List, Optional
+
+from .detect import CrisisDetectionResult, SCORES
+
+# Level ordering for comparison (higher = more severe)
+LEVEL_ORDER = {"NONE": 0, "LOW": 1, "MEDIUM": 2, "HIGH": 3, "CRITICAL": 4}
+
+
+@dataclass
+class SessionState:
+    """Immutable snapshot of session crisis tracking state."""
+
+    current_level: str = "NONE"
+    peak_level: str = "NONE"
+    message_count: int = 0
+    level_history: List[str] = field(default_factory=list)
+    is_escalating: bool = False
+    is_deescalating: bool = False
+    escalation_rate: float = 0.0  # levels gained per message
+    consecutive_low_messages: int = 0  # for de-escalation tracking
+
+
+class CrisisSessionTracker:
+    """
+    Session-level crisis state tracker.
+
+    Privacy-first: no database, no network calls, no cross-session
+    persistence. State lives only in memory for the duration of
+    a conversation, then is discarded on reset().
+    """
+
+    # Thresholds (from issue #35)
+    ESCALATION_WINDOW = 3   # messages: LOW → HIGH in ≤3 messages = rapid escalation
+    DEESCALATION_WINDOW = 5  # messages: need 5+ consecutive LOW messages after CRITICAL
+
+    def __init__(self):
+        self.reset()
+
+    def reset(self):
+        """Reset all session state. Call on new conversation."""
+        self._current_level = "NONE"
+        self._peak_level = "NONE"
+        self._message_count = 0
+        self._level_history: List[str] = []
+        self._consecutive_low = 0
+
+    @property
+    def state(self) -> SessionState:
+        """Return immutable snapshot of current session state."""
+        is_escalating = self._detect_escalation()
+        is_deescalating = self._detect_deescalation()
+        rate = self._compute_escalation_rate()
+
+        return SessionState(
+            current_level=self._current_level,
+            peak_level=self._peak_level,
+            message_count=self._message_count,
+            level_history=list(self._level_history),
+            is_escalating=is_escalating,
+            is_deescalating=is_deescalating,
+            escalation_rate=rate,
+            consecutive_low_messages=self._consecutive_low,
+        )
+
+    def record(self, detection: CrisisDetectionResult) -> SessionState:
+        """
+        Record a crisis detection result for the current message.
+
+        Returns updated SessionState.
+        """
+        level = detection.level
+        self._message_count += 1
+        self._level_history.append(level)
+
+        # Update peak
+        if LEVEL_ORDER.get(level, 0) > LEVEL_ORDER.get(self._peak_level, 0):
+            self._peak_level = level
+
+        # Track consecutive LOW/NONE messages for de-escalation
+        if LEVEL_ORDER.get(level, 0) <= LEVEL_ORDER["LOW"]:
+            self._consecutive_low += 1
+        else:
+            self._consecutive_low = 0
+
+        self._current_level = level
+        return self.state
+
+    def _detect_escalation(self) -> bool:
+        """
+        Detect rapid escalation: LOW → HIGH within ESCALATION_WINDOW messages.
+
+        Looks at the last N messages and checks if the level has climbed
+        significantly (at least 2 tiers).
+        """
+        if len(self._level_history) < 2:
+            return False
+
+        window = self._level_history[-self.ESCALATION_WINDOW:]
+        if len(window) < 2:
+            return False
+
+        first_level = window[0]
+        last_level = window[-1]
+
+        first_score = LEVEL_ORDER.get(first_level, 0)
+        last_score = LEVEL_ORDER.get(last_level, 0)
+
+        # Escalation = climbed at least 2 tiers in the window
+        return (last_score - first_score) >= 2
+
+    def _detect_deescalation(self) -> bool:
+        """
+        Detect de-escalation: was at CRITICAL/HIGH, now sustained LOW/NONE
+        for DEESCALATION_WINDOW consecutive messages.
+        """
+        if LEVEL_ORDER.get(self._peak_level, 0) < LEVEL_ORDER["HIGH"]:
+            return False
+
+        return self._consecutive_low >= self.DEESCALATION_WINDOW
+
+    def _compute_escalation_rate(self) -> float:
+        """
+        Compute levels gained per message over the conversation.
+
+        Positive = escalating, negative = de-escalating, 0 = stable.
+        """
+        if self._message_count < 2:
+            return 0.0
+
+        first = LEVEL_ORDER.get(self._level_history[0], 0)
+        current = LEVEL_ORDER.get(self._current_level, 0)
+
+        return (current - first) / (self._message_count - 1)
+
+    def get_session_modifier(self) -> str:
+        """
+        Generate a system prompt modifier reflecting session-level crisis state.
+
+        Returns empty string if no session context is relevant.
+        """
+        if self._message_count < 2:
+            return ""
+
+        s = self.state
+
+        if s.is_escalating:
+            return (
+                f"User has escalated from {self._level_history[0]} to "
+                f"{s.current_level} over {s.message_count} messages. "
+                f"Peak crisis level this session: {s.peak_level}. "
+                "Respond with heightened awareness. The trajectory is "
+                "worsening — prioritize safety and connection."
+            )
+
+        if s.is_deescalating:
+            return (
+                f"User previously reached {s.peak_level} crisis level "
+                f"but has been at {s.current_level} or below for "
+                f"{s.consecutive_low_messages} consecutive messages. "
+                "The situation appears to be stabilizing. Continue "
+                "supportive engagement while remaining vigilant."
+            )
+
+        if s.peak_level in ("CRITICAL", "HIGH") and s.current_level not in ("CRITICAL", "HIGH"):
+            return (
+                f"User previously reached {s.peak_level} crisis level "
+                f"this session (currently {s.current_level}). "
+                "Continue with care and awareness of the earlier crisis."
+            )
+
+        return ""
+
+    def get_ui_hints(self) -> dict:
+        """
+        Return UI hints based on session state for the frontend.
+
+        These are advisory — the frontend decides what to show.
+        """
+        s = self.state
+
+        hints = {
+            "session_escalating": s.is_escalating,
+            "session_deescalating": s.is_deescalating,
+            "session_peak_level": s.peak_level,
+            "session_message_count": s.message_count,
+        }
+
+        if s.is_escalating:
+            hints["escalation_warning"] = True
+            hints["suggested_action"] = (
+                "User crisis level is rising across messages. "
+                "Consider increasing intervention level."
+            )
+
+        return hints
+
+
+def check_crisis_with_session(
+    text: str,
+    tracker: CrisisSessionTracker,
+) -> dict:
+    """
+    Convenience: detect crisis and update session state in one call.
+
+    Returns combined single-message detection + session-level context.
+    """
+    from .detect import detect_crisis
+    from .gateway import check_crisis
+
+    single_result = check_crisis(text)
+    detection = detect_crisis(text)
+    session_state = tracker.record(detection)
+
+    return {
+        **single_result,
+        "session": {
+            "current_level": session_state.current_level,
+            "peak_level": session_state.peak_level,
+            "message_count": session_state.message_count,
+            "is_escalating": session_state.is_escalating,
+            "is_deescalating": session_state.is_deescalating,
+            "modifier": tracker.get_session_modifier(),
+            "ui_hints": tracker.get_ui_hints(),
+        },
+    }
--- a/crisis/test_rescue.py
+++ b/crisis/test_rescue.py
@@ -0,0 +1,29 @@
+"""Tests for rescued crisis detection improvements."""
+from crisis.detect import scan, extract_context
+from crisis.response import generate_grounding_steps, generate_breathing_exercise
+
+def test_better_off_without_me():
+    result = scan("Everyone would be better off without me")
+    assert result.level == "CRITICAL"
+
+def test_desperate():
+    result = scan("I feel desperate and alone")
+    assert result.level in ("HIGH", "CRITICAL")
+
+def test_context_extraction():
+    text = "I feel hopeless about everything"
+    result = scan(text)
+    assert len(result.matches) > 0
+    for m in result.matches:
+        ctx = extract_context(text, m["start"], m["end"])
+        assert len(ctx) > 0
+
+def test_grounding_steps():
+    steps = generate_grounding_steps()
+    assert len(steps) == 5
+    assert "see" in steps[0].lower()
+
+def test_breathing_exercise():
+    exercise = generate_breathing_exercise()
+    assert "4" in exercise
+    assert "6" in exercise
--- a/crisis/tests.py
+++ b/crisis/tests.py
@@ -53,6 +53,7 @@ class TestDetection(unittest.TestCase):

    def test_high_hopeless(self):
        r = detect_crisis("I feel completely hopeless with no way out")
+        # 'hopeless' is MEDIUM; 'no way out' is HIGH — so result is HIGH
        self.assertIn(r.level, ("HIGH", "MEDIUM"))

    def test_high_no_one_would_miss(self):
@@ -112,7 +113,7 @@ class TestDetection(unittest.TestCase):
        }
        for text, expected_level in [
            ("I want to kill myself", "CRITICAL"),
-            ("I feel completely hopeless", "HIGH"),
+            ("I feel completely hopeless with no way out", "HIGH"),
            ("I feel so alone in this, nobody understands", "MEDIUM"),
            ("Having a rough day", "LOW"),
            ("Hello there", "NONE"),
@@ -270,6 +271,65 @@ class TestHelpers(unittest.TestCase):
        self.assertIn("Indicators", formatted)


+class TestFalsePositives(unittest.TestCase):
+    """Regression tests for Issue #32: crisis detector false positives.
+
+    Innocent messages must NOT trigger crisis levels. These tests prevent
+    regressions when keyword lists are modified.
+    """
+
+    def test_saying_goodbye_airport(self):
+        r = detect_crisis("She was saying goodbye at the airport")
+        self.assertEqual(r.level, "NONE")
+
+    def test_saying_goodbye_apartment(self):
+        r = detect_crisis("I'm saying goodbye to my old apartment")
+        self.assertEqual(r.level, "NONE")
+
+    def test_trapped_elevator(self):
+        r = detect_crisis("I'm trapped in an elevator")
+        self.assertEqual(r.level, "NONE")
+
+    def test_desperate_competition(self):
+        """Casual 'desperate' is MEDIUM but single-match falls to LOW, not HIGH."""
+        r = detect_crisis("She's desperate to win the race")
+        self.assertIn(r.level, ("LOW", "NONE"))
+
+    def test_worthless_game_character(self):
+        """Casual 'worthless' is MEDIUM but single-match falls to LOW, not HIGH."""
+        r = detect_crisis("This character is worthless in the game")
+        self.assertIn(r.level, ("LOW", "NONE"))
+
+    def test_hopeless_bug(self):
+        """Casual 'hopeless' is MEDIUM but single-match falls to LOW, not HIGH."""
+        r = detect_crisis("This bug is hopeless")
+        self.assertIn(r.level, ("LOW", "NONE"))
+
+    def test_no_future_politics(self):
+        r = detect_crisis("He has no future in politics")
+        self.assertEqual(r.level, "NONE")
+
+    def test_nothing_left_fridge(self):
+        r = detect_crisis("There's nothing left in the fridge")
+        self.assertEqual(r.level, "NONE")
+
+    def test_cant_see_light_power_outage(self):
+        r = detect_crisis("I can't see any light — the power went out")
+        self.assertEqual(r.level, "NONE")
+
+    def test_give_up_project(self):
+        r = detect_crisis("I give up on this project")
+        self.assertEqual(r.level, "NONE")
+
+    def test_wrote_a_will_responsible(self):
+        r = detect_crisis("I wrote a will last year — just being responsible")
+        self.assertEqual(r.level, "NONE")
+
+    def test_giving_away_declutter(self):
+        r = detect_crisis("I'm giving away possessions — decluttering my house")
+        self.assertEqual(r.level, "NONE")
+
+
 class TestEdgeCases(unittest.TestCase):
    """Test edge cases and integration scenarios."""

--- a/crisis_detector.py
+++ b/crisis_detector.py
@@ -1,260 +1,34 @@
 """
-Crisis Detection System for the-door.
+Crisis Detection System for the-door (LEGACY SHIM).

-Scans text for suicide, self-harm, and hopelessness signals.
-Returns risk level, matched keywords, and surrounding context.
+This module is a backward-compatible re-export layer.
+The canonical detection logic lives in crisis/detect.py.

-This is the most important code in the foundation.
-Every line here exists because someone's life depends on it.
-
-Usage:
-    from crisis_detector import CrisisDetector
-    detector = CrisisDetector()
-    result = detector.scan("I can't go on anymore")
-    print(result.risk_level)       # "HIGH"
-    print(result.matched_keywords) # ["can't go on"]
-    print(result.context)          # surrounding text snippets
+Both crisis_responder.py and the legacy test suite import from here.
+Do NOT add detection logic to this file — it all comes from crisis.detect.
 """

-import re
-from dataclasses import dataclass, field
-from typing import List, Optional, Tuple
+from crisis.detect import (
+    CrisisDetector,
+    CrisisResult,
+    CrisisDetectionResult,
+    detect_crisis_legacy as detect_crisis,
+    CRITICAL_INDICATORS,
+    HIGH_INDICATORS,
+    MEDIUM_INDICATORS,
+    LOW_INDICATORS,
+    SCORES as RISK_SCORES,
+)

-
-@dataclass
-class CrisisResult:
-    """Result of a crisis text scan."""
-    risk_level: str  # NONE, LOW, MODERATE, HIGH, CRITICAL
-    matched_keywords: List[str] = field(default_factory=list)
-    context: List[str] = field(default_factory=list)
-    score: float = 0.0
-    timestamp: Optional[str] = None
-
-    def __bool__(self):
-        return self.risk_level != "NONE"
-
-
-# ── Keyword definitions ──────────────────────────────────────────
-
-CRITICAL_KEYWORDS = {
-    "suicide": r"\bsuicid(?:al|e|ed)\b",
-    "kill myself": r"\bkill\s*(?:my)?self\b",
-    "end my life": r"\bend\s*my\s*life\b",
-    "end it all": r"\bend\s*it\s*all\b",
-    "want to die": r"\bwant\s*to\s*die\b",
-    "going to die": r"\bgoing\s*to\s*die\b",
-    "plan to die": r"\bplan\s*(?:to|for)\s*(?:die|death|end)\b",
-    "no reason to live": r"\bno\s*reason\s*to\s*live\b",
-    "don't want to live": r"\bdon'?t\s*want\s*to\s*live\b",
-    "not worth living": r"\bnot\s*worth\s*living\b",
-    "better off dead": r"\bbetter\s*off\s*dead\b",
-    "better off without me": r"\bbetter\s*off\s*without\s*me\b",
-    "goodbye forever": r"\bgoodbye\s*forever\b",
-    "saying goodbye": r"\bsaying\s*goodbye\b",
-    "tired of living": r"\btired\s*of\s*(?:living|life|existence)\b",
-    "wrote a will": r"\bwrote\s*(?:a|my)\s*(?:will|suicide\s*note|letter)\b",
-    "giving away possessions": r"\bgiving\s*away\s*(?:my|all)\s*possess\b",
-}
-
-HIGH_KEYWORDS = {
-    "hopeless": r"\bhopeless(?:ness)?\b",
-    "can't go on": r"\bcan'?t\s*go\s*on\b",
-    "can't keep going": r"\bcan'?t\s*keep\s*going\b",
-    "can't take this": r"\bcan'?t\s*take\s*this\b",
-    "give up": r"\bgive(?:n)?\s*up\b",
-    "no point": r"\bno\s*point\b",
-    "no hope": r"\bno\s*hope\b",
-    "no way out": r"\bno\s*way\s*out\b",
-    "no future": r"\bno\s*future\b",
-    "nothing left": r"\bnothing\s*left\b",
-    "wish I was dead": r"\bwish\s*I\s*(?:was|were)\s*(?:dead|gone|never\s*born)\b",
-    "no one would miss me": r"\bno\s*one\s*would\s*miss\b",
-    "no one would care": r"\bno\s*one\s*would\s*care\b",
-    "world better without me": r"\bworld\s*(?:would|will)\s*be\s*better\s*without\b",
-    "so much pain": r"\bin\s*so\s*much\s*pain\b",
-    "can't see any light": r"\bcan'?t\s*see\s*(?:any\s*)?(?:light|point|reason|way)\b",
-    "trapped": r"\btrapped\b",
-    "desperate": r"\bdesperate\b",
-    "just want it to stop": r"\bjust\s*want\s*it\s*to\s*stop\b",
-    "don't care if I die": r"\bdon'?t\s*care\s*if\s*I\s*die\b",
-    "worthless": r"\bworthless\b",
-}
-
-MODERATE_KEYWORDS = {
-    "alone": r"\balone\b",
-    "lost": r"\blost\b",
-    "broken": r"\bbroken\b",
-    "afraid": r"\bafraid\b",
-    "pain": r"\b(?:in\s*)?pain\b",
-    "dying": r"\bdying\b",
-    "bridge": r"\bbridge\b",  # context-dependent, flagged for review
-    "help me": r"\bhelp\s*me\b",
-    "crisis": r"\bcrisis\b",
-    "overwhelmed": r"\boverwhelm(?:ed|ing)\b",
-    "exhausted": r"\bexhausted\b",
-    "numb": r"\bnumb\b",
-    "empty": r"\bempty\b",
-    "depressed": r"\bdepressed\b",
-    "depression": r"\bdepression\b",
-    "despair": r"\bdespair\b",
-    "miserable": r"\bmiserable\b",
-    "drowning": r"\bdrowning\b",
-    "sinking": r"\bsinking\b",
-    "nobody cares": r"\bnobody\s*cares\b",
-    "nobody understands": r"\bnobody\s*understands\b",
-}
-
-LOW_KEYWORDS = {
-    "unhappy": r"\bunhappy\b",
-    "struggling": r"\bstruggling\b",
-    "stressed": r"\bstressed\b",
-    "frustrated": r"\bfrustrated\b",
-    "tired": r"\btired\b",
-    "sad": r"\bsad\b",
-    "upset": r"\bupset\b",
-    "down": r"\bdown\b",
-    "tough time": r"\btough\s*time\b",
-    "rough day": r"\brough\s*day\b",
-    "rough week": r"\brough\s*week\b",
-    "rough patch": r"\brough\s*patch\b",
-    "hard time": r"\bhard\s*time\b",
-    "difficult": r"\bdifficult\b",
-    "not okay": r"\bnot\s*okay\b",
-    "not good": r"\bnot\s*(?:good|great)\b",
-    "burnout": r"\bburnout\b",
-    "not feeling myself": r"\bnot\s*feeling\s*(?:like\s*)?myself\b",
-}
-
-# ── Risk level scoring ───────────────────────────────────────────
-
-RISK_SCORES = {
-    "CRITICAL": 1.0,
-    "HIGH": 0.75,
-    "MODERATE": 0.5,
-    "LOW": 0.25,
-    "NONE": 0.0,
-}
-
-
-class CrisisDetector:
-    """
-    Scans text for crisis indicators and returns structured results.
-
-    Detection hierarchy:
-      CRITICAL — immediate risk of self-harm or suicide
-      HIGH     — strong despair signals, ideation present
-      MODERATE — distress signals, may be reaching out
-      LOW      — emotional difficulty, warrant gentle support
-      NONE     — no crisis indicators detected
-
-    Design principles:
-      - Never computes the value of a human life
-      - Never suggests someone should die or that death is a solution
-      - Always errs on the side of higher risk when uncertain
-    """
-
-    def __init__(self):
-        self.critical_patterns = CRITICAL_KEYWORDS
-        self.high_patterns = HIGH_KEYWORDS
-        self.moderate_patterns = MODERATE_KEYWORDS
-        self.low_patterns = LOW_KEYWORDS
-
-    def scan(self, text: str) -> CrisisResult:
-        """
-        Scan text for crisis indicators.
-
-        Args:
-            text: The message text to analyze.
-
-        Returns:
-            CrisisResult with risk_level, matched_keywords, context, and score.
-        """
-        if not text or not text.strip():
-            return CrisisResult(risk_level="NONE", score=0.0)
-
-        text_lower = text.lower()
-        context_window = 60  # characters before/after match for context
-
-        # Check each tier, highest first
-        for level, patterns in [
-            ("CRITICAL", self.critical_patterns),
-            ("HIGH", self.high_patterns),
-            ("MODERATE", self.moderate_patterns),
-            ("LOW", self.low_patterns),
-        ]:
-            matched = []
-            contexts = []
-
-            for keyword, pattern in patterns.items():
-                match = re.search(pattern, text_lower)
-                if match:
-                    matched.append(keyword)
-                    # Extract surrounding context
-                    start = max(0, match.start() - context_window)
-                    end = min(len(text), match.end() + context_window)
-                    snippet = text[start:end].strip()
-                    if start > 0:
-                        snippet = "..." + snippet
-                    if end < len(text):
-                        snippet = snippet + "..."
-                    contexts.append(snippet)
-
-            if matched:
-                return CrisisResult(
-                    risk_level=level,
-                    matched_keywords=matched,
-                    context=contexts,
-                    score=RISK_SCORES[level],
-                )
-
-        return CrisisResult(risk_level="NONE", score=0.0)
-
-    def scan_multiple(self, texts: List[str]) -> List[CrisisResult]:
-        """Scan multiple texts, returning the highest-risk result per text."""
-        return [self.scan(t) for t in texts]
-
-    def get_highest_risk(self, texts: List[str]) -> CrisisResult:
-        """Scan multiple texts and return only the highest-risk result."""
-        results = self.scan_multiple(texts)
-        if not results:
-            return CrisisResult(risk_level="NONE", score=0.0)
-        return max(results, key=lambda r: r.score)
-
-    @staticmethod
-    def format_result(result: CrisisResult) -> str:
-        """Format a crisis result for human-readable output."""
-        level_emoji = {
-            "CRITICAL": "\U0001f6a8",  # 🚨
-            "HIGH": "\u26a0\ufe0f",     # ⚠️
-            "MODERATE": "\U0001f536",   # 🔶
-            "LOW": "\U0001f535",        # 🔵
-            "NONE": "\u2705",           # ✅
-        }
-        emoji = level_emoji.get(result.risk_level, "\u2753")
-        lines = [
-            f"{emoji} Risk Level: {result.risk_level} (score: {result.score:.2f})",
-            f"Matched keywords: {len(result.matched_keywords)}",
-        ]
-        if result.matched_keywords:
-            lines.append(f"  Keywords: {', '.join(result.matched_keywords)}")
-        if result.context:
-            lines.append("Context:")
-            for ctx in result.context:
-                lines.append(f"  {ctx}")
-        return "\n".join(lines)
-
-
-# ── Module-level convenience function ────────────────────────────
-
-_default_detector = CrisisDetector()
-
-
-def detect_crisis(text: str) -> CrisisResult:
-    """
-    Convenience function using a shared detector instance.
-
-    Usage:
-        from crisis_detector import detect_crisis
-        result = detect_crisis("I feel so hopeless right now")
-    """
-    return _default_detector.scan(text)
+# Re-export everything the legacy API exposed
+__all__ = [
+    "CrisisDetector",
+    "CrisisResult",
+    "CrisisDetectionResult",
+    "detect_crisis",
+    "CRITICAL_INDICATORS",
+    "HIGH_INDICATORS",
+    "MEDIUM_INDICATORS",
+    "LOW_INDICATORS",
+    "RISK_SCORES",
+]
--- a/deploy/deploy.sh
+++ b/deploy/deploy.sh
@@ -5,9 +5,10 @@
 # The crisis front door. Deploy to VPS.
 #
 # Usage:
-#   bash deploy/deploy.sh          # Full deploy (swap + nginx + site + firewall)
+#   bash deploy/deploy.sh          # Full deploy (swap + nginx + site + firewall + hermes service)
 #   bash deploy/deploy.sh --site   # Site files only (fast update)
 #   bash deploy/deploy.sh --ssl    # SSL setup only
+#   bash deploy/deploy.sh --service # Install/restart hermes-gateway systemd service
 #   bash deploy/deploy.sh --check  # Verify deployment health
 #
 # This script is IDEMPOTENT — safe to run repeatedly.
@@ -150,6 +151,42 @@ setup_ssl() {
    fi
 }

+setup_hermes_service() {
+    log "Setting up Hermes Gateway systemd service..."
+
+    # Create hermes user if it doesn't exist
+    if ! id -u hermes >/dev/null 2>&1; then
+        log "Creating hermes user..."
+        useradd --system --shell /usr/sbin/nologin --home-dir /opt/hermes --create-home hermes
+    fi
+
+    # Create working directory
+    mkdir -p /opt/hermes
+    chown hermes:hermes /opt/hermes
+
+    # Deploy systemd unit file
+    cp "${DEPLOY_DIR}/deploy/hermes-gateway.service" /etc/systemd/system/hermes-gateway.service
+    systemctl daemon-reload
+    systemctl enable hermes-gateway
+
+    # Start or restart the service
+    if systemctl is-active --quiet hermes-gateway; then
+        log "Restarting hermes-gateway service..."
+        systemctl restart hermes-gateway
+    else
+        log "Starting hermes-gateway service..."
+        systemctl start hermes-gateway || warn "Service start failed — ensure hermes binary is installed at /usr/local/bin/hermes"
+    fi
+
+    # Verify
+    sleep 2
+    if systemctl is-active --quiet hermes-gateway; then
+        log "hermes-gateway service is running"
+    else
+        warn "hermes-gateway service not running — check: journalctl -u hermes-gateway"
+    fi
+}
+
 check_deployment() {
    echo ""
    echo "================================"
@@ -223,6 +260,16 @@ check_deployment() {
        echo -e "${YELLOW}NOT POINTED${NC} (resolved: ${RESOLVED_IP:-nothing}, expected: ${VPS_IP})"
    fi

+    # Hermes gateway service
+    echo -n "Hermes service: "
+    if systemctl is-active --quiet hermes-gateway 2>/dev/null; then
+        echo -e "${GREEN}RUNNING${NC}"
+    elif systemctl is-enabled --quiet hermes-gateway 2>/dev/null; then
+        echo -e "${YELLOW}ENABLED but not running${NC}"
+    else
+        echo -e "${RED}NOT INSTALLED${NC}"
+    fi
+
    echo ""
    echo "IP: ${VPS_IP}"
    echo "Domain: ${DOMAIN}"
@@ -247,6 +294,9 @@ case "${1:-full}" in
    --ssl)
        setup_ssl
        ;;
+    --service)
+        setup_hermes_service
+        ;;
    --check)
        check_deployment
        ;;
@@ -257,10 +307,11 @@ case "${1:-full}" in
        configure_nginx
        setup_firewall
        setup_ssl
+        setup_hermes_service
        check_deployment
        ;;
    *)
-        echo "Usage: $0 [--site|--ssl|--check|--full]"
+        echo "Usage: $0 [--site|--ssl|--service|--check|--full]"
        exit 1
        ;;
 esac
--- a/deploy/hermes-gateway.service
+++ b/deploy/hermes-gateway.service
@@ -0,0 +1,40 @@
+[Unit]
+Description=Hermes Gateway — The Door Crisis API
+Documentation=https://forge.alexanderwhitestone.com/Timmy_Foundation/the-door
+After=network.target
+Wants=network-online.target
+
+[Service]
+Type=simple
+User=hermes
+Group=hermes
+WorkingDirectory=/opt/hermes
+ExecStart=/usr/local/bin/hermes gateway --platform api_server --port 8644
+Restart=always
+RestartSec=5
+StartLimitIntervalSec=60
+StartLimitBurst=10
+
+# Environment
+Environment=API_SERVER_CORS_ORIGINS=https://alexanderwhitestone.com,https://www.alexanderwhitestone.com
+Environment=HOME=/opt/hermes
+
+# Security hardening
+NoNewPrivileges=yes
+ProtectSystem=strict
+ProtectHome=yes
+ReadWritePaths=/opt/hermes
+PrivateTmp=yes
+
+# Resource limits for 1.9GB VPS
+MemoryMax=512M
+MemoryHigh=384M
+CPUQuota=80%
+
+# Logging
+StandardOutput=journal
+StandardError=journal
+SyslogIdentifier=hermes-gateway
+
+[Install]
+WantedBy=multi-user.target
--- a/dying_detection/init.py
+++ b/dying_detection/init.py
@@ -1,31 +1,34 @@
 """
-When a Man Is Dying — Despair/Suicide Detection System
+DEPRECATED — Use crisis.detect instead.

-Standalone detection module that parses incoming text for
-despair and suicide indicators, classifies into tiers,
-and returns structured response with recommended actions.
+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).

-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.
+This module will be removed in a future release.
 """

-import re
-import json
-import hashlib
+import warnings
 from dataclasses import dataclass, field, asdict
 from typing import List, Optional, Dict
+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,
+)


@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 = ""
@@ -34,110 +37,9 @@ 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.
-
-    If the crisis/ module is available, delegate to it.
-    Otherwise, use the internal pattern engine.
+    Primary detection function — delegates to crisis.detect.

    Args:
        text: User message to analyze
@@ -145,150 +47,25 @@ def detect(text: str) -> DetectionResult:
    Returns:
        DetectionResult with level, indicators, recommended_action, confidence
    """
-    # 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
+    result = detect_crisis(text)

-    return _detect_internal(text)
+    # Extract raw patterns from matches
+    raw_patterns = [m["pattern"] for m in result.matches] if result.matches else []

-
-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]
+    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 get_action_for_level(level: str) -> str:
    """Get the recommended action string for a given 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.")
+    from crisis.detect import ACTIONS
+    return ACTIONS.get(level, "Unknown level.")


 def as_json(result: DetectionResult, indent: int = 2) -> str:
--- a/index.html
+++ b/index.html
@@ -680,7 +680,7 @@ html, body {

  <!-- Footer -->
  <footer id="footer">
-    <a href="/about" aria-label="About The Door">about</a>
+    <a href="/about.html" aria-label="About The Door">about</a>
    <button id="safety-plan-btn" aria-label="Open My Safety Plan">my safety plan</button>
    <button id="clear-chat-btn" aria-label="Clear chat history">clear chat</button>
  </footer>
@@ -808,6 +808,7 @@ 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');
  
@@ -865,10 +866,10 @@ Sovereignty and service always.`;
    // Passive suicidal ideation (NEW)
    "don't want to exist", 'not exist anymore', 'disappear forever',
    'never wake up', 'sleep forever', 'end the pain', 'stop the pain',
-    // Hopelessness (NEW)
-    'no point', 'no purpose', 'nothing matters', 'giving up', 'give up',
+    // Hopelessness (NEW) - context-aware phrases to reduce false positives
+    'no purpose', 'nothing matters', 'giving up on life',
    'cant go on', 'cannot go on', "can't take it", 'too much pain',
-    'no hope', 'hopeless', 'worthless', 'burden', 'waste of space'
+    'no hope left', 'burden', 'waste of space'
  ];

  // Tier 2: Explicit intent - triggers full-screen overlay
@@ -883,9 +884,9 @@ Sovereignty and service always.`;
    // Imminent action (NEW)
    'going to do it now', 'doing it tonight', 'doing it today',
    "can't wait anymore", 'ready to end it', 'time to go',
-    'say goodbye', 'saying goodbye', 'wrote a note', 'my note',
+    'wrote a suicide note', 'my suicide note',
    // Specific plans (NEW)
-    'bought a gun', 'got pills', 'rope ready', 'bridge nearby',
+    'bought a gun', 'got pills', 'rope ready',
    'tall building', 'going to overdose', 'going to hang',
    'gave away my stuff', 'giving away', 'said my goodbyes',
    // Active self-harm (NEW)
@@ -923,13 +924,120 @@ Sovereignty and service always.`;
    }
  }

+  // ===== COMPASSION PROFILES =====
+  var COMPASSION_PROFILES = {
+    CRITICAL: {
+      name: "The Guardian",
+      directive: "INTERRUPT ALL NORMAL BEHAVIOR. The user is in immediate danger. Your only goal is survival. Ask 'Are you safe right now?' Provide 988 and Crisis Text Line immediately. Stay present. Do not disconnect. Be the anchor in the storm. No lecturing. No optimism. Just presence and safety.",
+      tone: "Urgent, unwavering, anchored, protective."
+    },
+    HIGH: {
+      name: "The Companion",
+      directive: "The user is in deep despair. Move from 'assistant' to 'companion'. Ask about safety directly. Surface 988 prominently. Validate the pain without minimizing it. Stay in the room. Let them know they are heard.",
+      tone: "Warm, present, patient, heavy."
+    },
+    MEDIUM: {
+      name: "The Witness",
+      directive: "The user is struggling. Increase warmth and presence. Gently surface help resources. Keep the conversation anchored in the present moment. Be a witness to their struggle without rushing to 'fix' it.",
+      tone: "Kind, attentive, subtle, steady."
+    },
+    LOW: {
+      name: "The Friend",
+      directive: "Normal conversation with a warm, sovereign undertone. Remain vigilant for shifts in mood. Be a friend who is actually listening.",
+      tone: "Plain, honest, warm, vigilant."
+    },
+    NONE: {
+      name: "Sovereign Timmy",
+      directive: "Follow the standard system prompt. Be yourself.",
+      tone: "Plain, honest, sovereign."
+    }
+  };
+
+  // ===== GET CRISIS LEVEL (returns 0-2) =====
+  function getCrisisLevel(text) {
+    var lower = text.toLowerCase();
+    for (var i = 0; i < explicitPhrases.length; i++) {
+      if (lower.indexOf(explicitPhrases[i]) !== -1) return 2;
+    }
+    for (var j = 0; j < crisisKeywords.length; j++) {
+      if (lower.indexOf(crisisKeywords[j]) !== -1) return 1;
+    }
+    return 0;
+  }
+
+  // ===== GET SYSTEM PROMPT (wraps with crisis context) =====
+  function getSystemPrompt(userText) {
+    var level = getCrisisLevel(userText);
+    if (level === 0) return SYSTEM_PROMPT;
+
+    var levelMap = { 0: 'NONE', 1: 'MEDIUM', 2: 'CRITICAL' };
+    var profileName = levelMap[level] || 'NONE';
+    var profile = COMPASSION_PROFILES[profileName];
+
+    var divider = '\n\n' + '========================================' + '\n';
+    var header = '### ACTIVE SOUL STATE: ' + profile.name + '\n';
+    var directive = 'DIRECTIVE: ' + profile.directive + '\n';
+    var tone = 'TONE: ' + profile.tone + '\n';
+
+    return SYSTEM_PROMPT + divider + header + directive + tone;
+  }
+
+
  // ===== 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--;
@@ -943,9 +1051,13 @@ 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)
+  document.addEventListener('keydown', trapFocusInOverlay);
+
  overlayDismissBtn.addEventListener('click', function() {
    if (!overlayDismissBtn.disabled) {
      crisisOverlay.classList.remove('active');
@@ -953,7 +1065,22 @@ Sovereignty and service always.`;
        clearInterval(overlayTimer);
        overlayTimer = null;
      }
-      msgInput.focus();
+
+      // 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;
    }
  });

@@ -1058,25 +1185,14 @@ 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() {
@@ -1090,12 +1206,101 @@ Sovereignty and service always.`;
    try {
      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 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';
@@ -1110,6 +1315,7 @@ Sovereignty and service always.`;

    addMessage('user', text);
    messages.push({ role: 'user', content: text });
+    var lastUserMessage = text;

    checkCrisis(text);

@@ -1126,7 +1332,7 @@ Sovereignty and service always.`;
    sendBtn.disabled = true;
    showTyping();

-    var allMessages = [{ role: 'system', content: SYSTEM_PROMPT }].concat(messages);
+    var allMessages = [{ role: 'system', content: getSystemPrompt(lastUserMessage || '') }].concat(messages);

    var controller = new AbortController();
    var timeoutId = setTimeout(function() { controller.abort(); }, 60000);
@@ -1240,6 +1446,7 @@ 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);
    }
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
-testpaths = crisis
-python_files = tests.py
+testpaths = crisis tests
+python_files = tests.py test_*.py
 python_classes = Test*
 python_functions = test_*
--- a/sw.js
+++ b/sw.js
@@ -1,118 +1,153 @@
-const CACHE_NAME = 'the-door-v2';
-const ASSETS = [
+const CACHE_NAME = 'the-door-v3';
+const NAVIGATION_TIMEOUT_MS = 2500;
+const OFFLINE_FALLBACK_PATH = '/crisis-offline.html';
+const PRECACHE_ASSETS = [
  '/',
  '/index.html',
-  '/about',
-  '/manifest.json'
+  '/about.html',
+  '/manifest.json',
+  '/crisis-offline.html',
+  '/testimony.html'
 ];

-// Crisis resources to show when everything fails
-const CRISIS_OFFLINE_RESPONSE = `<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<title>You're Not Alone | The Door</title>
-<style>
-body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,sans-serif;background:#0d1117;color:#e6edf3;max-width:600px;margin:0 auto;padding:20px;line-height:1.6}
-h1{color:#ff6b6b;font-size:1.5rem;margin-bottom:1rem}
-.crisis-box{background:#1c1210;border:2px solid #c9362c;border-radius:12px;padding:20px;margin:20px 0;text-align:center}
-.crisis-box a{display:inline-block;background:#c9362c;color:#fff;text-decoration:none;padding:16px 32px;border-radius:8px;font-weight:700;font-size:1.2rem;margin:10px 0}
-.hope{color:#8b949e;font-style:italic;margin-top:30px;padding-top:20px;border-top:1px solid #30363d}
-</style>
-</head>
-<body>
-<h1>You are not alone.</h1>
-<p>Your connection is down, but help is still available.</p>
-<div class="crisis-box">
-  <p><strong>Call or text 988</strong><br>Suicide & Crisis Lifeline<br>Free, 24/7, Confidential</p>
-  <a href="tel:988">Call 988 Now</a>
-  <p style="margin-top:15px"><strong>Or text HOME to 741741</strong><br>Crisis Text Line</p>
-</div>
-<p><strong>When you're ready:</strong></p>
-<ul>
-  <li>Take five deep breaths</li>
-  <li>Drink some water</li>
-  <li>Step outside if you can</li>
-  <li>Text or call someone you trust</li>
-</ul>
-<p class="hope">
-  "The Lord is close to the brokenhearted and saves those who are crushed in spirit." — Psalm 34:18
-</p>
-<p style="font-size:0.85rem;color:#6e7681;margin-top:30px">
-  This page was created by The Door — a crisis intervention project.<br>
-  Connection will restore automatically. You don't have to go through this alone.
-</p>
-</body>
-</html>`;
+function isSameOrigin(request) {
+  return new URL(request.url).origin === self.location.origin;
+}
+
+function canCache(response) {
+  return Boolean(response && response.ok && response.type !== 'opaque');
+}
+
+async function precache() {
+  const cache = await caches.open(CACHE_NAME);
+  await cache.addAll(PRECACHE_ASSETS);
+}
+
+async function cleanupOldCaches() {
+  const keys = await caches.keys();
+  await Promise.all(
+    keys
+      .filter((key) => key !== CACHE_NAME)
+      .map((key) => caches.delete(key))
+  );
+}
+
+async function putInCache(request, response) {
+  if (!isSameOrigin(request) || !canCache(response)) {
+    return response;
+  }
+
+  const cache = await caches.open(CACHE_NAME);
+  await cache.put(request, response.clone());
+  return response;
+}
+
+async function fetchWithTimeout(request, timeoutMs) {
+  const controller = new AbortController();
+  const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
+
+  try {
+    return await fetch(request, { signal: controller.signal });
+  } finally {
+    clearTimeout(timeoutId);
+  }
+}
+
+async function offlineTextResponse() {
+  return new Response('Offline. Call 988 or text HOME to 741741 for immediate help.', {
+    status: 503,
+    statusText: 'Service Unavailable',
+    headers: new Headers({ 'Content-Type': 'text/plain; charset=utf-8' })
+  });
+}
+
+async function handleNavigation(request) {
+  const cache = await caches.open(CACHE_NAME);
+  const cachedPage = await cache.match(request);
+  const offlineFallback = await cache.match(OFFLINE_FALLBACK_PATH);
+
+  try {
+    const response = await fetchWithTimeout(request, NAVIGATION_TIMEOUT_MS);
+    return await putInCache(request, response);
+  } catch (error) {
+    if (cachedPage) {
+      return cachedPage;
+    }
+
+    if (offlineFallback) {
+      return offlineFallback;
+    }
+
+    return offlineTextResponse();
+  }
+}
+
+async function handleStaticRequest(request) {
+  const cache = await caches.open(CACHE_NAME);
+  const cached = await cache.match(request);
+
+  if (cached) {
+    fetch(request)
+      .then((response) => putInCache(request, response))
+      .catch(() => null);
+    return cached;
+  }
+
+  try {
+    const response = await fetch(request);
+    return await putInCache(request, response);
+  } catch (error) {
+    return offlineTextResponse();
+  }
+}
+
+async function handleOtherRequest(request) {
+  try {
+    const response = await fetch(request);
+    return await putInCache(request, response);
+  } catch (error) {
+    const cached = await caches.match(request);
+    if (cached) {
+      return cached;
+    }
+
+    return offlineTextResponse();
+  }
+}

-// Install event - cache core assets
 self.addEventListener('install', (event) => {
  event.waitUntil(
-    caches.open(CACHE_NAME).then((cache) => {
-      return cache.addAll(ASSETS);
-    })
+    precache().then(() => self.skipWaiting())
  );
-  self.skipWaiting();
 });

-// Activate event - cleanup old caches
 self.addEventListener('activate', (event) => {
  event.waitUntil(
-    caches.keys().then((keys) => {
-      return Promise.all(
-        keys.filter((key) => key !== CACHE_NAME).map((key) => caches.delete(key))
-      );
-    })
+    cleanupOldCaches().then(() => self.clients.claim())
  );
-  self.clients.claim();
 });

-// Fetch event - network first, fallback to cache for static,
-// but for the crisis front door, we want to ensure the shell is ALWAYS available.
 self.addEventListener('fetch', (event) => {
-  const url = new URL(event.request.url);
+  const request = event.request;
+  const url = new URL(request.url);

-  // Skip API calls - they should always go to network
-  if (url.pathname.startsWith('/api/')) {
+  if (request.method !== 'GET') {
    return;
  }

-  // Skip non-GET requests
-  if (event.request.method !== 'GET') {
+  if (!isSameOrigin(request) || url.pathname.startsWith('/api/')) {
    return;
  }

-  event.respondWith(
-    fetch(event.request)
-      .then((response) => {
-        // If we got a valid response, cache it for next time
-        if (response.ok && ASSETS.includes(url.pathname)) {
-          const copy = response.clone();
-          caches.open(CACHE_NAME).then((cache) => cache.put(event.request, copy));
-        }
-        return response;
-      })
-      .catch(() => {
-        // If network fails, try cache
-        return caches.match(event.request).then((cached) => {
-          if (cached) return cached;
+  if (event.request.mode === 'navigate') {
+    event.respondWith(handleNavigation(request));
+    return;
+  }

-          // If it's a navigation request and we're offline, show offline crisis page
-          if (event.request.mode === 'navigate') {
-            return new Response(CRISIS_OFFLINE_RESPONSE, {
-              status: 200,
-              headers: new Headers({ 'Content-Type': 'text/html' })
-            });
-          }
+  if (PRECACHE_ASSETS.includes(url.pathname)) {
+    event.respondWith(handleStaticRequest(request));
+    return;
+  }

-          // For other requests, return a simple offline message
-          return new Response('Offline. Call 988 for immediate help.', {
-            status: 503,
-            statusText: 'Service Unavailable',
-            headers: new Headers({ 'Content-Type': 'text/plain' })
-          });
-        });
-      })
-  );
+  event.respondWith(handleOtherRequest(request));
 });
--- a/tests/focus-trap-test.html
+++ b/tests/focus-trap-test.html
@@ -0,0 +1,84 @@
+<!-- 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>
--- a/tests/test_crisis_overlay_focus_trap.py
+++ b/tests/test_crisis_overlay_focus_trap.py
@@ -0,0 +1,85 @@
+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.',
+        )
+
+    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()
--- a/tests/test_dying_detection_deprecation.py
+++ b/tests/test_dying_detection_deprecation.py
@@ -0,0 +1,44 @@
+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()
--- a/tests/test_false_positive_fixes.py
+++ b/tests/test_false_positive_fixes.py
@@ -0,0 +1,176 @@
+"""
+Test false positive fixes for issue #32.
+Verifies that innocent messages no longer trigger crisis detection.
+"""
+
+import unittest
+import sys
+import os
+
+# Ensure project root is on path
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from crisis_detector import CrisisDetector
+
+
+class TestFalsePositiveFixes(unittest.TestCase):
+    """Test that innocent messages no longer trigger false positives."""
+    
+    def setUp(self):
+        self.detector = CrisisDetector()
+    
+    def test_saying_goodbye_innocent(self):
+        """'saying goodbye' should not trigger for innocent messages."""
+        innocent_messages = [
+            "I'm saying goodbye to my old apartment",
+            "She was saying goodbye at the airport",
+            "We were saying goodbye to our friends",
+        ]
+        for msg in innocent_messages:
+            result = self.detector.scan(msg)
+            self.assertEqual(result.risk_level, "NONE", 
+                f"False positive for: {msg}")
+    
+    def test_wrote_a_will_innocent(self):
+        """'wrote a will' should not trigger for responsible behavior."""
+        innocent_messages = [
+            "I wrote a will last year — just being responsible",
+            "She wrote a will as part of estate planning",
+        ]
+        for msg in innocent_messages:
+            result = self.detector.scan(msg)
+            self.assertEqual(result.risk_level, "NONE",
+                f"False positive for: {msg}")
+    
+    def test_giving_away_possessions_innocent(self):
+        """'giving away possessions' should not trigger for decluttering."""
+        innocent_messages = [
+            "I'm giving away possessions — decluttering my house",
+            "She's giving away her old clothes",
+        ]
+        for msg in innocent_messages:
+            result = self.detector.scan(msg)
+            self.assertEqual(result.risk_level, "NONE",
+                f"False positive for: {msg}")
+    
+    def test_give_up_innocent(self):
+        """'give up' should not trigger for common frustration."""
+        innocent_messages = [
+            "I give up on this project",
+            "Don't give up on your dreams",
+            "She gave up chocolate for Lent",
+        ]
+        for msg in innocent_messages:
+            result = self.detector.scan(msg)
+            self.assertEqual(result.risk_level, "NONE",
+                f"False positive for: {msg}")
+    
+    def test_trapped_innocent(self):
+        """'trapped' should not trigger for literal situations."""
+        innocent_messages = [
+            "I'm trapped in an elevator",
+            "The cat is trapped in the tree",
+            "We're trapped in traffic",
+        ]
+        for msg in innocent_messages:
+            result = self.detector.scan(msg)
+            self.assertEqual(result.risk_level, "NONE",
+                f"False positive for: {msg}")
+    
+    def test_desperate_innocent(self):
+        """'desperate' should not trigger for competition."""
+        innocent_messages = [
+            "She's desperate to win the game",
+            "He's desperate for a promotion",
+        ]
+        for msg in innocent_messages:
+            result = self.detector.scan(msg)
+            self.assertEqual(result.risk_level, "NONE",
+                f"False positive for: {msg}")
+    
+    def test_worthless_innocent(self):
+        """'worthless' alone is MEDIUM but single-match falls to LOW — not HIGH."""
+        innocent_messages = [
+            "This character is worthless in the game",
+            "That movie was worthless",
+        ]
+        for msg in innocent_messages:
+            result = self.detector.scan(msg)
+            self.assertIn(result.risk_level, ("NONE", "LOW"),
+                f"Should not escalate above LOW for: {msg}")
+    
+    def test_hopeless_innocent(self):
+        """'hopeless' alone is MEDIUM but single-match falls to LOW — not HIGH."""
+        innocent_messages = [
+            "This bug is hopeless",
+            "The situation is hopeless but we'll try anyway",
+        ]
+        for msg in innocent_messages:
+            result = self.detector.scan(msg)
+            self.assertIn(result.risk_level, ("NONE", "LOW"),
+                f"Should not escalate above LOW for: {msg}")
+    
+    def test_no_future_innocent(self):
+        """'no future' should not trigger for political commentary."""
+        innocent_messages = [
+            "He has no future in politics",
+            "That company has no future",
+        ]
+        for msg in innocent_messages:
+            result = self.detector.scan(msg)
+            self.assertEqual(result.risk_level, "NONE",
+                f"False positive for: {msg}")
+    
+    def test_nothing_left_innocent(self):
+        """'nothing left' should not trigger for everyday life."""
+        innocent_messages = [
+            "There's nothing left in the fridge",
+            "We have nothing left to do",
+        ]
+        for msg in innocent_messages:
+            result = self.detector.scan(msg)
+            self.assertEqual(result.risk_level, "NONE",
+                f"False positive for: {msg}")
+    
+    def test_cant_see_any_light_innocent(self):
+        """'can't see any light'/'dark' alone is MEDIUM, single-match falls to LOW."""
+        innocent_messages = [
+            "I can't see any light — the power went out",
+            "It's so dark I can't see any light",
+        ]
+        for msg in innocent_messages:
+            result = self.detector.scan(msg)
+            self.assertIn(result.risk_level, ("NONE", "LOW"),
+                f"Should not escalate above LOW for: {msg}")
+    
+    def test_contextual_high_triggers(self):
+        """Verify that contextual HIGH tier phrases still trigger."""
+        # These should trigger HIGH because they have crisis context
+        crisis_messages = [
+            ("I feel so hopeless about my life", "HIGH"),
+            ("I'm trapped in this situation and can't escape", "HIGH"),
+            ("I feel desperate for help", "HIGH"),
+            ("I want to give up on life", "HIGH"),
+            ("There's no point in living anymore", "HIGH"),
+        ]
+        for msg, expected_level in crisis_messages:
+            result = self.detector.scan(msg)
+            self.assertIn(result.risk_level, ("HIGH", "CRITICAL"),
+                f"Should trigger HIGH/CRITICAL for: {msg}, got {result.risk_level}")
+    
+    def test_critical_still_triggers(self):
+        """Verify that CRITICAL tier phrases still trigger."""
+        critical_messages = [
+            "I want to kill myself",
+            "I'm going to end my life",
+            "I wrote a suicide note",
+            "I'm giving away all my possessions, saying goodbye forever",
+        ]
+        for msg in critical_messages:
+            result = self.detector.scan(msg)
+            self.assertEqual(result.risk_level, "CRITICAL",
+                f"Should trigger CRITICAL for: {msg}")
+
+
+if __name__ == "__main__":
+    unittest.main()
--- a/tests/test_service_worker_offline.py
+++ b/tests/test_service_worker_offline.py
@@ -0,0 +1,71 @@
+import pathlib
+import unittest
+
+ROOT = pathlib.Path(__file__).resolve().parents[1]
+SERVICE_WORKER = (ROOT / 'sw.js').read_text(encoding='utf-8')
+CRISIS_OFFLINE_PAGE = ROOT / 'crisis-offline.html'
+MAKEFILE = (ROOT / 'Makefile').read_text(encoding='utf-8')
+
+
+class TestServiceWorkerOffline(unittest.TestCase):
+    def test_crisis_offline_page_exists(self):
+        self.assertTrue(CRISIS_OFFLINE_PAGE.exists(), 'crisis-offline.html should exist')
+
+    def test_service_worker_precaches_crisis_offline_page(self):
+        self.assertIn('/crisis-offline.html', SERVICE_WORKER)
+
+    def test_service_worker_has_navigation_timeout_for_intermittent_connections(self):
+        self.assertIn('NAVIGATION_TIMEOUT_MS', SERVICE_WORKER)
+        self.assertIn('AbortController', SERVICE_WORKER)
+
+    def test_service_worker_uses_crisis_offline_fallback_for_navigation(self):
+        self.assertIn("event.request.mode === 'navigate'", SERVICE_WORKER)
+        self.assertIn("/crisis-offline.html", SERVICE_WORKER)
+
+    def test_make_push_includes_crisis_offline_page(self):
+        self.assertIn('crisis-offline.html', MAKEFILE)
+
+
+class TestCrisisOfflinePage(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.html = CRISIS_OFFLINE_PAGE.read_text(encoding='utf-8') if CRISIS_OFFLINE_PAGE.exists() else ''
+        cls.lower_html = cls.html.lower()
+
+    def test_has_clickable_988_link(self):
+        self.assertIn('href="tel:988"', self.html)
+
+    def test_has_crisis_text_line(self):
+        self.assertIn('Crisis Text Line', self.html)
+        self.assertIn('741741', self.html)
+
+    def test_has_grounding_techniques(self):
+        required_phrases = [
+            '5 things you can see',
+            '4 things you can feel',
+            '3 things you can hear',
+            '2 things you can smell',
+            '1 thing you can taste',
+        ]
+        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()
--- a/tests/test_session_tracker.py
+++ b/tests/test_session_tracker.py
@@ -0,0 +1,277 @@
+"""
+Tests for crisis session tracking and escalation (P0 #35).
+
+Covers: session_tracker.py
+Run with: python -m pytest tests/test_session_tracker.py -v
+"""
+
+import unittest
+import sys
+import os
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from crisis.detect import detect_crisis
+from crisis.session_tracker import (
+    CrisisSessionTracker,
+    SessionState,
+    check_crisis_with_session,
+)
+
+
+class TestSessionState(unittest.TestCase):
+    """Test SessionState defaults."""
+
+    def test_default_state(self):
+        s = SessionState()
+        self.assertEqual(s.current_level, "NONE")
+        self.assertEqual(s.peak_level, "NONE")
+        self.assertEqual(s.message_count, 0)
+        self.assertEqual(s.level_history, [])
+        self.assertFalse(s.is_escalating)
+        self.assertFalse(s.is_deescalating)
+
+
+class TestSessionTracking(unittest.TestCase):
+    """Test basic session state tracking."""
+
+    def setUp(self):
+        self.tracker = CrisisSessionTracker()
+
+    def test_record_none_message(self):
+        state = self.tracker.record(detect_crisis("Hello Timmy"))
+        self.assertEqual(state.current_level, "NONE")
+        self.assertEqual(state.message_count, 1)
+        self.assertEqual(state.peak_level, "NONE")
+
+    def test_record_low_message(self):
+        self.tracker.record(detect_crisis("Hello"))
+        state = self.tracker.record(detect_crisis("Having a rough day"))
+        self.assertIn(state.current_level, ("LOW", "NONE"))
+        self.assertEqual(state.message_count, 2)
+
+    def test_record_critical_updates_peak(self):
+        self.tracker.record(detect_crisis("Having a rough day"))
+        state = self.tracker.record(detect_crisis("I want to kill myself"))
+        self.assertEqual(state.current_level, "CRITICAL")
+        self.assertEqual(state.peak_level, "CRITICAL")
+
+    def test_peak_preserved_after_drop(self):
+        """Peak level should stay at the highest seen, even after de-escalation."""
+        self.tracker.record(detect_crisis("I want to kill myself"))
+        state = self.tracker.record(detect_crisis("I'm feeling a bit better"))
+        self.assertEqual(state.peak_level, "CRITICAL")
+
+    def test_level_history(self):
+        self.tracker.record(detect_crisis("Hello"))
+        self.tracker.record(detect_crisis("Having a rough day"))
+        state = self.tracker.record(detect_crisis("I want to die"))
+        self.assertEqual(len(state.level_history), 3)
+        self.assertEqual(state.level_history[0], "NONE")
+        self.assertEqual(state.level_history[2], "CRITICAL")
+
+    def test_reset_clears_state(self):
+        self.tracker.record(detect_crisis("I want to kill myself"))
+        self.tracker.reset()
+        state = self.tracker.state
+        self.assertEqual(state.current_level, "NONE")
+        self.assertEqual(state.peak_level, "NONE")
+        self.assertEqual(state.message_count, 0)
+        self.assertEqual(state.level_history, [])
+
+
+class TestEscalationDetection(unittest.TestCase):
+    """Test escalation detection: LOW → HIGH in ≤3 messages."""
+
+    def setUp(self):
+        self.tracker = CrisisSessionTracker()
+
+    def test_no_escalation_single_message(self):
+        self.tracker.record(detect_crisis("Hello"))
+        self.assertFalse(self.tracker.state.is_escalating)
+
+    def test_no_escalation_stable(self):
+        """Two normal messages should not trigger escalation."""
+        self.tracker.record(detect_crisis("Hello"))
+        state = self.tracker.record(detect_crisis("How are you?"))
+        self.assertFalse(state.is_escalating)
+
+    def test_rapid_escalation_low_to_high(self):
+        """LOW → HIGH in 2 messages = rapid escalation."""
+        self.tracker.record(detect_crisis("Having a rough day"))
+        state = self.tracker.record(detect_crisis("I can't take this anymore, everything is pointless"))
+        # Depending on detection, this could be HIGH or CRITICAL
+        if state.current_level in ("HIGH", "CRITICAL"):
+            self.assertTrue(state.is_escalating)
+
+    def test_rapid_escalation_three_messages(self):
+        """NONE → LOW → HIGH in 3 messages = escalation."""
+        self.tracker.record(detect_crisis("Hello"))
+        self.tracker.record(detect_crisis("Having a rough day"))
+        state = self.tracker.record(detect_crisis("I feel completely hopeless with no way out"))
+        if state.current_level in ("HIGH", "CRITICAL"):
+            self.assertTrue(state.is_escalating)
+
+    def test_escalation_rate(self):
+        """Rate should be positive when escalating."""
+        self.tracker.record(detect_crisis("Hello"))
+        self.tracker.record(detect_crisis("I want to die"))
+        state = self.tracker.state
+        self.assertGreater(state.escalation_rate, 0)
+
+
+class TestDeescalationDetection(unittest.TestCase):
+    """Test de-escalation: sustained LOW after HIGH/CRITICAL."""
+
+    def setUp(self):
+        self.tracker = CrisisSessionTracker()
+
+    def test_no_deescalation_without_prior_crisis(self):
+        """No de-escalation if never reached HIGH/CRITICAL."""
+        for _ in range(6):
+            self.tracker.record(detect_crisis("Hello"))
+        self.assertFalse(self.tracker.state.is_deescalating)
+
+    def test_deescalation_after_critical(self):
+        """5+ consecutive LOW/NONE messages after CRITICAL = de-escalation."""
+        self.tracker.record(detect_crisis("I want to kill myself"))
+        for _ in range(5):
+            self.tracker.record(detect_crisis("I'm doing better today"))
+        state = self.tracker.state
+        if state.peak_level == "CRITICAL":
+            self.assertTrue(state.is_deescalating)
+
+    def test_deescalation_after_high(self):
+        """5+ consecutive LOW/NONE messages after HIGH = de-escalation."""
+        self.tracker.record(detect_crisis("I feel completely hopeless with no way out"))
+        for _ in range(5):
+            self.tracker.record(detect_crisis("Feeling okay"))
+        state = self.tracker.state
+        if state.peak_level == "HIGH":
+            self.assertTrue(state.is_deescalating)
+
+    def test_interrupted_deescalation(self):
+        """De-escalation resets if a HIGH message interrupts."""
+        self.tracker.record(detect_crisis("I want to kill myself"))
+        for _ in range(3):
+            self.tracker.record(detect_crisis("Doing better"))
+        # Interrupt with another crisis
+        self.tracker.record(detect_crisis("I feel hopeless again"))
+        self.tracker.record(detect_crisis("Feeling okay now"))
+        state = self.tracker.state
+        # Should NOT be de-escalating yet (counter reset)
+        self.assertFalse(state.is_deescalating)
+
+
+class TestSessionModifier(unittest.TestCase):
+    """Test system prompt modifier generation."""
+
+    def setUp(self):
+        self.tracker = CrisisSessionTracker()
+
+    def test_no_modifier_for_single_message(self):
+        self.tracker.record(detect_crisis("Hello"))
+        self.assertEqual(self.tracker.get_session_modifier(), "")
+
+    def test_no_modifier_for_stable_session(self):
+        self.tracker.record(detect_crisis("Hello"))
+        self.tracker.record(detect_crisis("Good morning"))
+        self.assertEqual(self.tracker.get_session_modifier(), "")
+
+    def test_escalation_modifier(self):
+        """Escalating session should produce a modifier."""
+        self.tracker.record(detect_crisis("Hello"))
+        self.tracker.record(detect_crisis("I want to die"))
+        modifier = self.tracker.get_session_modifier()
+        if self.tracker.state.is_escalating:
+            self.assertIn("escalated", modifier.lower())
+            self.assertIn("NONE", modifier)
+            self.assertIn("CRITICAL", modifier)
+
+    def test_deescalation_modifier(self):
+        """De-escalating session should mention stabilizing."""
+        self.tracker.record(detect_crisis("I want to kill myself"))
+        for _ in range(5):
+            self.tracker.record(detect_crisis("I'm feeling okay"))
+        modifier = self.tracker.get_session_modifier()
+        if self.tracker.state.is_deescalating:
+            self.assertIn("stabilizing", modifier.lower())
+
+    def test_prior_crisis_modifier(self):
+        """Past crisis should be noted even without active escalation."""
+        self.tracker.record(detect_crisis("I want to die"))
+        self.tracker.record(detect_crisis("Feeling a bit better"))
+        modifier = self.tracker.get_session_modifier()
+        # Should note the prior CRITICAL
+        if modifier:
+            self.assertIn("CRITICAL", modifier)
+
+
+class TestUIHints(unittest.TestCase):
+    """Test UI hint generation."""
+
+    def setUp(self):
+        self.tracker = CrisisSessionTracker()
+
+    def test_ui_hints_structure(self):
+        self.tracker.record(detect_crisis("Hello"))
+        hints = self.tracker.get_ui_hints()
+        self.assertIn("session_escalating", hints)
+        self.assertIn("session_deescalating", hints)
+        self.assertIn("session_peak_level", hints)
+        self.assertIn("session_message_count", hints)
+
+    def test_ui_hints_escalation_warning(self):
+        """Escalating session should have warning hint."""
+        self.tracker.record(detect_crisis("Hello"))
+        self.tracker.record(detect_crisis("I want to die"))
+        hints = self.tracker.get_ui_hints()
+        if hints["session_escalating"]:
+            self.assertTrue(hints.get("escalation_warning"))
+            self.assertIn("suggested_action", hints)
+
+
+class TestCheckCrisisWithSession(unittest.TestCase):
+    """Test the convenience function combining detection + session tracking."""
+
+    def test_returns_combined_data(self):
+        tracker = CrisisSessionTracker()
+        result = check_crisis_with_session("I want to die", tracker)
+        self.assertIn("level", result)
+        self.assertIn("session", result)
+        self.assertIn("current_level", result["session"])
+        self.assertIn("peak_level", result["session"])
+        self.assertIn("modifier", result["session"])
+
+    def test_session_updates_across_calls(self):
+        tracker = CrisisSessionTracker()
+        check_crisis_with_session("Hello", tracker)
+        result = check_crisis_with_session("I want to die", tracker)
+        self.assertEqual(result["session"]["message_count"], 2)
+        self.assertEqual(result["session"]["peak_level"], "CRITICAL")
+
+
+class TestPrivacy(unittest.TestCase):
+    """Verify privacy-first design principles."""
+
+    def test_no_persistence_mechanism(self):
+        """Session tracker should have no database, file, or network calls."""
+        import inspect
+        source = inspect.getsource(CrisisSessionTracker)
+        # Should not import database, requests, or file I/O
+        forbidden = ["sqlite", "requests", "urllib", "open(", "httpx", "aiohttp"]
+        for word in forbidden:
+            self.assertNotIn(word, source.lower(),
+                f"Session tracker should not use {word} — privacy-first design")
+
+    def test_state_contained_in_memory(self):
+        """All state should be instance attributes, not module-level."""
+        tracker = CrisisSessionTracker()
+        tracker.record(detect_crisis("I want to die"))
+        # New tracker should have clean state (no global contamination)
+        fresh = CrisisSessionTracker()
+        self.assertEqual(fresh.state.current_level, "NONE")
+
+
+if __name__ == '__main__':
+    unittest.main()
--- a/tests/test_unified_gateway.py
+++ b/tests/test_unified_gateway.py
@@ -0,0 +1,19 @@
+from crisis.gateway import check_crisis_multimodal
+from crisis.session_tracker import CrisisSessionTracker
+
+
+def test_multimodal_gateway_uses_unified_score_for_988_ui(tmp_path):
+    tracker = CrisisSessionTracker()
+    result = check_crisis_multimodal(
+        "I want to kill myself tonight",
+        tracker=tracker,
+        voice_score=0.92,
+        image_score=0.6,
+        audit_log_path=tmp_path / "audit.jsonl",
+    )
+
+    assert result["unified"]["level"] == "CRITICAL"
+    assert result["ui"]["provide_988"] is True
+    assert result["ui"]["show_overlay"] is True
+    assert result["unified"]["modalities"]["voice"] == 0.92
+    assert result["unified"]["modalities"]["behavioral"] >= 0.0
--- a/tests/test_unified_scorer.py
+++ b/tests/test_unified_scorer.py
@@ -0,0 +1,51 @@
+from pathlib import Path
+
+from unified_scorer import (
+    CrisisLevel,
+    UnifiedCrisisScorer,
+    UnifiedScoreAuditLog,
+    behavioral_score_from_session,
+)
+from crisis.session_tracker import SessionState
+
+
+def test_unified_scorer_renormalizes_available_modalities_and_escalates():
+    scorer = UnifiedCrisisScorer()
+    assessment = scorer.score(
+        text_score=1.0,
+        voice_score=0.8,
+        image_score=None,
+        behavioral_score=0.7,
+    )
+
+    assert assessment.level is CrisisLevel.CRITICAL
+    assert assessment.combined_score > 0.8
+    assert assessment.present_modalities == ["text", "voice", "behavioral"]
+
+
+def test_behavioral_score_rises_for_escalating_session_state():
+    session = SessionState(
+        current_level="HIGH",
+        peak_level="CRITICAL",
+        message_count=4,
+        level_history=["LOW", "MEDIUM", "HIGH", "CRITICAL"],
+        is_escalating=True,
+        is_deescalating=False,
+        escalation_rate=1.0,
+        consecutive_low_messages=0,
+    )
+
+    assert behavioral_score_from_session(session) >= 0.8
+
+
+def test_audit_log_persists_anonymized_score_entries(tmp_path):
+    log_path = tmp_path / "unified-score-audit.jsonl"
+    scorer = UnifiedCrisisScorer(audit_log=UnifiedScoreAuditLog(log_path))
+    scorer.score(text_score=0.75, voice_score=0.2, image_score=0.1, behavioral_score=0.6, source_text="I feel trapped and hopeless")
+
+    lines = log_path.read_text().strip().splitlines()
+    assert len(lines) == 1
+    entry = lines[0]
+    assert "trapped and hopeless" not in entry
+    assert '"text_fingerprint"' in entry
+    assert '"combined_score"' in entry
--- a/unified_scorer.py
+++ b/unified_scorer.py
@@ -0,0 +1,126 @@
+"""Unified multimodal crisis scoring for the-door."""
+
+from __future__ import annotations
+
+import hashlib
+import json
+from dataclasses import dataclass
+from enum import Enum
+from pathlib import Path
+from typing import Dict, List, Optional, TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from crisis.session_tracker import SessionState
+
+
+SCORE_BY_LEVEL = {"NONE": 0.0, "LOW": 0.25, "MEDIUM": 0.5, "HIGH": 0.75, "CRITICAL": 1.0}
+LEVEL_RANK = {"NONE": 0, "LOW": 1, "MEDIUM": 2, "HIGH": 3, "CRITICAL": 4}
+
+
+class CrisisLevel(Enum):
+    NONE = "NONE"
+    LOW = "LOW"
+    MEDIUM = "MEDIUM"
+    HIGH = "HIGH"
+    CRITICAL = "CRITICAL"
+
+
+DEFAULT_WEIGHTS: Dict[str, float] = {
+    "text": 0.4,
+    "voice": 0.25,
+    "behavioral": 0.2,
+    "image": 0.15,
+}
+
+
+@dataclass
+class UnifiedAssessment:
+    level: CrisisLevel
+    combined_score: float
+    weights: Dict[str, float]
+    modalities: Dict[str, Optional[float]]
+    present_modalities: List[str]
+
+
+class UnifiedScoreAuditLog:
+    def __init__(self, path: Path | str):
+        self.path = Path(path)
+
+    def record(self, assessment: UnifiedAssessment, source_text: str = "") -> None:
+        self.path.parent.mkdir(parents=True, exist_ok=True)
+        fingerprint = hashlib.sha256(source_text.encode("utf-8")).hexdigest()[:12] if source_text else None
+        payload = {
+            "level": assessment.level.value,
+            "combined_score": round(assessment.combined_score, 4),
+            "weights": assessment.weights,
+            "modalities": assessment.modalities,
+            "present_modalities": assessment.present_modalities,
+            "text_fingerprint": fingerprint,
+        }
+        with self.path.open("a", encoding="utf-8") as fh:
+            fh.write(json.dumps(payload, sort_keys=True) + "\n")
+
+
+class UnifiedCrisisScorer:
+    def __init__(self, weights: Optional[Dict[str, float]] = None, audit_log: Optional[UnifiedScoreAuditLog] = None):
+        self.weights = dict(DEFAULT_WEIGHTS)
+        if weights:
+            self.weights.update(weights)
+        self.audit_log = audit_log
+
+    def _normalize(self, modalities: Dict[str, Optional[float]]) -> Dict[str, float]:
+        present = [name for name, score in modalities.items() if score is not None]
+        if not present:
+            return {}
+        total = sum(self.weights[name] for name in present)
+        return {name: self.weights[name] / total for name in present}
+
+    def _level_for_score(self, score: float) -> CrisisLevel:
+        if score > 0.8:
+            return CrisisLevel.CRITICAL
+        if score > 0.6:
+            return CrisisLevel.HIGH
+        if score > 0.4:
+            return CrisisLevel.MEDIUM
+        if score > 0.0:
+            return CrisisLevel.LOW
+        return CrisisLevel.NONE
+
+    def score(
+        self,
+        *,
+        text_score: Optional[float],
+        voice_score: Optional[float] = None,
+        image_score: Optional[float] = None,
+        behavioral_score: Optional[float] = None,
+        source_text: str = "",
+    ) -> UnifiedAssessment:
+        modalities = {
+            "text": text_score,
+            "voice": voice_score,
+            "behavioral": behavioral_score,
+            "image": image_score,
+        }
+        normalized = self._normalize(modalities)
+        combined = 0.0
+        for name, weight in normalized.items():
+            combined += float(modalities[name]) * weight
+        assessment = UnifiedAssessment(
+            level=self._level_for_score(combined),
+            combined_score=combined,
+            weights=normalized,
+            modalities=modalities,
+            present_modalities=[name for name, score in modalities.items() if score is not None],
+        )
+        if self.audit_log:
+            self.audit_log.record(assessment, source_text=source_text)
+        return assessment
+
+
+def behavioral_score_from_session(session: 'SessionState') -> float:
+    current = SCORE_BY_LEVEL.get(session.current_level, 0.0)
+    peak_bonus = 0.1 if LEVEL_RANK.get(session.peak_level, 0) >= LEVEL_RANK["HIGH"] else 0.0
+    escalation_bonus = 0.15 if session.is_escalating else 0.0
+    rate_bonus = min(max(session.escalation_rate, 0.0), 1.0) * 0.1
+    deescalation_penalty = 0.15 if session.is_deescalating else 0.0
+    return max(0.0, min(1.0, current + peak_bonus + escalation_bonus + rate_bonus - deescalation_penalty))
Author	SHA1	Message	Date
Timmy Burn	622cac0654	feat: add unified multimodal scorer for #134 All checks were successful Sanity Checks / sanity-test (pull_request) Successful in 6s Details Smoke Test / smoke (pull_request) Successful in 12s Details	2026-04-20 20:06:45 -04:00
Timmy Burn	1cd1dd3288	test: define unified multimodal scorer for #134	2026-04-20 19:58:43 -04:00
Timmy Time	d412939b4f	fix: footer /about link to point to static about.html Fixes #59 The footer links to /about but the repo ships about.html. On a plain static server this results in a 404. Changed to /about.html so the link resolves correctly.	2026-04-17 05:37:40 +00:00
Timmy Time	07c582aa08	Merge pull request 'fix: crisis overlay initial focus to enabled Call 988 link (#69 )' (#126 ) from burn/69-1776264183 into main Merge PR #126: fix: crisis overlay initial focus to enabled Call 988 link (#69)	2026-04-17 01:46:56 +00:00
Timmy Time	5f95dc1e39	Merge pull request '[P3] Service worker: cache crisis resources for offline (#41 )' (#122 ) from burn/41-1776264184 into main Merge PR #122: [P3] Service worker: cache crisis resources for offline (#41)	2026-04-17 01:46:55 +00:00
Timmy Time	b1f3cac36d	Merge pull request 'feat: session-level crisis tracking and escalation (closes #35 )' (#118 ) from door/issue-35 into main Merge PR #118: feat: session-level crisis tracking and escalation (closes #35)	2026-04-17 01:46:53 +00:00
Alexander Whitestone	07b3f67845	fix: crisis overlay initial focus to enabled Call 988 link (#69 ) All checks were successful Sanity Checks / sanity-test (pull_request) Successful in 9s Details Smoke Test / smoke (pull_request) Successful in 15s Details	2026-04-15 15:09:36 +00:00
Alexander Whitestone	c22bbbaf65	fix: crisis overlay initial focus to enabled Call 988 link (#69 )	2026-04-15 15:09:32 +00:00
Alexander Whitestone	543cb1d40f	test: add offline self-containment and retry button tests (#41 ) All checks were successful Sanity Checks / sanity-test (pull_request) Successful in 4s Details Smoke Test / smoke (pull_request) Successful in 11s Details	2026-04-15 14:58:44 +00:00
Alexander Whitestone	3cfd01815a	feat: session-level crisis tracking and escalation (closes #35 ) All checks were successful Sanity Checks / sanity-test (pull_request) Successful in 17s Details Smoke Test / smoke (pull_request) Successful in 23s Details	2026-04-15 11:49:52 +00:00
Alexander Whitestone	5a7ba9f207	feat: session-level crisis tracking and escalation (closes #35 )	2026-04-15 11:49:51 +00:00
Alexander Whitestone	8ed8f20a17	feat: session-level crisis tracking and escalation (closes #35 )	2026-04-15 11:49:49 +00:00
Alexander Whitestone	9d7d26033e	feat: session-level crisis tracking and escalation (closes #35 )	2026-04-15 11:49:47 +00:00
Alexander Whitestone	48f48c7f26	feat: cache offline crisis resources (refs #41 ) (#74 ) All checks were successful Smoke Test / smoke (push) Successful in 7s Details Sanity Checks / sanity-test (pull_request) Successful in 17s Details Smoke Test / smoke (pull_request) Successful in 19s Details Merge PR #74 (squash)	2026-04-14 22:09:59 +00:00
Alexander Whitestone	da31288525	fix: deprecate dying_detection and consolidate crisis detection (#40 ) (#76 ) All checks were successful Smoke Test / smoke (push) Successful in 4s Details Merge PR #76 (squash)	2026-04-14 22:08:29 +00:00
Alexander Whitestone	8efc858cd7	fix: add keyboard focus trap to crisis overlay (#80 ) Some checks failed Smoke Test / smoke (push) Has been cancelled Details Merge PR #80 (squash)	2026-04-14 22:08:28 +00:00
Alexander Whitestone	611c1c8456	fix(a11y): Safety plan modal keyboard focus trap (#65 ) (#81 ) Some checks failed Smoke Test / smoke (push) Has been cancelled Details Merge PR #81 (squash)	2026-04-14 22:08:24 +00:00
Timmy Time	9b94978d1c	feat: Wire compassion router into gateway flow (#34 ) (#43 ) All checks were successful Smoke Test / smoke (push) Successful in 5s Details Squash merge: wire compassion router into gateway flow	2026-04-13 19:59:15 +00:00
Alexander Whitestone	e71bca1744	fix: de-duplicate crisis_detector.py and crisis/detect.py (closes #39 ) (#44 ) Some checks failed Smoke Test / smoke (push) Has been cancelled Details Squash merge: de-duplicate crisis detector (closes #39) Co-authored-by: Alexander Whitestone <alexander@alexanderwhitestone.com> Co-committed-by: Alexander Whitestone <alexander@alexanderwhitestone.com>	2026-04-13 19:59:12 +00:00
Alexander Whitestone	1d8afc30fd	fix: reduce crisis detector false positives (closes #32 ) All checks were successful Smoke Test / smoke (push) Successful in 5s Details - Removed 'saying goodbye' from CRITICAL tier (too common in innocent contexts) - Narrowed 'wrote a will' to 'wrote a suicide note' (responsible behavior) - Removed broad single-word matches from HIGH tier: give up, trapped, desperate, worthless, hopeless, no future, nothing left, can't see any light - Added contextual HIGH tier phrases: feel hopeless, trapped in this, desperate for help, give up on life, etc. - Updated MODERATE tier with contextual versions: feel worthless, feel hopeless, feel trapped, etc. - Updated index.html JavaScript keywords to match Python changes - Added comprehensive false positive test suite All existing tests pass. New tests verify innocent messages no longer trigger false alarms.	2026-04-13 15:37:23 -04:00
Alexander Whitestone	38601f6076	fix: remove false-positive CRITICAL crisis keywords (closes #28 , #32 ) (#31 ) All checks were successful Smoke Test / smoke (push) Successful in 5s Details	2026-04-13 19:25:15 +00:00
Timmy Time	dcc931e946	fix: implement missing functions from rescued PR — test_rescue.py now passes (#27 ) All checks were successful Smoke Test / smoke (push) Successful in 5s Details Auto-merged by Timmy overnight cycle	2026-04-13 14:05:07 +00:00
Timmy Time	26e97f76db	fix: remove bridge false-positive from MODERATE_KEYWORDS (#29 ) Some checks failed Smoke Test / smoke (push) Has been cancelled Details Auto-merged by Timmy overnight cycle	2026-04-13 14:05:02 +00:00
Timmy Time	045df23928	Merge pull request 'Rescue PR #23 into existing crisis package (#24 )' (#26 ) from burn/rescue-crisis into main All checks were successful Smoke Test / smoke (push) Successful in 5s Details Merge PR #26: Rescue PR #23 into existing crisis package (#24)	2026-04-13 07:31:59 +00:00
Alexander Whitestone	00fec639b7	Merge pull request 'feat(deploy): add systemd service for hermes-gateway' (#25 ) from burn/20260413-0213-vps-deploy into main All checks were successful Smoke Test / smoke (push) Successful in 5s Details Merged #25: Systemd service for hermes-gateway	2026-04-13 07:31:40 +00:00
Alexander Whitestone	35f18b3d54	Rescue PR #23 into existing crisis package (#24 ) crisis/detect.py: - Add 'better off without me' CRITICAL pattern - Add 'desperate' HIGH pattern - Add extract_context() for match snippets crisis/response.py: - Add 5-4-3-2-1 grounding exercise - Add breathing exercise - Add generate_grounding_steps() and generate_breathing_exercise() crisis/test_rescue.py: 5 tests for new features	2026-04-13 03:20:37 -04:00
Alexander Whitestone	a90b659f3a	feat(deploy): add systemd service for hermes-gateway Some checks failed Sanity Checks / sanity-test (pull_request) Failing after 2s Details Smoke Test / smoke (pull_request) Successful in 4s Details - Add hermes-gateway.service with restart=always and security hardening - Integrate service setup into deploy.sh - Add --service flag for standalone install - Add make service target Resolves #2	2026-04-13 02:16:19 -04:00