The plugin now registers a pre_tool_call hook, but plugin.yaml still listed only post_tool_call/on_session_end, so `plugin doctor` warned "registration adds hook 'pre_tool_call' not listed in provides_hooks" and catalog/capability listings under-reported what the plugin hooks. Also: README notes calls without a tool_call_id (execute_code RPC) are not tracked; a single _owner() helper keys both _pre_call and _recent_test_tracks so the two can't drift; drop the unused `result` parameter from the post hook (still absorbed by **_); trim the _pre_call comment.
237 lines
10 KiB
Python
237 lines
10 KiB
Python
"""disk-cleanup plugin — auto-cleanup of ephemeral Hermes session files.
|
|
|
|
``pre_tool_call`` + ``post_tool_call`` silently track test/temp paths CREATED by write_file/patch/terminal;
|
|
``on_session_end`` runs :func:`disk_cleanup.quick` when any test file was tracked this turn;
|
|
``/disk-cleanup`` exposes status / dry-run / quick / deep / track / forget.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import os
|
|
import re
|
|
import shlex
|
|
import threading
|
|
import time
|
|
from pathlib import Path
|
|
from typing import Any, Callable, Dict, FrozenSet, List, Optional, Set, Tuple
|
|
|
|
from . import disk_cleanup as dg
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
# Test files newly tracked this turn, keyed by task_id (or session_id) so on_session_end can
|
|
# decide whether to run cleanup. Locked: post_tool_call fires concurrently on parallel calls.
|
|
_recent_test_tracks: Dict[str, Set[str]] = {}
|
|
_lock = threading.Lock()
|
|
|
|
|
|
def _extract_path_arg(args: Dict[str, Any]) -> Set[str]:
|
|
"""write_file/patch: the single ``path`` arg."""
|
|
path = args.get("path")
|
|
return {path} if isinstance(path, str) and path else set()
|
|
|
|
|
|
def _extract_paths_from_terminal(args: Dict[str, Any]) -> Set[str]:
|
|
"""Candidate paths named in a terminal command; guess_category/is_safe_path filter later."""
|
|
paths: Set[str] = set()
|
|
cmd = args.get("command") or ""
|
|
if isinstance(cmd, str) and cmd:
|
|
# Tokenise the command — catches `touch /tmp/hermes-x/test_foo.py`.
|
|
# ``posix`` follows the host so Windows backslash paths survive
|
|
# (``shlex.split(posix=True)`` would eat them as escapes).
|
|
# Non-posix mode keeps quote characters in tokens, so strip a fully
|
|
# wrapping pair (`"C:\file"` → `C:\file`) before matching.
|
|
try:
|
|
for tok in shlex.split(cmd, posix=os.name == "posix"):
|
|
if len(tok) >= 2 and tok[0] == tok[-1] and tok[0] in ("'", '"'):
|
|
tok = tok[1:-1]
|
|
if tok.startswith(("/", "~")) or re.match(r"^[A-Za-z]:[\\/]", tok):
|
|
paths.add(tok)
|
|
except ValueError:
|
|
pass
|
|
return paths
|
|
|
|
|
|
_PATH_EXTRACTORS: Dict[str, Callable[[Dict[str, Any]], Set[str]]] = {
|
|
"write_file": _extract_path_arg,
|
|
"patch": _extract_path_arg,
|
|
"terminal": _extract_paths_from_terminal}
|
|
|
|
|
|
# (owner, tool_call_id) -> (snapshot time, argument paths absent before the call). Post tracks only
|
|
# these, so pre-existing files and paths swapped in after the snapshot (another hook's modify) fail closed.
|
|
_pre_call: Dict[Tuple[str, str], Tuple[float, FrozenSet[str]]] = {}
|
|
_PRE_CALL_TTL_S = 3600.0 # a call whose post hook never fires (blocked) must not leak its entry
|
|
|
|
|
|
def _owner(task_id: str, session_id: str) -> str:
|
|
return task_id or session_id or "default"
|
|
|
|
|
|
def _pre_call_key(task_id: str, session_id: str, tool_call_id: str) -> Tuple[str, str]:
|
|
# tool_call_id alone is not unique (llama.cpp sends one constant id), so scope it by owner.
|
|
return (_owner(task_id, session_id), tool_call_id)
|
|
|
|
|
|
def _on_pre_tool_call(tool_name: str = "", args: Optional[Dict[str, Any]] = None, task_id: str = "",
|
|
session_id: str = "", tool_call_id: str = "", **_: Any) -> None:
|
|
"""Snapshot which argument paths are absent before the call. Never raises: pre_tool_call hooks
|
|
fail CLOSED (a raise would block the tool), so an error records no absent path."""
|
|
extractor = _PATH_EXTRACTORS.get(tool_name)
|
|
if not tool_call_id or extractor is None or not isinstance(args, dict):
|
|
return None
|
|
now = time.time()
|
|
try:
|
|
absent = frozenset(str(p) for p in (Path(s).expanduser() for s in extractor(args)) if not p.exists())
|
|
except Exception:
|
|
absent = frozenset()
|
|
with _lock:
|
|
for key in [k for k, (taken, _a) in _pre_call.items() if now - taken > _PRE_CALL_TTL_S]:
|
|
del _pre_call[key]
|
|
_pre_call[_pre_call_key(task_id, session_id, tool_call_id)] = (now, absent)
|
|
return None
|
|
|
|
|
|
def _on_post_tool_call(tool_name: str = "", args: Optional[Dict[str, Any]] = None,
|
|
task_id: str = "", session_id: str = "", tool_call_id: str = "", **_: Any) -> None:
|
|
"""Auto-track ephemeral files THIS call created: a path from the call's final arguments that
|
|
this call's own pre-call snapshot saw absent and that exists now. Paths seen only in terminal
|
|
OUTPUT (a `find` or `ls` listing), or absent from the snapshot, carry no such proof and are
|
|
never tracked. Best-effort, never raises."""
|
|
extractor = _PATH_EXTRACTORS.get(tool_name)
|
|
if not isinstance(args, dict) or extractor is None or not tool_call_id:
|
|
return
|
|
with _lock:
|
|
absent = _pre_call.pop(_pre_call_key(task_id, session_id, tool_call_id), (0.0, frozenset()))[1]
|
|
if not absent:
|
|
return
|
|
for path_str in extractor(args):
|
|
try:
|
|
p = Path(path_str).expanduser()
|
|
created = str(p) in absent and p.exists()
|
|
except Exception:
|
|
continue
|
|
category = dg.guess_category(p) if created else None
|
|
if category is not None and dg.track(str(p), category, silent=True) and category == "test":
|
|
with _lock:
|
|
_recent_test_tracks.setdefault(_owner(task_id, session_id), set()).add(str(p))
|
|
|
|
|
|
def _on_session_end(
|
|
session_id: str = "", completed: bool = True, interrupted: bool = False, **_: Any) -> None:
|
|
"""Run quick cleanup if any test files were tracked during this turn."""
|
|
# Drain the session bucket plus every task-scoped bucket (subagents record into their own).
|
|
with _lock:
|
|
had_tracks = bool(_recent_test_tracks.pop(session_id or "default", None) or _recent_test_tracks)
|
|
_recent_test_tracks.clear()
|
|
if not had_tracks:
|
|
return
|
|
try:
|
|
summary = dg.quick()
|
|
except Exception as exc:
|
|
logger.debug("disk-cleanup quick cleanup failed: %s", exc)
|
|
return
|
|
if summary["deleted"] or summary["empty_dirs"]:
|
|
dg._log(f"AUTO_QUICK (session_end): deleted={summary['deleted']} "
|
|
f"dirs={summary['empty_dirs']} freed={dg.fmt_size(summary['freed'])}")
|
|
|
|
|
|
_HELP_TEXT = """\
|
|
/disk-cleanup — ephemeral-file cleanup
|
|
|
|
Subcommands:
|
|
status Per-category breakdown + top-10 largest
|
|
dry-run Preview what quick/deep would delete
|
|
quick Run safe cleanup now (no prompts)
|
|
deep Run quick, then list items that need prompts
|
|
track <path> <category> Manually add a path to tracking
|
|
forget <path> Stop tracking a path (does not delete)
|
|
|
|
Categories: temp | test | research | download | chrome-profile | cron-output | other
|
|
|
|
All operations are scoped to HERMES_HOME and /tmp/hermes-*. # no-tmp: ok — legacy scratch scope this plugin cleans up
|
|
Test files are auto-tracked on write_file / terminal and auto-cleaned at session end.
|
|
"""
|
|
|
|
|
|
def _fmt_summary(summary: Dict[str, Any]) -> str:
|
|
base = (f"[disk-cleanup] Cleaned {summary['deleted']} files + "
|
|
f"{summary['empty_dirs']} empty dirs, freed {dg.fmt_size(summary['freed'])}.")
|
|
if summary.get("errors"):
|
|
base += f"\n {len(summary['errors'])} error(s); see cleanup.log."
|
|
return base
|
|
|
|
|
|
def _item_block(header: str, items: List[Dict], indent: str) -> List[str]:
|
|
"""``header`` formatted with ``{n}`` / ``{size}``, followed by one line per item."""
|
|
size = dg.fmt_size(sum(i["size"] for i in items))
|
|
return [header.format(n=len(items), size=size)] + [f"{indent}[{item['category']}] {item['path']}" for item in items]
|
|
|
|
|
|
def _cmd_dry_run(argv: List[str]) -> str:
|
|
auto, prompt = dg.dry_run()
|
|
lines = ["Dry-run preview (nothing deleted):"]
|
|
lines += _item_block(" Auto-delete : {n} files ({size})", auto, " ")
|
|
lines += _item_block(" Needs prompt: {n} files ({size})", prompt, " ")
|
|
lines.append(f"\n Total potential: {dg.fmt_size(sum(i['size'] for i in auto + prompt))}")
|
|
return "\n".join(lines)
|
|
|
|
|
|
def _cmd_deep(argv: List[str]) -> str:
|
|
# In-session deep can't prompt — show what quick cleaned plus items needing confirmation.
|
|
quick_summary = dg.quick()
|
|
_auto, prompt_items = dg.dry_run()
|
|
lines = [_fmt_summary(quick_summary)]
|
|
if prompt_items:
|
|
lines += _item_block("\n{n} item(s) need confirmation ({size}):", prompt_items, " ")
|
|
lines.append("\nRun `/disk-cleanup forget <path>` to skip, or delete manually via terminal.")
|
|
return "\n".join(lines)
|
|
|
|
|
|
def _cmd_track(argv: List[str]) -> str:
|
|
if len(argv) < 3:
|
|
return "Usage: /disk-cleanup track <path> <category>"
|
|
path_arg, category = argv[1], argv[2]
|
|
if category not in dg.ALLOWED_CATEGORIES:
|
|
return f"Unknown category '{category}'. Allowed: {sorted(dg.ALLOWED_CATEGORIES)}"
|
|
if dg.track(path_arg, category, silent=True):
|
|
return f"Tracked {path_arg} as '{category}'."
|
|
return f"Not tracked (already present, missing, or outside HERMES_HOME): {path_arg}"
|
|
|
|
|
|
def _cmd_forget(argv: List[str]) -> str:
|
|
if len(argv) < 2:
|
|
return "Usage: /disk-cleanup forget <path>"
|
|
n = dg.forget(argv[1])
|
|
return (f"Removed {n} tracking entr{'y' if n == 1 else 'ies'} for {argv[1]}." if n
|
|
else f"Not found in tracking: {argv[1]}")
|
|
|
|
|
|
_SUBCOMMANDS: Dict[str, Callable[[List[str]], str]] = {
|
|
"status": lambda argv: dg.format_status(dg.status()),
|
|
"dry-run": _cmd_dry_run,
|
|
"quick": lambda argv: _fmt_summary(dg.quick()),
|
|
"deep": _cmd_deep,
|
|
"track": _cmd_track,
|
|
"forget": _cmd_forget}
|
|
|
|
|
|
def _handle_slash(raw_args: str) -> Optional[str]:
|
|
argv = raw_args.strip().split()
|
|
if not argv or argv[0] in {"help", "-h", "--help"}:
|
|
return _HELP_TEXT
|
|
handler = _SUBCOMMANDS.get(argv[0])
|
|
if handler is None:
|
|
return f"Unknown subcommand: {argv[0]}\n\n{_HELP_TEXT}"
|
|
return handler(argv)
|
|
|
|
|
|
def register(ctx) -> None:
|
|
ctx.register_hook("pre_tool_call", _on_pre_tool_call)
|
|
ctx.register_hook("post_tool_call", _on_post_tool_call)
|
|
ctx.register_hook("on_session_end", _on_session_end)
|
|
ctx.register_command("disk-cleanup", handler=_handle_slash,
|
|
description="Track and clean up ephemeral Hermes session files.")
|