ouyangbo/hermes-agent
1
0
Fork 0
Code Issues Pull Requests Actions 9 Packages Projects Releases Wiki Activity

refactor(cli): join short multi-line calls (AST-identical)

Browse Source
This commit is contained in:
Teknium
2026-09-02 19:07:38 -07:00
parent 5def9faff0
commit 4e816f16c1
2 changed files with 22 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli.py
+15 -53
View File
@@ -452,9 +452,7 @@ def _mirror_config_to_env(defaults, _file_has_terminal_config):
if "cjk_fts" in sessions_config:
os.environ["HERMES_CJK_FTS"] = str(sessions_config["cjk_fts"])
if "search_slow_ms" in sessions_config:
os.environ["HERMES_SEARCH_SLOW_MS"] = str(
sessions_config["search_slow_ms"]
)
os.environ["HERMES_SEARCH_SLOW_MS"] = str(sessions_config["search_slow_ms"])
def _cli_config_defaults():
@@ -823,22 +821,13 @@ def _prepare_deferred_agent_startup() -> None:
discover_plugins()
except Exception:
logger.warning(
"plugin discovery failed at deferred CLI startup",
exc_info=True,
)
logger.warning("plugin discovery failed at deferred CLI startup", exc_info=True)
try:
from hermes_cli.mcp_startup import start_background_mcp_discovery
start_background_mcp_discovery(
logger=logger,
thread_name="termux-cli-mcp-discovery",
)
start_background_mcp_discovery(logger=logger, thread_name="termux-cli-mcp-discovery")
except Exception:
logger.debug(
"MCP tool discovery failed at deferred CLI startup",
exc_info=True,
)
logger.debug("MCP tool discovery failed at deferred CLI startup", exc_info=True)
try:
from agent.shell_hooks import register_from_config
from hermes_cli.config import load_config
@@ -852,10 +841,7 @@ def _prepare_deferred_agent_startup() -> None:
register_outbound_webhooks(_hooks_cfg)
except Exception:
logger.debug(
"shell-hook registration failed at deferred CLI startup",
exc_info=True,
)
logger.debug("shell-hook registration failed at deferred CLI startup", exc_info=True)
def _exit_watchdog_timeout() -> float:
@@ -914,9 +900,7 @@ def _arm_exit_watchdog(timeout_s: float | None = None, *, from_signal: bool = Fa
os._exit(0)
try:
threading.Thread(
target=_watchdog, daemon=True, name="exit-watchdog"
).start()
threading.Thread(target=_watchdog, daemon=True, name="exit-watchdog").start()
except Exception:
pass # best-effort — never block shutdown on watchdog setup
@@ -1074,11 +1058,7 @@ def _notify_session_finalize(
) -> None:
try:
from hermes_cli.lifecycle import finalize_session
finalize_session(
session_id=session_id,
platform=platform,
reason=reason,
)
finalize_session(session_id=session_id, platform=platform, reason=reason)
except Exception:
pass
@@ -1163,9 +1143,7 @@ def _flush_one_shot_session_store(cli) -> None:
try:
msgs = getattr(agent, "_session_messages", None)
if isinstance(msgs, list) and msgs and hasattr(agent, "_persist_session"):
agent._persist_session(
msgs, getattr(cli, "conversation_history", None)
)
agent._persist_session(msgs, getattr(cli, "conversation_history", None))
except Exception:
logger.debug("one-shot final session persist retry failed", exc_info=True)
db = getattr(agent, "_session_db", None) or getattr(cli, "_session_db", None)
@@ -1369,9 +1347,7 @@ def _run_state_db_auto_maintenance(session_db) -> None:
finalized = session_db.finalize_orphaned_compression_sessions()
session_db.set_meta("orphaned_compression_finalize_v1", "1")
if finalized:
logger.info(
"Finalized %d orphaned compression sessions", finalized
)
logger.info("Finalized %d orphaned compression sessions", finalized)
except Exception as _finalize_exc:
logger.debug("Orphan compression finalize skipped: %s", _finalize_exc)
@@ -1590,9 +1566,7 @@ def _heal_cooked_mode_drift(fd: int) -> bool:
return False # still raw — nothing to do
# Same surgery as raw_mode._patch_lflag / _patch_iflag on the *current* attrs so
# user settings are preserved.
attrs[3] = lflag & ~(
termios.ECHO | termios.ICANON | termios.IEXTEN | termios.ISIG
)
attrs[3] = lflag & ~(termios.ECHO | termios.ICANON | termios.IEXTEN | termios.ISIG)
attrs[0] = attrs[0] & ~(
termios.IXON
| termios.IXOFF
@@ -1825,9 +1799,7 @@ def _strip_markdown_syntax(text: str) -> str:
return plain.strip("\n")
_WINDOWS_PATH_WITH_DOT_SEGMENT_RE = re.compile(
r"(?i)(?:\b[a-z]:\\|\\\\)[^\s`]*\\\.[^\s`]*"
)
_WINDOWS_PATH_WITH_DOT_SEGMENT_RE = re.compile(r"(?i)(?:\b[a-z]:\\|\\\\)[^\s`]*\\\.[^\s`]*")
def _preserve_windows_dot_segments_for_markdown(text: str) -> str:
@@ -1868,9 +1840,7 @@ def _render_final_assistant_content(text: str, mode: str = "render"):
normalized_mode = str(mode or "render").strip().lower()
if normalized_mode == "strip":
# Strip first (inline markdown changes cell width), then re-align padding.
return _RichText(
realign_markdown_tables(_strip_markdown_syntax(text), panel_width)
)
return _RichText(realign_markdown_tables(_strip_markdown_syntax(text), panel_width))
if normalized_mode == "raw":
return _rich_text_from_ansi(text or "")
@@ -2313,10 +2283,7 @@ def _format_image_attachment_badges(attached_images: list[Path], image_counter:
return f"[📎 {first}] [+{extra}]"
base = image_counter - len(attached_images) + 1
return " ".join(
f"[📎 Image #{base + i}]"
for i in range(len(attached_images))
)
return " ".join(f"[📎 Image #{base + i}]" for i in range(len(attached_images)))
def _should_auto_attach_clipboard_image_on_paste(pasted_text: str) -> bool:
@@ -2409,9 +2376,7 @@ def _apply_bracketed_paste_timeout_patch() -> None:
_PtKeyPress(_PtKeys.BracketedPaste, paste_content)
)
self_parser._in_bracketed_paste = False
remaining = self_parser._paste_buffer[
end_index + len(end_mark):
]
remaining = self_parser._paste_buffer[end_index + len(end_mark):]
self_parser._paste_buffer = ""
self_parser._hermes_bp_start = None
if remaining:
@@ -2781,10 +2746,7 @@ def _status_bar_visible_from_display_config(display_config: object) -> bool:
"""
if not isinstance(display_config, dict):
display_config = {}
statusbar_config = display_config.get(
"statusbar",
display_config.get("tui_statusbar", "top"),
)
statusbar_config = display_config.get("statusbar", display_config.get("tui_statusbar", "top"))
if isinstance(statusbar_config, str):
return statusbar_config.strip().lower() not in {"0", "false", "hidden", "no", "off"}
return statusbar_config is not False
hermes_cli/worktree_ops.py
+7 -20
View File
@@ -395,8 +395,7 @@ def _setup_worktree(repo_root: str = None, sync_base: bool = True,
wt_path = worktrees_dir / wt_name
if name and wt_path.exists():
_cprint(f"\033[31m✗ Worktree already exists: {wt_path}\033[0m")
print(" Pick a different name, or remove it with: "
f"git worktree remove {wt_path}")
print(f" Pick a different name, or remove it with: git worktree remove {wt_path}")
return None
_ensure_worktrees_gitignored(repo_root)
@@ -536,9 +535,7 @@ def _worktree_merge_cache_path() -> Path:
def _load_worktree_merge_cache() -> Dict[str, bool]:
"""Load the ``git cherry`` verdict cache. Missing/corrupt cache = empty."""
try:
raw = json.loads(
_worktree_merge_cache_path().read_text(encoding="utf-8")
)
raw = json.loads(_worktree_merge_cache_path().read_text(encoding="utf-8"))
except Exception:
return {}
if not isinstance(raw, dict):
@@ -560,10 +557,7 @@ def _save_worktree_merge_cache(verdicts: Dict[str, bool]) -> None:
items = items[-_WORKTREE_MERGE_CACHE_MAX:]
path.parent.mkdir(parents=True, exist_ok=True)
tmp = path.with_suffix(f".{os.getpid()}.tmp")
tmp.write_text(
json.dumps({"version": 1, "verdicts": dict(items)}),
encoding="utf-8",
)
tmp.write_text(json.dumps({"version": 1, "verdicts": dict(items)}), encoding="utf-8")
os.replace(str(tmp), str(path))
except Exception as e:
logger.debug("Could not persist worktree merge cache: %s", e)
@@ -833,9 +827,7 @@ def _classify_prune_candidates(repo_root: str, candidates: list) -> list:
def _get_remote_heads():
with _remote_heads_lock:
if "heads" not in _remote_heads_memo:
_remote_heads_memo["heads"] = _fetch_remote_branch_heads(
repo_root, timeout=10
)
_remote_heads_memo["heads"] = _fetch_remote_branch_heads(repo_root, timeout=10)
return _remote_heads_memo["heads"]
def _classify(item):
@@ -848,14 +840,10 @@ def _classify_prune_candidates(repo_root: str, candidates: list) -> list:
# Squash-merge escape hatch: patch-equivalent commits are merged, not unpushed.
with cache_lock:
snapshot = dict(merge_cache)
merged = _worktree_commits_all_merged_upstream(
str(entry), timeout=30, cache=snapshot
)
merged = _worktree_commits_all_merged_upstream(str(entry), timeout=30, cache=snapshot)
if not merged:
# Rebase-merge escape hatch: cherry misses changed patch-ids, GitHub knows.
merged = _worktree_branch_pr_merged(
str(entry), timeout=15, cache=snapshot
)
merged = _worktree_branch_pr_merged(str(entry), timeout=15, cache=snapshot)
with cache_lock:
merge_cache.update(snapshot)
if not merged:
@@ -870,8 +858,7 @@ def _classify_prune_candidates(repo_root: str, candidates: list) -> list:
lock_state = _worktree_lock_is_live(repo_root, str(entry), timeout=5)
if lock_state == "live":
return (entry, mtime, force, "locked-live", None)
return (entry, mtime, force,
"reap-keep-branch" if keep_branch else "reap", lock_state)
return (entry, mtime, force, "reap-keep-branch" if keep_branch else "reap", lock_state)
# Enough workers to hide git's per-process startup latency without dozens of gits.
workers = max(1, min(8, (os.cpu_count() or 4), len(candidates)))