fix(cli): flush un-persisted messages before /resume and /branch end the old session

compress_context() and /new already flush un-persisted messages before
calling end_session() (fixed in #47202), but /resume and /branch still
call end_session() directly. When a turn is interrupted mid-flight and
the user immediately runs /resume or /branch, messages generated during
that turn have not yet been written to state.db and are silently lost on
session rotation.

Add the same best-effort _flush_messages_to_session_db() call before
end_session() in both _handle_resume_command and _handle_branch_command,
mirroring the pattern established in cli.py:new_session().

Regression tests verify the flush is called when an agent is present.
This commit is contained in:
srojk34 2026-06-19 05:19:04 +03:00 committed by kshitij
parent 154c382d65
commit a76aa6198c
3 changed files with 65 additions and 0 deletions

View file

@ -240,3 +240,21 @@ class TestBranchCommandDef:
from hermes_cli.commands import COMMAND_REGISTRY
branch = next(c for c in COMMAND_REGISTRY if c.name == "branch")
assert branch.category == "Session"
class TestBranchFlushesBeforeEndSession:
"""Regression for #47202: /branch must flush un-persisted messages to
the session DB before ending the old session, just like /new and
compress_context() already do."""
def test_branch_flushes_when_agent_present(self, cli_instance, session_db):
from cli import HermesCLI
agent = MagicMock()
cli_instance.agent = agent
HermesCLI._handle_branch_command(cli_instance, "/branch")
agent._flush_messages_to_session_db.assert_called_once_with(
cli_instance.conversation_history
)