fix(models): make full-scan fallback path consistent with index path (#1171)

nesquena · claude · nesquena · commit 7e2000638955 · 2026-04-27T16:20:20.000-07:00
The PR removed the 60-second grace window from the index-path filter at
api/models.py:558-567 but left the same filter at the full-scan fallback
(line 589-594) with the grace window intact. The fallback path is only
hit when SESSION_INDEX_FILE doesn't exist or fails to parse — rare in
production but it's also the path used by tests/test_issue789.py
(monkeypatch sets SESSION_INDEX_FILE to a temp path that's never created),
which is why those existing assertions kept passing on the PR even
though they assert the OLD "60s grace" behavior.

Make both filter sites consistent: empty Untitled sessions are hidden
regardless of age in BOTH paths. Update test_issue789.py assertions to
reflect the new contract documented in the PR description ("a session
only exists from the user's perspective once the first message is
sent"). The two visibility-while-young tests are flipped to assert the
new hidden behavior; the old-age tests already assert hidden so they
continue to pass.

Without this commit:
  - production: index path is always taken, PR works as documented
  - legacy installs (no _index.json): old grace behavior persists
  - tests: silently pass against the old fallback path, masking the
    inconsistency

Co-Authored-By: Claude Opus 4.7 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/api/models.py b/api/models.py
@@ -586,11 +586,12 @@ def all_sessions():
     for s in SESSIONS.values():
         if all(s.session_id != x.session_id for x in out): out.append(s)
     out.sort(key=lambda s: (getattr(s, 'pinned', False), _session_sort_timestamp(s)), reverse=True)
-    _now = time.time()
+    # Hide empty Untitled sessions from the UI entirely — kept consistent with the
+    # index-path filter above. No grace window: a 0-message Untitled session is
+    # never shown regardless of age (#1171).
     result = [s.compact(include_runtime=True, active_stream_ids=active_stream_ids) for s in out if not (
         s.title == 'Untitled'
         and len(s.messages) == 0
-        and (_now - s.updated_at) > 60
     )]
     result = [s for s in result if not _hide_from_default_sidebar(s)]
     for s in result:
diff --git a/tests/test_issue789.py b/tests/test_issue789.py
@@ -1,14 +1,17 @@
 """
 Regression tests for GitHub issue #789.
 
-Bug: every brand-new session immediately disappeared from the sidebar because
-all_sessions() filtered out sessions where title == 'Untitled' AND
-message_count == 0. Since every new session starts with those values, it was
-filtered out of /api/sessions on the next refresh.
-
-Fix: exempt sessions younger than 60 seconds from that filter. Sessions older
-than 60 seconds that are still Untitled with 0 messages are still suppressed
-(ghost sessions from test runs / accidental reloads).
+Original bug (#789): new sessions immediately disappeared because all_sessions()
+filtered out Untitled + 0-message sessions.
+
+Original fix: exempt sessions younger than 60 seconds.
+
+Updated for #1171 / #1182: a session only "exists" from the user's perspective
+once the first message is sent. Untitled + 0-message sessions are now hidden
+from the sidebar **regardless of age** — no grace window. The button guard
+(#1176) and the boot-restore guard (#1182) ensure the user is never locked
+out of typing into a fresh session, but the sidebar list never surfaces empty
+ones. These tests reflect the new contract.
 """
 import json
 import time
@@ -67,34 +70,37 @@ def _make_titled_session(age_seconds, session_id=None):
     return s
 
 
-# ── Test 1: brand-new Untitled 0-message session IS included ─────────────────
+# ── Test 1: Untitled 0-message sessions are hidden regardless of age (#1171) ─
+
+def test_new_untitled_session_is_hidden_from_sidebar():
+    """A brand-new (0 s old) Untitled 0-message session must NOT appear (#1171).
 
-def test_new_untitled_session_is_visible_in_sidebar():
-    """A session created just now (0 seconds old) must appear in all_sessions()."""
+    Updated for #1171/#1182: sessions only "exist" once the first message is
+    sent. Empty scratch-pad sessions never surface in the sidebar.
+    """
     new_session = _make_untitled_session(age_seconds=0)
 
     result = all_sessions()
     ids = {s["session_id"] for s in result}
 
-    assert new_session.session_id in ids, (
-        "Brand-new Untitled 0-message session must be visible in the sidebar "
-        "(fix for issue #789)"
+    assert new_session.session_id not in ids, (
+        "Untitled 0-message session must be hidden regardless of age (#1171)"
     )
 
 
-def test_recent_untitled_session_under_60s_is_visible():
-    """A session 30 seconds old should still be visible."""
+def test_recent_untitled_session_under_60s_is_hidden():
+    """A 30-second-old empty session must also be hidden (no grace window)."""
     recent_session = _make_untitled_session(age_seconds=30)
 
     result = all_sessions()
     ids = {s["session_id"] for s in result}
 
-    assert recent_session.session_id in ids, (
-        "Untitled 0-message session younger than 60 s must be visible (#789)"
+    assert recent_session.session_id not in ids, (
+        "Untitled 0-message session younger than 60 s is also hidden (#1171)"
     )
 
 
-# ── Test 2: old Untitled 0-message session IS still filtered ─────────────────
+# ── Test 2: old Untitled 0-message session is still filtered ─────────────────
 
 def test_old_untitled_session_over_60s_is_filtered():
     """A ghost session (Untitled, 0 messages, >60 s old) must be hidden."""
@@ -109,14 +115,14 @@ def test_old_untitled_session_over_60s_is_filtered():
 
 
 def test_session_exactly_at_boundary_is_filtered():
-    """A session just over 60 seconds old should be filtered."""
+    """A session at any age (the previous 60 s threshold no longer applies)."""
     boundary_session = _make_untitled_session(age_seconds=61)
 
     result = all_sessions()
     ids = {s["session_id"] for s in result}
 
     assert boundary_session.session_id not in ids, (
-        "Untitled 0-message session older than 60 s must be filtered out"
+        "Untitled 0-message session is filtered regardless of age (#1171)"
     )
 
 
@@ -181,14 +187,15 @@ def test_titled_session_with_no_messages_old_is_visible():
 # ── Test 4: mixed bag — only old Untitled empty sessions are filtered ─────────
 
 def test_mixed_sessions_correct_visibility():
-    """With a mix of sessions, only old+Untitled+empty ones are suppressed."""
+    """With a mix of sessions, only sessions with messages OR titled sessions
+    are surfaced (#1171). Both new and old Untitled+empty sessions are hidden."""
     new_ghost = _make_untitled_session(age_seconds=5, session_id="new_ghost")
     old_ghost = _make_untitled_session(age_seconds=200, session_id="old_ghost")
     real_session = _make_titled_session(age_seconds=500, session_id="real_session")
 
     result = all_sessions()
     ids = {s["session_id"] for s in result}
 
-    assert "new_ghost" in ids, "New Untitled session (5s old) must be visible"
-    assert "old_ghost" not in ids, "Old Untitled session (200s old) must be hidden"
+    assert "new_ghost" not in ids, "New Untitled empty session is also hidden (#1171)"
+    assert "old_ghost" not in ids, "Old Untitled session must be hidden"
     assert "real_session" in ids, "Titled session with messages must be visible"
