DasPoschi/hermes-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(#3102): don't let persisted watermark permanently drop future state.db recovery rows

Browse Source 
Codex regression-gate finding: since Session.save() no longer auto-clears the
truncation_watermark, the unconditional 'timestamp > watermark' skip in
merge_session_messages_append_only became a permanent ceiling — a genuine future
state.db-only row (recovery/compaction, missed by the sidecar) would be silently
dropped from /api/session and model-context reconstruction forever. Only apply the
above-watermark skip while the sidecar has NOT advanced past the watermark. Preserves
the #2914 deleted-tail filtering (revert-verified). Adds 2 regression tests.
This commit is contained in:
nesquena-hermes
2026-06-01 18:14:48 +00:00
parent a755786314
commit bce1f9430b
2 changed files with 71 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
api/models.py
View File

@@ -4056,11 +4056,27 @@ def merge_session_messages_append_only(
skipped_state_visible_counts.get(matched_visible_key, 0) + 1
)
continue
# Skip rows ABOVE the watermark only while the sidecar has NOT advanced
# past the watermark. Because Session.save() no longer auto-clears the
# watermark, an unconditional `timestamp > watermark` skip would become
# permanent and silently drop legitimate future state.db-only recovery
# rows once the session moves forward past the edit boundary. Once the
# sidecar's own max timestamp is beyond the watermark (the session has
# advanced), allow state rows newer than the sidecar tail to merge.
sidecar_advanced_past_watermark = (
watermark_timestamp is not None
and max_sidecar_timestamp is not None
and max_sidecar_timestamp > watermark_timestamp
)
if (
watermark_timestamp is not None
and timestamp is not None
and timestamp > watermark_timestamp
and key not in seen_message_keys
and (
not sidecar_advanced_past_watermark
or (max_sidecar_timestamp is not None and timestamp <= max_sidecar_timestamp)
)
):
continue
# When a truncation watermark is active, state.db may contain original