Compare commits

..

2 Commits

Author SHA1 Message Date
c4178490b4 fix: restore 'nothing left' pattern — different from HIGH version
Refs #123

The MEDIUM pattern r"\bnothing\s+left\s+(?:to\s+(?:live|hope)\s+for|inside)\b"
matches differently from HIGH's r"\bnothing\s+left\s+(?:to\s+(?:live\s+for|hope\s+for|give)|inside)\b".
Kept both as they catch different phrasings.
2026-04-15 15:18:10 +00:00
421ccbee90 fix: remove duplicate crisis indicator patterns from MEDIUM tier
All checks were successful
Sanity Checks / sanity-test (pull_request) Successful in 6s
Smoke Test / smoke (pull_request) Successful in 12s
Closes #123

Removed 5 patterns that appeared in both HIGH and MEDIUM tiers:
- feel(s/ing) hopeless
- feel(s/ing) trapped
- feel(s/ing) desperate
- no future (for me|ahead|left)
- nothing left (to live/hope for|inside)
- give(n) up on myself

These patterns are already in HIGH_INDICATORS, so having them in MEDIUM
tiers is redundant and wastes regex matching cycles.
2026-04-15 15:16:55 +00:00
3 changed files with 1 additions and 59 deletions

View File

@@ -105,12 +105,7 @@ MEDIUM_INDICATORS = [
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 = [

View File

@@ -993,16 +993,6 @@ Sovereignty and service always.`;
function trapFocusInOverlay(e) {
if (!crisisOverlay.classList.contains('active')) return;
// Escape: dismiss overlay (only when dismiss button is enabled after countdown)
if (e.key === 'Escape') {
e.preventDefault();
if (!overlayDismissBtn.disabled) {
overlayDismissBtn.click();
}
return;
}
if (e.key !== 'Tab') return;
var focusable = getOverlayFocusableElements();
@@ -1011,13 +1001,6 @@ Sovereignty and service always.`;
var first = focusable[0];
var last = focusable[focusable.length - 1];
// If focus escaped outside the overlay, bring it back
if (!crisisOverlay.contains(document.activeElement)) {
e.preventDefault();
first.focus();
return;
}
if (e.shiftKey) {
// Shift+Tab: if on first, wrap to last
if (document.activeElement === first) {
@@ -1067,11 +1050,7 @@ Sovereignty and service always.`;
}
}, 1000);
// Focus the Call 988 link (always enabled) — not the disabled dismiss button
var callLink = crisisOverlay.querySelector('a.overlay-call');
if (callLink) {
callLink.focus();
}
overlayDismissBtn.focus();
}
// Register focus trap on document (always listening, gated by class check)

View File

@@ -52,38 +52,6 @@ class TestCrisisOverlayFocusTrap(unittest.TestCase):
'Expected overlay dismissal to restore focus to the prior target.',
)
def test_overlay_initial_focus_targets_enabled_element(self):
"""Issue #69: overlay must not focus the disabled dismiss button on open."""
# The showOverlay function should NOT call overlayDismissBtn.focus()
# while the button is disabled. Instead it should focus an enabled element.
self.assertNotRegex(
self.html,
r"overlayDismissBtn\.disabled\s*=\s*true;.*overlayDismissBtn\.focus\(\)",
'showOverlay must not focus the dismiss button while it is disabled (issue #69).',
)
# Verify focus goes to the Call 988 link (always enabled)
self.assertIn(
"querySelector('a.overlay-call')",
self.html,
'Expected showOverlay to focus the Call 988 link on open.',
)
def test_overlay_escape_key_dismisses(self):
"""Issue #69/95: Escape key should dismiss the overlay when countdown completes."""
self.assertRegex(
self.html,
r"e\.key\s*===\s*['\"]Escape['\"]",
'Expected Escape key handler in overlay focus trap.',
)
def test_overlay_focus_recovery_when_focus_escapes(self):
"""Focus trap should recover focus if it escapes the overlay."""
self.assertRegex(
self.html,
r"crisisOverlay\.contains\(document\.activeElement\)",
'Focus trap should check if focus is still within the overlay.',
)
if __name__ == '__main__':
unittest.main()