mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-09 13:21:42 +00:00
19d4174454
Gateway users can now search resumable sessions from messaging surfaces: /sessions search <query> (alias: find) matches titles and session ids — including every title/id in a row's forward compression chain, so a compressed-away title still surfaces its live tip — plus a punctuation-normalized variant so 'an94' matches 'AN-94'. Implemented by generalizing the existing id_query chain-filter in SessionDB.list_sessions_rich into a combined SQL-level filter (search stays ORDER BY last-active + LIMIT at SQL level), threading a search_query through the shared query_session_listing helper, and teaching parse_session_listing_args to split off a search query. Search results pass through the existing _resume_row_visible guard unchanged: origin scoping, admin-only 'all', and the fail-closed legacy-row posture from the July 1 hardening are preserved exactly. Over-fetch (50) before the visibility cut so origin-invisible matches can't starve the page. Salvages the feature direction of PR #57595 by @GodsBoy with a minimal implementation that keeps the resume authorization surface untouched.
113 lines
4.4 KiB
Python
113 lines
4.4 KiB
Python
"""Shared session-listing helpers for CLI and gateway slash surfaces."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import Any
|
|
|
|
|
|
def parse_session_listing_args(raw_args: str) -> tuple[bool, bool, str, str | None]:
|
|
"""Parse `/sessions`-style args into listing flags, a resume target, and a search query.
|
|
|
|
Returns ``(include_all_sources, include_unnamed, target, search_query)``.
|
|
``list``/``ls`` and ``browse`` are display aliases; ``all``/``--all`` widens
|
|
source scope; ``full``/``--full`` keeps unnamed sessions in the listing.
|
|
``search``/``find`` makes the remaining words a search query —
|
|
``search_query`` is ``None`` when search wasn't requested and ``""`` when it
|
|
was requested without a query. Flags are only honored before the first
|
|
positional word, so titles containing e.g. "all" aren't misparsed. Anything
|
|
else is treated as a target so `/sessions <id-or-title>` can delegate to
|
|
`/resume`.
|
|
"""
|
|
import shlex
|
|
|
|
parts = shlex.split(raw_args or "")
|
|
include_all = False
|
|
include_unnamed = False
|
|
target_parts: list[str] = []
|
|
for i, part in enumerate(parts):
|
|
lower = part.strip().lower()
|
|
if not target_parts:
|
|
if lower in {"list", "ls", "browse"}:
|
|
continue
|
|
if lower in {"all", "--all"}:
|
|
include_all = True
|
|
continue
|
|
if lower in {"full", "--full"}:
|
|
include_unnamed = True
|
|
continue
|
|
if lower in {"search", "find"}:
|
|
query = " ".join(parts[i + 1:]).strip()
|
|
return include_all, include_unnamed, "", query
|
|
target_parts.append(part)
|
|
return include_all, include_unnamed, " ".join(target_parts).strip(), None
|
|
|
|
|
|
def query_session_listing(
|
|
session_db: Any,
|
|
*,
|
|
source: str | None,
|
|
current_session_id: str | None = None,
|
|
include_all_sources: bool = False,
|
|
include_unnamed: bool = False,
|
|
search_query: str | None = None,
|
|
limit: int = 10,
|
|
exclude_sources: list[str] | None = None,
|
|
) -> list[dict[str, Any]]:
|
|
"""Return session rows for interactive listing surfaces.
|
|
|
|
This is the shared selection policy behind CLI/gateway session browsing:
|
|
source-scoped by default, optionally global, hide unnamed sessions unless
|
|
the caller asks for a full listing, and never include the current session.
|
|
With ``search_query``, rows are filtered by title/id match (SQL-level, see
|
|
``SessionDB.list_sessions_rich``) and ordered by most-recent activity;
|
|
unnamed sessions stay visible since an id match may be the only handle.
|
|
"""
|
|
query_source = None if include_all_sources else source
|
|
fetch_limit = max(limit * 4, limit)
|
|
search = (search_query or "").strip()
|
|
rows = session_db.list_sessions_rich(
|
|
source=query_source,
|
|
exclude_sources=exclude_sources,
|
|
limit=fetch_limit,
|
|
search_query=search or None,
|
|
order_by_last_active=bool(search),
|
|
)
|
|
result: list[dict[str, Any]] = []
|
|
for row in rows:
|
|
if current_session_id and row.get("id") == current_session_id:
|
|
continue
|
|
if not include_unnamed and not row.get("title") and not search:
|
|
continue
|
|
result.append(row)
|
|
if len(result) >= limit:
|
|
break
|
|
return result
|
|
|
|
|
|
def format_gateway_session_listing(
|
|
rows: list[dict[str, Any]],
|
|
*,
|
|
include_source: bool = False,
|
|
title: str = "Sessions",
|
|
) -> str:
|
|
"""Render a compact Markdown-ish session list for gateway messengers."""
|
|
if not rows:
|
|
return (
|
|
"No sessions found.\n"
|
|
"Use `/title My Session` to name this chat, or `/sessions full` "
|
|
"to include unnamed sessions."
|
|
)
|
|
|
|
lines = [f"📋 **{title}**", ""]
|
|
for idx, row in enumerate(rows, start=1):
|
|
session_id = str(row.get("id") or "")
|
|
title_text = str(row.get("title") or "—")
|
|
preview = str(row.get("preview") or "")[:40]
|
|
source = str(row.get("source") or "")
|
|
source_part = f" `{source}`" if include_source and source else ""
|
|
preview_part = f" — _{preview}_" if preview else ""
|
|
lines.append(f"{idx}. **{title_text}**{source_part} — `{session_id}`{preview_part}")
|
|
lines.append("")
|
|
lines.append("Resume: `/resume <session id>` or `/resume <number>` from `/resume`.")
|
|
lines.append("More: `/sessions all`, `/sessions full`, `/sessions search <query>`.")
|
|
return "\n".join(lines)
|