mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-04-25 00:51:20 +00:00
fix(cli): sync session_id after compression and preserve original end_reason (#12920)
After context compression (manual /compress or auto), run_agent's _compress_context ends the current session and creates a new continuation child session, mutating agent.session_id. The classic CLI held its own self.session_id that never resynced, so /status showed the ended parent, the exit-summary --resume hint pointed at a closed row, and any later end_session() call (from /resume <other> or /branch) targeted the wrong row AND overwrote the parent's 'compression' end_reason. This only affected the classic prompt_toolkit CLI. The gateway path was already fixed in PR #1160 (March 2026); --tui and ACP use different session plumbing and were unaffected. Changes: - cli.py::_manual_compress — sync self.session_id from self.agent.session_id after _compress_context, clear _pending_title - cli.py chat loop — same sync post-run_conversation for auto-compression - cli.py hermes -q single-query mode — same sync so stderr session_id output points at the continuation - hermes_state.py::end_session — guard UPDATE with 'ended_at IS NULL' so the first end_reason wins; reopen_session() remains the explicit escape hatch for re-ending a closed row Tests: - 3 new in tests/cli/test_manual_compress.py (split sync, no-op guard, pending_title behavior) - 2 new in tests/test_hermes_state.py (preserve compression end_reason on double-end; reopen-then-re-end still works) Closes #12483. Credits @steve5636 for the same-day bug report and @dieutx for PR #3529 which proposed the CLI sync approach.
This commit is contained in:
parent
f23123e7b4
commit
8a6aa5882e
4 changed files with 140 additions and 2 deletions
35
cli.py
35
cli.py
|
|
@ -6664,6 +6664,18 @@ class HermesCLI:
|
|||
focus_topic=focus_topic or None,
|
||||
)
|
||||
self.conversation_history = compressed
|
||||
# _compress_context ends the old session and creates a new child
|
||||
# session on the agent (run_agent.py::_compress_context). Sync the
|
||||
# CLI's session_id so /status, /resume, exit summary, and title
|
||||
# generation all point at the live continuation session, not the
|
||||
# ended parent. Without this, subsequent end_session() calls target
|
||||
# the already-closed parent and the child is orphaned.
|
||||
if (
|
||||
getattr(self.agent, "session_id", None)
|
||||
and self.agent.session_id != self.session_id
|
||||
):
|
||||
self.session_id = self.agent.session_id
|
||||
self._pending_title = None
|
||||
new_tokens = estimate_messages_tokens_rough(self.conversation_history)
|
||||
summary = summarize_manual_compression(
|
||||
original_history,
|
||||
|
|
@ -8182,6 +8194,20 @@ class HermesCLI:
|
|||
# Update history with full conversation
|
||||
self.conversation_history = result.get("messages", self.conversation_history) if result else self.conversation_history
|
||||
|
||||
# If auto-compression fired mid-turn, the agent created a new
|
||||
# continuation session and mutated self.agent.session_id. Sync
|
||||
# the CLI's session_id so /status, /resume, title generation,
|
||||
# and the exit summary all target the live child session rather
|
||||
# than the ended parent. Mirrors the gateway's post-run sync
|
||||
# (gateway/run.py around line 9983).
|
||||
if (
|
||||
self.agent
|
||||
and getattr(self.agent, "session_id", None)
|
||||
and self.agent.session_id != self.session_id
|
||||
):
|
||||
self.session_id = self.agent.session_id
|
||||
self._pending_title = None
|
||||
|
||||
# Get the final response
|
||||
response = result.get("final_response", "") if result else ""
|
||||
|
||||
|
|
@ -10554,6 +10580,15 @@ def main(
|
|||
user_message=effective_query,
|
||||
conversation_history=cli.conversation_history,
|
||||
)
|
||||
# Sync session_id if mid-run compression created a
|
||||
# continuation session. The exit line below reports
|
||||
# session_id to stderr for automation wrappers; without
|
||||
# this sync it would point at the ended parent.
|
||||
if (
|
||||
getattr(cli.agent, "session_id", None)
|
||||
and cli.agent.session_id != cli.session_id
|
||||
):
|
||||
cli.session_id = cli.agent.session_id
|
||||
response = result.get("final_response", "") if isinstance(result, dict) else str(result)
|
||||
if response:
|
||||
print(response)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue