hermes-agent/tests/gateway/test_diff_command.py
teknium1 0fa5e41c86 feat(diff): cross-surface /diff with staged/all/session modes
Widen the cherry-picked /diff base (#4839 by @SHL0MS) into one
cross-surface implementation, folding in the review feedback and the
best ideas from the two sibling PRs (#22703, #53527):

- tools/working_diff.py: shared git collection layer — unstaged
  (default), staged, and all (vs HEAD) modes; untracked files folded in
  via `git diff --no-index` so new files appear as additions (Codex
  /diff parity); shlex-split arguments preserve quoted paths.
- CLI: handler moved to hermes_cli/cli_commands_mixin.py per the
  current god-file decomposition (dispatch stays in cli.py), renders
  through the rich console with a 400-line terminal-flood guard.
- Gateway: _handle_diff_command in gateway/slash_commands.py + dispatch
  in gateway/run.py; fenced ```diff output truncated to 60 lines /
  3000 chars before the platform senders apply their own per-platform
  message clamps (tool-progress-style layered truncation). Localized
  strings in all 17 locale catalogs.
- /diff session (from #53527): cumulative checkpoint-baseline diff of
  everything Hermes changed, via new CheckpointManager.session_diff();
  docstring records the retained-baseline approximation caveat from
  review. Works on both surfaces; degrades with an actionable message
  when checkpoints are off.
- Slack: /diff routed via /hermes diff (50-slash cap; keeps
  telegram-parity test green and /version native).
- Registry: cross-surface CommandDef with staged|all|session
  subcommands; docs: slash-commands reference (CLI + gateway tables +
  both-surfaces list) and hermes-agent skill reference.
- Tests: tests/tools/test_working_diff.py (real git repos),
  tests/hermes_cli/test_diff_command.py (real git + stubbed checkpoint
  manager), tests/gateway/test_diff_command.py (end-to-end handler,
  real checkpoint store), TestSessionDiff in
  tests/tools/test_checkpoint_manager.py.

Salvaged from the /diff PR cluster #4839 + #22703 + #53527.

Co-authored-by: Ninso112 <ninso112@proton.me>
Co-authored-by: Harshkamdar67 <harshkamdar67@gmail.com>
2026-07-26 18:28:20 -07:00

180 lines
5.7 KiB
Python

"""End-to-end tests for the gateway ``/diff`` command.
Exercises the real handler against real git repositories (default modes) and
a real checkpoint store (session mode), proving the messaging surface returns
fenced, truncated diff text and degrades to friendly messages when there's
nothing to show.
"""
import shutil
import subprocess
import pytest
import gateway.run as gateway_run
import tools.checkpoint_manager as cpm
from gateway.config import Platform
from gateway.platforms.base import MessageEvent
from gateway.session import SessionSource
pytestmark = pytest.mark.skipif(
shutil.which("git") is None, reason="git required for /diff"
)
def _runner():
runner = object.__new__(gateway_run.GatewayRunner)
runner.session_store = None
runner.config = None
return runner
def _event(text: str) -> MessageEvent:
source = SessionSource(
platform=Platform.TELEGRAM,
user_id="user-1",
chat_id="chat-1",
user_name="tester",
chat_type="dm",
)
return MessageEvent(text=text, source=source)
def _git(repo, *args):
subprocess.run(["git", *args], cwd=repo, check=True, capture_output=True,
env={"GIT_AUTHOR_NAME": "t", "GIT_AUTHOR_EMAIL": "t@t",
"GIT_COMMITTER_NAME": "t", "GIT_COMMITTER_EMAIL": "t@t",
"HOME": str(repo),
"PATH": __import__("os").environ["PATH"]})
@pytest.fixture()
def repo(tmp_path, monkeypatch):
d = tmp_path / "repo"
d.mkdir()
_git(d, "init", "-q")
(d / "main.py").write_text("print('hello')\n", encoding="utf-8")
_git(d, "add", "-A")
_git(d, "commit", "-q", "-m", "init")
monkeypatch.setenv("TERMINAL_CWD", str(d))
return d
def _enable_checkpoints(tmp_path, monkeypatch, enabled=True):
home = tmp_path / "home"
home.mkdir()
(home / "config.yaml").write_text(
f"checkpoints:\n enabled: {str(enabled).lower()}\n", encoding="utf-8"
)
monkeypatch.setattr(gateway_run, "_hermes_home", home, raising=False)
monkeypatch.setattr(cpm, "CHECKPOINT_BASE", tmp_path / "checkpoints")
# ---------------------------------------------------------------------------
# Default (working-tree) mode
# ---------------------------------------------------------------------------
@pytest.mark.asyncio
async def test_diff_reports_unstaged_changes_fenced(repo):
(repo / "main.py").write_text("print('changed')\n", encoding="utf-8")
result = await _runner()._handle_diff_command(_event("/diff"))
assert "-print('hello')" in result
assert "+print('changed')" in result
assert "```diff" in result # fenced for messaging surfaces
@pytest.mark.asyncio
async def test_diff_includes_untracked_files(repo):
(repo / "newfile.py").write_text("n = 1\n", encoding="utf-8")
result = await _runner()._handle_diff_command(_event("/diff"))
assert "newfile.py" in result
assert "+n = 1" in result
@pytest.mark.asyncio
async def test_diff_stat_only_omits_body(repo):
(repo / "main.py").write_text("print('changed')\n", encoding="utf-8")
result = await _runner()._handle_diff_command(_event("/diff --stat"))
assert "main.py" in result
assert "+print('changed')" not in result
@pytest.mark.asyncio
async def test_diff_no_changes_message(repo):
result = await _runner()._handle_diff_command(_event("/diff"))
assert "No changes" in result
@pytest.mark.asyncio
async def test_diff_long_output_truncated(repo):
lines = "\n".join(f"line{i} = {i}" for i in range(300)) + "\n"
(repo / "main.py").write_text(lines, encoding="utf-8")
result = await _runner()._handle_diff_command(_event("/diff"))
# Hard-truncated in the handler before the platform senders apply their
# own message-splitting limits (3-layer tool-progress-style truncation).
assert "truncated" in result
assert len(result) < 6000
@pytest.mark.asyncio
async def test_diff_non_git_directory_fails_cleanly(tmp_path, monkeypatch):
plain = tmp_path / "plain"
plain.mkdir()
monkeypatch.setenv("TERMINAL_CWD", str(plain))
result = await _runner()._handle_diff_command(_event("/diff"))
assert "not a git repository" in result.lower()
# ---------------------------------------------------------------------------
# Session mode — checkpoint baseline
# ---------------------------------------------------------------------------
@pytest.mark.asyncio
async def test_diff_session_reports_cumulative_changes(tmp_path, monkeypatch):
_enable_checkpoints(tmp_path, monkeypatch)
project = tmp_path / "project"
project.mkdir()
(project / "main.py").write_text("print('hello')\n", encoding="utf-8")
monkeypatch.setenv("TERMINAL_CWD", str(project))
# Baseline checkpoint (pre-edit) then an edit, so a diff exists.
mgr = cpm.CheckpointManager(enabled=True, max_snapshots=50)
assert mgr.ensure_checkpoint(str(project), "baseline") is True
(project / "main.py").write_text("print('changed')\n", encoding="utf-8")
result = await _runner()._handle_diff_command(_event("/diff session"))
assert "-print('hello')" in result
assert "+print('changed')" in result
@pytest.mark.asyncio
async def test_diff_session_no_changes_message(tmp_path, monkeypatch):
_enable_checkpoints(tmp_path, monkeypatch)
project = tmp_path / "project"
project.mkdir()
monkeypatch.setenv("TERMINAL_CWD", str(project))
result = await _runner()._handle_diff_command(_event("/diff session"))
assert "No changes" in result
@pytest.mark.asyncio
async def test_diff_session_disabled_message(tmp_path, monkeypatch):
_enable_checkpoints(tmp_path, monkeypatch, enabled=False)
monkeypatch.setenv("TERMINAL_CWD", str(tmp_path))
result = await _runner()._handle_diff_command(_event("/diff session"))
assert "not enabled" in result.lower()