mirrors/hermes-agent
1
0
Fork 0
mirror of https://github.com/NousResearch/hermes-agent.git synced 2026-07-25 17:18:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix: pre-lease drift guard must not fire on in-place compaction or mutated snapshots

Browse source 
The salvaged drift check compared durable rows to the in-memory snapshot
by content and ran in both modes. Two problems:
1. In-place compaction (the default) archives non-destructively — drift
   cannot lose data there, and the strict-prefix content comparison
   failed against seeded histories, aborting every in-place compaction
   (5 test failures in test_in_place_compaction.py).
2. Content equality wedges on sessions with legal in-memory mutation of
   past turns (multimodal compression, retry replacement) — the same
   permanent-abort shape as #14694.

Now rotation-only and length-based: abort only when the durable parent
has MORE rows than the snapshot (a writer committed in the lease window).
Dead helper _durable_history_matches_snapshot removed.
This commit is contained in:
teknium1 2026-07-24 14:35:37 -07:00 • committed by Teknium
parent 2b3d442fdb
commit c54fe5b33f
1 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

36
agent/conversation_compression.py
View file

@ -373,23 +373,6 @@ def compression_skipped_due_to_lock(agent: Any) -> bool:
return _sig is True or isinstance(_sig, str)
def _durable_history_matches_snapshot(
durable: Any, snapshot: List[Dict[str, Any]]
) -> bool:
"""Return whether durable parent rows are the ordered snapshot prefix."""
if not isinstance(durable, list) or len(durable) > len(snapshot):
return False
identity_fields = (
"role", "content", "tool_call_id", "tool_calls", "tool_name", "api_content",
)
for stored, live in zip(durable, snapshot):
if not isinstance(stored, dict) or not isinstance(live, dict):
return False
if any(stored.get(key) != live.get(key) for key in identity_fields):
return False
return True
def _adopt_live_compression_child(
agent: Any,
session_db: Any,
@ -1688,16 +1671,25 @@ def compress_context(
_lock_refresher.start()
# The caller's history snapshot predates lease acquisition. Reload the
# durable parent after the lease is live; any row not represented as the
# ordered prefix means a frontend/background writer committed in that
# window, so publishing from this snapshot would omit a durable turn.
if _lock_db is not None and _lock_sid:
# durable parent after the lease is live; MORE durable rows than the
# snapshot carries means a frontend/background writer committed a turn
# in that window, so publishing from this snapshot would omit it.
# Deliberately a LENGTH check, not content equality: in-memory
# mutation of past turns is legal (multimodal compression, retry
# history replacement, think-tag stripping), and a content-equality
# abort would permanently wedge compression on such sessions — the
# #14694 failure shape.
# Rotation-only: in-place compaction (archive_and_compact) is
# non-destructive — pre-compaction rows are soft-archived (active=0,
# compacted=1), stay searchable and recoverable, so snapshot/durable
# drift cannot lose data there and must not abort compaction.
if not in_place and _lock_db is not None and _lock_sid:
durable_loader = getattr(
type(_lock_db), "get_messages_as_conversation", None
)
if callable(durable_loader):
durable_parent = durable_loader(_lock_db, _lock_sid)
if not _durable_history_matches_snapshot(durable_parent, messages):
if isinstance(durable_parent, list) and len(durable_parent) > len(messages):
logger.warning(
"compression aborted: session=%s changed before lease "
"acquisition; preserving newer durable messages",