mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-24 05:41:40 +00:00
feat(session): make /handoff actually transfer the session live
Builds on @kshitijk4poor's CLI handoff stub. The original PR's flow
deferred everything to whenever a real user happened to message the
target platform; this rewrites it so the gateway picks up handoffs
immediately and the destination chat just starts working.
State machine on sessions table replaces the boolean flag:
None -> 'pending' -> 'running' -> ('completed' | 'failed')
plus handoff_error for failure reasons. CLI request_handoff /
get_handoff_state / list_pending_handoffs / claim_handoff /
complete_handoff / fail_handoff helpers wrap the transitions.
CLI side (cli.py): /handoff <platform> validates the platform's home
channel via load_gateway_config, refuses if the agent is mid-turn,
flips the row to 'pending', and poll-blocks (60s) on terminal state.
On 'completed' it prints the /resume hint and exits the CLI like
/quit. On 'failed' or timeout it surfaces the reason and the CLI
session stays intact.
Gateway side (gateway/run.py): new _handoff_watcher background task
scans state.db every 2s, atomically claims pending rows, and runs
_process_handoff for each. _process_handoff:
1. Resolves the platform's home channel.
2. Asks the adapter for a fresh thread via the new
create_handoff_thread(parent_chat_id, name) capability so the
handed-off conversation gets its own scrollback. Adapters that
don't support threads (or fail) return None and the watcher
falls back to the home channel directly.
3. Constructs a SessionSource keyed as 'thread' when a thread was
created, 'dm' otherwise, then session_store.switch_session
re-binds the destination key to the CLI session_id. The full
role-aware transcript replays via load_transcript on the next
turn (no flat-text injection into context_prompt).
4. Forges a synthetic MessageEvent(internal=True) with the handoff
notice and dispatches through _handle_message; the agent runs
against the loaded transcript and adapter.send delivers the
reply.
5. Marks the row 'completed' on success, 'failed' (+error) on any
exception.
Adapter capability (gateway/platforms/base.py): create_handoff_thread
default returns None. Three overrides:
- Telegram (gateway/platforms/telegram.py): wraps _create_dm_topic
so DM topics (Bot API 9.4+) and forum supergroups both work.
- Discord (gateway/platforms/discord.py): parent.create_thread on
text channels with a seed-message + message.create_thread
fallback for permission edge cases. Skips DMs and other
non-thread-capable parents.
- Slack (gateway/platforms/slack.py): posts a seed message and
returns its ts as the thread anchor — Slack threads are
message-anchored.
In thread mode, build_session_key keys the destination without
user_id (thread_sessions_per_user defaults to False) so the synthetic
turn and any later real-user message in the thread share the same
session_key — seamless takeover without race.
CommandDef stays cli_only=True (handoff is initiated from the CLI;
gateway exposes /resume for the reverse direction).
Removed the original PR's _handle_message_with_agent handoff hook
(transcript-as-text injection into context_prompt) and the
send_message_tool notification — both replaced by the watcher path.
Tests rewritten around the new state machine: 13/13 pass.
E2E-validated thread + no-thread paths and the failure path against
real worktree imports with mocked adapters.
This commit is contained in:
parent
878611a79d
commit
00ce5f04d9
8 changed files with 737 additions and 189 deletions
|
|
@ -1511,6 +1511,33 @@ class BasePlatformAdapter(ABC):
|
|||
# property) so the stream consumer knows not to short-circuit.
|
||||
REQUIRES_EDIT_FINALIZE: bool = False
|
||||
|
||||
async def create_handoff_thread(
|
||||
self,
|
||||
parent_chat_id: str,
|
||||
name: str,
|
||||
) -> Optional[str]:
|
||||
"""Create a fresh thread under ``parent_chat_id`` for a session handoff.
|
||||
|
||||
Used by the gateway's handoff watcher when transferring a CLI
|
||||
session to a thread-capable platform — the new thread isolates the
|
||||
handed-off conversation from any pre-existing chat in the home
|
||||
channel and gives users a clean per-handoff scrollback.
|
||||
|
||||
Returns the new thread/topic id (as a string) on success, or
|
||||
``None`` if the platform doesn't support threading or the
|
||||
attempt failed (permissions, topics-mode off, etc.). When ``None``
|
||||
is returned the watcher falls back to using ``parent_chat_id``
|
||||
directly.
|
||||
|
||||
Default implementation returns ``None`` — adapters that support
|
||||
threads override this. See:
|
||||
- Telegram: forum topics in groups, DM topics with bot API 9.4+
|
||||
- Discord: text-channel threads (1440-min auto-archive)
|
||||
- Slack: seed-message thread anchoring
|
||||
"""
|
||||
return None
|
||||
|
||||
|
||||
async def edit_message(
|
||||
self,
|
||||
chat_id: str,
|
||||
|
|
|
|||
|
|
@ -3689,6 +3689,84 @@ class DiscordAdapter(BasePlatformAdapter):
|
|||
)
|
||||
return None
|
||||
|
||||
async def create_handoff_thread(
|
||||
self,
|
||||
parent_chat_id: str,
|
||||
name: str,
|
||||
) -> Optional[str]:
|
||||
"""Create a Discord thread under a text channel for a handoff.
|
||||
|
||||
Falls back to a seed-message + ``message.create_thread`` path if
|
||||
``parent.create_thread`` is rejected (some channel types or
|
||||
permission setups). Returns the new thread id as a string, or
|
||||
``None`` on failure or when the parent isn't a text channel
|
||||
(DMs, voice channels, threads themselves can't host threads).
|
||||
"""
|
||||
if not self._client or not DISCORD_AVAILABLE:
|
||||
return None
|
||||
|
||||
try:
|
||||
parent_id = int(parent_chat_id)
|
||||
except (TypeError, ValueError):
|
||||
return None
|
||||
|
||||
try:
|
||||
parent = self._client.get_channel(parent_id)
|
||||
if parent is None:
|
||||
parent = await self._client.fetch_channel(parent_id)
|
||||
except Exception as exc:
|
||||
logger.warning(
|
||||
"[%s] Handoff thread: cannot resolve parent %s: %s",
|
||||
self.name, parent_chat_id, exc,
|
||||
)
|
||||
return None
|
||||
|
||||
# DMs, voice channels, and existing threads can't host child threads.
|
||||
if isinstance(parent, getattr(discord, "DMChannel", tuple())):
|
||||
logger.info(
|
||||
"[%s] Handoff thread: parent %s is a DM; threads not supported here",
|
||||
self.name, parent_chat_id,
|
||||
)
|
||||
return None
|
||||
|
||||
thread_name = (name or "handoff").strip()[:80] or "handoff"
|
||||
reason = "Hermes session handoff"
|
||||
|
||||
# First try: create a thread directly on the channel.
|
||||
try:
|
||||
create = getattr(parent, "create_thread", None)
|
||||
if create is not None:
|
||||
thread = await create(
|
||||
name=thread_name,
|
||||
auto_archive_duration=1440,
|
||||
reason=reason,
|
||||
)
|
||||
return str(thread.id)
|
||||
except Exception as direct_error:
|
||||
logger.debug(
|
||||
"[%s] Handoff thread: direct create failed (%s); trying seed-message fallback",
|
||||
self.name, direct_error,
|
||||
)
|
||||
|
||||
# Fallback: post a seed message and create the thread from it.
|
||||
try:
|
||||
send = getattr(parent, "send", None)
|
||||
if send is None:
|
||||
return None
|
||||
seed_msg = await send(f"\U0001f9f5 Hermes handoff: **{thread_name}**")
|
||||
thread = await seed_msg.create_thread(
|
||||
name=thread_name,
|
||||
auto_archive_duration=1440,
|
||||
reason=reason,
|
||||
)
|
||||
return str(thread.id)
|
||||
except Exception as fallback_error:
|
||||
logger.warning(
|
||||
"[%s] Handoff thread: both create paths failed for parent %s: %s",
|
||||
self.name, parent_chat_id, fallback_error,
|
||||
)
|
||||
return None
|
||||
|
||||
async def send_exec_approval(
|
||||
self, chat_id: str, command: str, session_key: str,
|
||||
description: str = "dangerous command",
|
||||
|
|
|
|||
|
|
@ -679,6 +679,41 @@ class SlackAdapter(BasePlatformAdapter):
|
|||
if lock_acquired and not self._running:
|
||||
self._release_platform_lock()
|
||||
|
||||
async def create_handoff_thread(
|
||||
self,
|
||||
parent_chat_id: str,
|
||||
name: str,
|
||||
) -> Optional[str]:
|
||||
"""Create a Slack thread anchor for a session handoff.
|
||||
|
||||
Slack threads are anchored to a parent message (``thread_ts``), not
|
||||
a channel-level construct. So we post a seed message into the home
|
||||
channel and return its ``ts`` — the watcher uses that as the
|
||||
``thread_id`` for subsequent sends.
|
||||
|
||||
Returns the seed message ts as a string, or ``None`` on failure.
|
||||
"""
|
||||
if not self._app:
|
||||
return None
|
||||
try:
|
||||
client = self._get_client(parent_chat_id)
|
||||
if client is None:
|
||||
return None
|
||||
seed_text = f":thread: Hermes handoff — *{(name or 'session').strip()[:80]}*"
|
||||
result = await client.chat_postMessage(
|
||||
channel=parent_chat_id,
|
||||
text=seed_text,
|
||||
)
|
||||
ts = result.get("ts") if isinstance(result, dict) else getattr(result, "get", lambda _k, _d=None: None)("ts")
|
||||
if ts:
|
||||
return str(ts)
|
||||
except Exception as exc:
|
||||
logger.warning(
|
||||
"[%s] Handoff thread: seed-post failed for channel %s: %s",
|
||||
self.name, parent_chat_id, exc,
|
||||
)
|
||||
return None
|
||||
|
||||
async def disconnect(self) -> None:
|
||||
"""Disconnect from Slack."""
|
||||
if self._handler:
|
||||
|
|
|
|||
|
|
@ -865,6 +865,24 @@ class TelegramAdapter(BasePlatformAdapter):
|
|||
)
|
||||
return None
|
||||
|
||||
async def create_handoff_thread(
|
||||
self,
|
||||
parent_chat_id: str,
|
||||
name: str,
|
||||
) -> Optional[str]:
|
||||
"""Create a forum topic for a session handoff.
|
||||
|
||||
Works for DM topics (Bot API 9.4+, requires user to enable Topics
|
||||
in their chat with the bot) and forum supergroups. Returns the
|
||||
``message_thread_id`` as a string, or ``None`` on failure.
|
||||
"""
|
||||
try:
|
||||
chat_id_int = int(parent_chat_id)
|
||||
except (TypeError, ValueError):
|
||||
return None
|
||||
thread_id = await self._create_dm_topic(chat_id_int, name=name)
|
||||
return str(thread_id) if thread_id else None
|
||||
|
||||
async def rename_dm_topic(
|
||||
self,
|
||||
chat_id: int,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue