feat: add safety plan version history diff view (#96)

crisis/__init__.py

@@ -6,7 +6,7 @@ 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, check_crisis_multimodal, get_system_prompt, format_gateway_response
+from .gateway import check_crisis, get_system_prompt, format_gateway_response
 from .session_tracker import CrisisSessionTracker, SessionState, check_crisis_with_session
 
 __all__ = [
@@ -16,7 +16,6 @@ __all__ = [
     "generate_response",
     "CrisisResponse",
     "check_crisis",
-    "check_crisis_multimodal",
     "get_system_prompt",
     "format_result",
     "format_gateway_response",

crisis/gateway.py

@@ -2,21 +2,18 @@
 Crisis Gateway Module for the-door.
 
 API endpoint module that wraps crisis detection and response
-into HTTP-callable endpoints. Integrates detect.py, unified_scorer.py, and response.py.
+into HTTP-callable endpoints. Integrates detect.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 (
@@ -53,74 +50,6 @@ 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.

index.html

@@ -500,6 +500,184 @@ html, body {
   min-height: 60px;
 }
 
+.safety-plan-status {
+  min-height: 20px;
+  margin: 4px 0 18px;
+  font-size: 0.85rem;
+  color: #8b949e;
+}
+
+.safety-plan-status.success {
+  color: #3fb950;
+}
+
+.safety-plan-status.error {
+  color: #ff7b72;
+}
+
+.safety-plan-versioning {
+  margin-top: 24px;
+  padding-top: 20px;
+  border-top: 1px solid #30363d;
+}
+
+.safety-plan-versioning-grid {
+  display: grid;
+  gap: 16px;
+}
+
+.safety-plan-history-panel,
+.safety-plan-diff-panel {
+  background: #0d1117;
+  border: 1px solid #30363d;
+  border-radius: 12px;
+  padding: 16px;
+}
+
+.safety-plan-section-header h3 {
+  font-size: 0.95rem;
+  margin-bottom: 4px;
+}
+
+.safety-plan-section-header p {
+  font-size: 0.8rem;
+  color: #8b949e;
+  margin-bottom: 12px;
+}
+
+.safety-plan-history {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
+.safety-plan-history-item {
+  border: 1px solid #30363d;
+  border-radius: 10px;
+  padding: 12px;
+  background: #161b22;
+}
+
+.safety-plan-history-item.active {
+  border-color: #58a6ff;
+  box-shadow: 0 0 0 1px rgba(88, 166, 255, 0.35);
+}
+
+.safety-plan-history-meta {
+  display: flex;
+  justify-content: space-between;
+  gap: 12px;
+  align-items: baseline;
+  margin-bottom: 8px;
+  flex-wrap: wrap;
+}
+
+.safety-plan-history-title {
+  font-size: 0.88rem;
+  font-weight: 600;
+  color: #e6edf3;
+}
+
+.safety-plan-history-note {
+  font-size: 0.78rem;
+  color: #8b949e;
+  margin-bottom: 10px;
+}
+
+.safety-plan-history-actions {
+  display: flex;
+  gap: 8px;
+  flex-wrap: wrap;
+}
+
+.safety-plan-history-button,
+.safety-plan-restore-button {
+  border-radius: 8px;
+  border: 1px solid #30363d;
+  background: transparent;
+  color: #e6edf3;
+  padding: 8px 12px;
+  font-size: 0.82rem;
+  cursor: pointer;
+}
+
+.safety-plan-history-button:hover,
+.safety-plan-restore-button:hover,
+.safety-plan-history-button:focus,
+.safety-plan-restore-button:focus {
+  border-color: #58a6ff;
+  color: #58a6ff;
+  outline: none;
+}
+
+.safety-plan-restore-button {
+  background: rgba(35, 134, 54, 0.14);
+}
+
+.safety-plan-diff {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.safety-plan-diff-meta {
+  font-size: 0.78rem;
+  color: #8b949e;
+}
+
+.safety-plan-diff-field {
+  border-top: 1px solid #21262d;
+  padding-top: 12px;
+}
+
+.safety-plan-diff-field:first-child {
+  border-top: none;
+  padding-top: 0;
+}
+
+.safety-plan-diff-field h4 {
+  font-size: 0.84rem;
+  margin-bottom: 8px;
+  color: #c9d1d9;
+}
+
+.safety-plan-diff-block {
+  white-space: pre-wrap;
+  line-height: 1.5;
+  border-radius: 8px;
+  padding: 10px;
+  font-size: 0.88rem;
+  margin-bottom: 8px;
+}
+
+.diff-unchanged {
+  background: #161b22;
+  color: #c9d1d9;
+}
+
+.diff-added {
+  background: rgba(46, 160, 67, 0.16);
+  border-left: 3px solid #2ea043;
+  color: #d2f4d3;
+}
+
+.diff-removed {
+  background: rgba(248, 81, 73, 0.16);
+  border-left: 3px solid #f85149;
+  color: #ffd8d3;
+}
+
+.safety-plan-empty {
+  color: #8b949e;
+  font-size: 0.85rem;
+}
+
+@media (min-width: 840px) {
+  .safety-plan-versioning-grid {
+    grid-template-columns: minmax(0, 0.9fr) minmax(0, 1.1fr);
+  }
+}
+
 .modal-footer {
   display: flex;
   justify-content: flex-end;
@@ -736,6 +914,28 @@ html, body {
         <label for="sp-environment">5. Making my environment safe</label>
         <textarea id="sp-environment" placeholder="e.g., Giving my car keys to a friend, locking away meds..."></textarea>
       </div>
+
+      <div id="safety-plan-status" class="safety-plan-status" role="status" aria-live="polite"></div>
+
+      <section class="safety-plan-versioning" aria-labelledby="safety-plan-history-title">
+        <div class="safety-plan-versioning-grid">
+          <div class="safety-plan-history-panel">
+            <div class="safety-plan-section-header">
+              <h3 id="safety-plan-history-title">Version History</h3>
+              <p>Each save stays on this device so you can review changes and restore an earlier plan.</p>
+            </div>
+            <div id="safety-plan-history" class="safety-plan-history"></div>
+          </div>
+
+          <div class="safety-plan-diff-panel">
+            <div class="safety-plan-section-header">
+              <h3>Diff View</h3>
+              <p>Compare the selected version against the version immediately before it.</p>
+            </div>
+            <div id="safety-plan-diff" class="safety-plan-diff"></div>
+          </div>
+        </div>
+      </section>
     </div>
     <div class="modal-footer">
       <button class="btn btn-secondary" id="cancel-safety-plan">Cancel</button>
@@ -820,12 +1020,26 @@ Sovereignty and service always.`;
   var cancelSafetyPlan = document.getElementById('cancel-safety-plan');
   var saveSafetyPlan = document.getElementById('save-safety-plan');
   var clearChatBtn = document.getElementById('clear-chat-btn');
+  var safetyPlanHistory = document.getElementById('safety-plan-history');
+  var safetyPlanDiff = document.getElementById('safety-plan-diff');
+  var safetyPlanStatus = document.getElementById('safety-plan-status');
+  var safetyPlanFields = {
+    warningSigns: document.getElementById('sp-warning-signs'),
+    coping: document.getElementById('sp-coping'),
+    distraction: document.getElementById('sp-distraction'),
+    help: document.getElementById('sp-help'),
+    environment: document.getElementById('sp-environment')
+  };
+  var SAFETY_PLAN_STORAGE_KEY = 'timmy_safety_plan';
+  var SAFETY_PLAN_VERSIONS_KEY = 'timmy_safety_plan_versions';
+  var MAX_SAFETY_PLAN_VERSIONS = 20;
 
   // ===== STATE =====
   var messages = [];
   var isStreaming = false;
   var overlayTimer = null;
   var crisisPanelShown = false;
+  var selectedSafetyPlanVersionId = null;
 
   // ===== SERVICE WORKER =====
   if ('serviceWorker' in navigator) {
@@ -1171,18 +1385,347 @@ Sovereignty and service always.`;
   });
 
   // ===== SAFETY PLAN LOGIC =====
-  function loadSafetyPlan() {
+  function emptySafetyPlan() {
+    return {
+      warningSigns: '',
+      coping: '',
+      distraction: '',
+      help: '',
+      environment: ''
+    };
+  }
+
+  function cloneSafetyPlan(plan) {
+    var normalized = emptySafetyPlan();
+    var source = plan || {};
+    Object.keys(normalized).forEach(function(key) {
+      normalized[key] = typeof source[key] === 'string' ? source[key] : '';
+    });
+    return normalized;
+  }
+
+  function applySafetyPlan(plan) {
+    var nextPlan = cloneSafetyPlan(plan);
+    Object.keys(safetyPlanFields).forEach(function(key) {
+      safetyPlanFields[key].value = nextPlan[key];
+    });
+  }
+
+  function getSafetyPlanFormData() {
+    return {
+      warningSigns: safetyPlanFields.warningSigns.value,
+      coping: safetyPlanFields.coping.value,
+      distraction: safetyPlanFields.distraction.value,
+      help: safetyPlanFields.help.value,
+      environment: safetyPlanFields.environment.value
+    };
+  }
+
+  function escapeHtml(value) {
+    return String(value || '')
+      .replace(/&/g, '&amp;')
+      .replace(/</g, '&lt;')
+      .replace(/>/g, '&gt;')
+      .replace(/"/g, '&quot;')
+      .replace(/'/g, '&#39;');
+  }
+
+  function setSafetyPlanStatus(message, tone) {
+    if (!safetyPlanStatus) return;
+    safetyPlanStatus.textContent = message || '';
+    safetyPlanStatus.className = 'safety-plan-status' + (tone ? ' ' + tone : '');
+  }
+
+  function getSafetyPlanVersions() {
     try {
-      var saved = localStorage.getItem('timmy_safety_plan');
-      if (saved) {
-        var plan = JSON.parse(saved);
-        document.getElementById('sp-warning-signs').value = plan.warningSigns || '';
-        document.getElementById('sp-coping').value = plan.coping || '';
-        document.getElementById('sp-distraction').value = plan.distraction || '';
-        document.getElementById('sp-help').value = plan.help || '';
-        document.getElementById('sp-environment').value = plan.environment || '';
+      var saved = localStorage.getItem(SAFETY_PLAN_VERSIONS_KEY);
+      if (!saved) return [];
+      var parsed = JSON.parse(saved);
+      if (!Array.isArray(parsed)) return [];
+      return parsed.filter(function(version) {
+        return version && version.id && version.plan;
+      });
+    } catch (e) {
+      return [];
+    }
+  }
+
+  function setSafetyPlanVersions(versions) {
+    localStorage.setItem(
+      SAFETY_PLAN_VERSIONS_KEY,
+      JSON.stringify((versions || []).slice(0, MAX_SAFETY_PLAN_VERSIONS))
+    );
+  }
+
+  function buildSafetyPlanVersion(plan, meta) {
+    return {
+      id: 'spv_' + Date.now() + '_' + Math.random().toString(36).slice(2, 8),
+      savedAt: new Date().toISOString(),
+      source: (meta && meta.source) || 'save',
+      restoredFrom: meta && meta.restoredFrom ? meta.restoredFrom : null,
+      plan: cloneSafetyPlan(plan)
+    };
+  }
+
+  function ensureSafetyPlanVersionHistory() {
+    var versions = getSafetyPlanVersions();
+    if (versions.length) {
+      return versions;
+    }
+
+    try {
+      var saved = localStorage.getItem(SAFETY_PLAN_STORAGE_KEY);
+      if (!saved) {
+        return [];
       }
-    } catch (e) {}
+      var parsed = JSON.parse(saved);
+      var migrated = [buildSafetyPlanVersion(parsed, { source: 'legacy' })];
+      setSafetyPlanVersions(migrated);
+      return migrated;
+    } catch (e) {
+      return [];
+    }
+  }
+
+  function formatSafetyPlanTimestamp(iso) {
+    var date = new Date(iso || '');
+    if (isNaN(date.getTime())) {
+      return 'Saved just now';
+    }
+    return date.toLocaleString([], {
+      year: 'numeric',
+      month: 'short',
+      day: 'numeric',
+      hour: 'numeric',
+      minute: '2-digit'
+    });
+  }
+
+  function getSafetyPlanVersionById(versionId) {
+    var versions = getSafetyPlanVersions();
+    for (var i = 0; i < versions.length; i++) {
+      if (versions[i].id === versionId) {
+        return { version: versions[i], index: i, versions: versions };
+      }
+    }
+    return null;
+  }
+
+  function calculateSafetyPlanDiff(previousText, currentText) {
+    var previous = String(previousText || '');
+    var current = String(currentText || '');
+    var start = 0;
+    while (start < previous.length && start < current.length && previous.charAt(start) === current.charAt(start)) {
+      start += 1;
+    }
+
+    var previousEnd = previous.length - 1;
+    var currentEnd = current.length - 1;
+    while (previousEnd >= start && currentEnd >= start && previous.charAt(previousEnd) === current.charAt(currentEnd)) {
+      previousEnd -= 1;
+      currentEnd -= 1;
+    }
+
+    return {
+      before: current.slice(0, start),
+      removed: previous.slice(start, previousEnd + 1),
+      added: current.slice(start, currentEnd + 1),
+      after: current.slice(currentEnd + 1)
+    };
+  }
+
+  function renderDiffSegmentHtml(previousText, currentText) {
+    var previous = String(previousText || '');
+    var current = String(currentText || '');
+
+    if (!previous && !current) {
+      return '<p class="safety-plan-empty">No content saved for this section yet.</p>';
+    }
+
+    if (previous === current) {
+      return '<div class="safety-plan-diff-block diff-unchanged">' + escapeHtml(current || 'No changes in this version.') + '</div>';
+    }
+
+    var diff = calculateSafetyPlanDiff(previous, current);
+    var blocks = [];
+    if (diff.before) {
+      blocks.push('<div class="safety-plan-diff-block diff-unchanged">' + escapeHtml(diff.before) + '</div>');
+    }
+    if (diff.removed) {
+      blocks.push('<div class="safety-plan-diff-block diff-removed">Removed<br>' + escapeHtml(diff.removed) + '</div>');
+    }
+    if (diff.added) {
+      blocks.push('<div class="safety-plan-diff-block diff-added">Added<br>' + escapeHtml(diff.added) + '</div>');
+    }
+    if (diff.after) {
+      blocks.push('<div class="safety-plan-diff-block diff-unchanged">' + escapeHtml(diff.after) + '</div>');
+    }
+    return blocks.join('');
+  }
+
+  function renderSafetyPlanDiff(versionId) {
+    if (!safetyPlanDiff) return;
+
+    var versions = getSafetyPlanVersions();
+    if (!versions.length) {
+      safetyPlanDiff.innerHTML = '<p class="safety-plan-empty">Save your plan to start tracking changes.</p>';
+      return;
+    }
+
+    var selected = getSafetyPlanVersionById(versionId || selectedSafetyPlanVersionId || versions[0].id);
+    if (!selected) {
+      selected = { version: versions[0], index: 0, versions: versions };
+      selectedSafetyPlanVersionId = versions[0].id;
+    }
+
+    var baseline = selected.versions[selected.index + 1]
+      ? cloneSafetyPlan(selected.versions[selected.index + 1].plan)
+      : emptySafetyPlan();
+    var currentPlan = cloneSafetyPlan(selected.version.plan);
+    var baselineLabel = selected.versions[selected.index + 1]
+      ? formatSafetyPlanTimestamp(selected.versions[selected.index + 1].savedAt)
+      : 'an empty plan';
+
+    var fields = [
+      ['Warning signs', 'warningSigns'],
+      ['Internal coping strategies', 'coping'],
+      ['People/Places for distraction', 'distraction'],
+      ['People I can ask for help', 'help'],
+      ['Making my environment safe', 'environment']
+    ];
+
+    var html = [
+      '<div class="safety-plan-diff-meta">Comparing ' +
+        escapeHtml(formatSafetyPlanTimestamp(selected.version.savedAt)) +
+        ' against ' + escapeHtml(baselineLabel) + '.</div>'
+    ];
+
+    fields.forEach(function(field) {
+      html.push(
+        '<div class="safety-plan-diff-field">' +
+          '<h4>' + escapeHtml(field[0]) + '</h4>' +
+          renderDiffSegmentHtml(baseline[field[1]], currentPlan[field[1]]) +
+        '</div>'
+      );
+    });
+
+    safetyPlanDiff.innerHTML = html.join('');
+  }
+
+  function renderSafetyPlanVersionHistory() {
+    if (!safetyPlanHistory) return;
+
+    var versions = getSafetyPlanVersions();
+    if (!versions.length) {
+      safetyPlanHistory.innerHTML = '<p class="safety-plan-empty">No saved versions yet. Each save creates a new local version.</p>';
+      renderSafetyPlanDiff(null);
+      return;
+    }
+
+    if (!selectedSafetyPlanVersionId || !getSafetyPlanVersionById(selectedSafetyPlanVersionId)) {
+      selectedSafetyPlanVersionId = versions[0].id;
+    }
+
+    var html = [];
+    versions.forEach(function(version, index) {
+      var note = 'Saved locally';
+      if (version.source === 'restore') {
+        note = 'Restored from an earlier version';
+      } else if (version.source === 'legacy') {
+        note = 'Imported from your previous saved plan';
+      }
+
+      html.push(
+        '<div class="safety-plan-history-item' + (selectedSafetyPlanVersionId === version.id ? ' active' : '') + '">' +
+          '<div class="safety-plan-history-meta">' +
+            '<span class="safety-plan-history-title">' + escapeHtml(index === 0 ? 'Current version' : 'Version ' + (versions.length - index)) + '</span>' +
+            '<span class="safety-plan-empty">' + escapeHtml(formatSafetyPlanTimestamp(version.savedAt)) + '</span>' +
+          '</div>' +
+          '<div class="safety-plan-history-note">' + escapeHtml(note) + '</div>' +
+          '<div class="safety-plan-history-actions">' +
+            '<button type="button" class="safety-plan-history-button" data-version-id="' + escapeHtml(version.id) + '">View diff</button>' +
+            '<button type="button" class="safety-plan-restore-button" data-restore-version-id="' + escapeHtml(version.id) + '">Restore this version</button>' +
+          '</div>' +
+        '</div>'
+      );
+    });
+
+    safetyPlanHistory.innerHTML = html.join('');
+    renderSafetyPlanDiff(selectedSafetyPlanVersionId);
+  }
+
+  function saveSafetyPlanVersion(plan, meta) {
+    var snapshot = buildSafetyPlanVersion(plan, meta);
+    var versions = getSafetyPlanVersions();
+    versions.unshift(snapshot);
+    setSafetyPlanVersions(versions);
+    localStorage.setItem(SAFETY_PLAN_STORAGE_KEY, JSON.stringify(snapshot.plan));
+    selectedSafetyPlanVersionId = snapshot.id;
+    renderSafetyPlanVersionHistory();
+    return snapshot;
+  }
+
+  function restoreSafetyPlanVersion(versionId) {
+    var selected = getSafetyPlanVersionById(versionId);
+    if (!selected) {
+      setSafetyPlanStatus('That version could not be restored.', 'error');
+      return;
+    }
+
+    applySafetyPlan(selected.version.plan);
+    var restored = saveSafetyPlanVersion(selected.version.plan, {
+      source: 'restore',
+      restoredFrom: selected.version.id
+    });
+    setSafetyPlanStatus(
+      'Restored version from ' + formatSafetyPlanTimestamp(selected.version.savedAt) + ' as the current plan.',
+      'success'
+    );
+    return restored;
+  }
+
+  function loadSafetyPlan() {
+    var versions = ensureSafetyPlanVersionHistory();
+    var latestPlan = versions.length ? versions[0].plan : null;
+
+    if (!latestPlan) {
+      try {
+        var saved = localStorage.getItem(SAFETY_PLAN_STORAGE_KEY);
+        latestPlan = saved ? JSON.parse(saved) : null;
+      } catch (e) {
+        latestPlan = null;
+      }
+    }
+
+    applySafetyPlan(latestPlan || emptySafetyPlan());
+    renderSafetyPlanVersionHistory();
+    if (versions.length) {
+      setSafetyPlanStatus('Version history stays on this device only.', '');
+    } else {
+      setSafetyPlanStatus('Every save creates a local version you can diff and restore.', '');
+    }
+  }
+
+  function openSafetyPlanModal(triggerEl) {
+    loadSafetyPlan();
+    safetyPlanModal.classList.add('active');
+    _activateSafetyPlanFocusTrap(triggerEl);
+  }
+
+  if (safetyPlanHistory) {
+    safetyPlanHistory.addEventListener('click', function(event) {
+      var restoreButton = event.target.closest('[data-restore-version-id]');
+      if (restoreButton) {
+        restoreSafetyPlanVersion(restoreButton.getAttribute('data-restore-version-id'));
+        return;
+      }
+
+      var diffButton = event.target.closest('[data-version-id]');
+      if (diffButton) {
+        selectedSafetyPlanVersionId = diffButton.getAttribute('data-version-id');
+        renderSafetyPlanVersionHistory();
+      }
+    });
   }
 
   closeSafetyPlan.addEventListener('click', function() {
@@ -1196,41 +1739,23 @@ Sovereignty and service always.`;
   });
 
   saveSafetyPlan.addEventListener('click', function() {
-    var plan = {
-      warningSigns: document.getElementById('sp-warning-signs').value,
-      coping: document.getElementById('sp-coping').value,
-      distraction: document.getElementById('sp-distraction').value,
-      help: document.getElementById('sp-help').value,
-      environment: document.getElementById('sp-environment').value
-    };
     try {
-      localStorage.setItem('timmy_safety_plan', JSON.stringify(plan));
-      safetyPlanModal.classList.remove('active');
-      _restoreSafetyPlanFocus();
-      alert('Safety plan saved locally.');
+      var snapshot = saveSafetyPlanVersion(getSafetyPlanFormData(), { source: 'save' });
+      setSafetyPlanStatus('Saved locally as a new version at ' + formatSafetyPlanTimestamp(snapshot.savedAt) + '.', 'success');
     } catch (e) {
-      alert('Error saving plan.');
+      setSafetyPlanStatus('Error saving plan.', 'error');
     }
   });
 
   // ===== 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; });
+    return Array.prototype.slice.call(
+      safetyPlanModal.querySelectorAll('button:not([disabled]), textarea:not([disabled]), a[href], input:not([disabled]), select:not([disabled]), [tabindex]:not([tabindex="-1"])')
+    ).filter(function(el) {
+      return !!(el.offsetWidth || el.offsetHeight || el.getClientRects().length);
+    });
   }
 
   function _trapSafetyPlanFocus(e) {
@@ -1287,17 +1812,13 @@ Sovereignty and service always.`;
 
   // Wire open buttons to activate focus trap
   safetyPlanBtn.addEventListener('click', function() {
-    loadSafetyPlan();
-    safetyPlanModal.classList.add('active');
-    _activateSafetyPlanFocusTrap(safetyPlanBtn);
+    openSafetyPlanModal(safetyPlanBtn);
   });
 
   // Crisis panel safety plan button (if crisis panel is visible)
   if (crisisSafetyPlanBtn) {
     crisisSafetyPlanBtn.addEventListener('click', function() {
-      loadSafetyPlan();
-      safetyPlanModal.classList.add('active');
-      _activateSafetyPlanFocusTrap(crisisSafetyPlanBtn);
+      openSafetyPlanModal(crisisSafetyPlanBtn);
     });
   }
 
@@ -1444,9 +1965,7 @@ Sovereignty and service always.`;
     // Check for URL params (e.g., ?safetyplan=true for PWA shortcut)
     var urlParams = new URLSearchParams(window.location.search);
     if (urlParams.get('safetyplan') === 'true') {
-      loadSafetyPlan();
-      safetyPlanModal.classList.add('active');
-      _activateSafetyPlanFocusTrap(safetyPlanBtn);
+      openSafetyPlanModal(safetyPlanBtn);
       // Clean up URL
       window.history.replaceState({}, document.title, window.location.pathname);
     }

tests/test_safety_plan_version_history.py

@@ -0,0 +1,21 @@
+from pathlib import Path
+
+
+def test_safety_plan_version_history_contract_present() -> None:
+    html = Path("index.html").read_text(encoding="utf-8")
+
+    required_snippets = [
+        'id="safety-plan-history"',
+        'id="safety-plan-diff"',
+        'id="safety-plan-status"',
+        'Version History',
+        'timmy_safety_plan_versions',
+        'function renderSafetyPlanVersionHistory()',
+        'function renderSafetyPlanDiff(',
+        'function restoreSafetyPlanVersion(',
+        'diff-added',
+        'diff-removed',
+    ]
+
+    for snippet in required_snippets:
+        assert snippet in html, f"missing safety plan versioning contract: {snippet}"

tests/test_unified_gateway.py

@@ -1,19 +0,0 @@
-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

tests/test_unified_scorer.py

@@ -1,51 +0,0 @@
-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

unified_scorer.py

@@ -1,126 +0,0 @@
-"""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))