`45f30cf`

refactor(harvest): rename revert_last_harvest → revert_all_auto_harvests to match behavior

Authored by

espadonne 3 weeks ago

Status	File	+	-
M	`src/dlm/cli/commands.py`	4	4
M	`src/dlm/harvest/__init__.py`	3	3
M	`src/dlm/harvest/applier.py`	10	6
M	`tests/unit/cli/test_harvest_cmd.py`	2	1
M	`tests/unit/harvest/test_applier.py`	3	3

src/dlm/cli/commands.pymodified

          build_plan,
          read_sway_report,
          render_plan,
 -        revert_last_harvest,
 +        revert_all_auto_harvests,
+     )
      console = Console(stderr=True)
          raise typer.Exit(code=1) from exc
      if revert:
 -        summary = revert_last_harvest(parsed, target=path)
 +        summary = revert_all_auto_harvests(parsed, target=path)
          out_console.print(
 -            f"[green]harvest:[/green] reverted {len(summary.added_section_ids)} "
 -            f"auto-harvested section(s) from {path}"
 +            f"[green]harvest:[/green] stripped {len(summary.added_section_ids)} "
 +            f"auto-harvested section(s) from {path} (all harvest runs, not just last)"
+         )
          return

src/dlm/harvest/__init__.pymodified

  - :func:`build_plan` / :class:`HarvestPlan` — dedup candidates
    against the current document, materialize Sections.
  - :func:`render_plan` — plain-text diff for ``--dry-run``.
 -- :func:`apply_plan` / :func:`revert_last_harvest` — commit the
 +- :func:`apply_plan` / :func:`revert_all_auto_harvests` — commit the
    plan to disk (or strip auto-harvested sections on revert).
  """
  from __future__ import annotations
 -from dlm.harvest.applier import HarvestSummary, apply_plan, revert_last_harvest
 +from dlm.harvest.applier import HarvestSummary, apply_plan, revert_all_auto_harvests
  from dlm.harvest.diff import (
      HarvestPlan,
      PlannedAddition,
      "build_plan",
      "read_sway_report",
      "render_plan",
 -    "revert_last_harvest",
 +    "revert_all_auto_harvests",
+ ]

src/dlm/harvest/applier.pymodified

  @dataclass(frozen=True)
  class HarvestSummary:
 -    """Outcome of :func:`apply_plan` or :func:`revert_last_harvest`."""
 +    """Outcome of :func:`apply_plan` or :func:`revert_all_auto_harvests`."""
      target: Path
      added: int
+     )
 -def revert_last_harvest(parsed: ParsedDlm, *, target: Path) -> HarvestSummary:
 +def revert_all_auto_harvests(parsed: ParsedDlm, *, target: Path) -> HarvestSummary:
      """Strip every `auto_harvest=True` section and rewrite `target`.
 -    Coarser than "undo the last harvest" — any auto-harvested section
 -    is removed regardless of which harvest run added it. This matches
 -    the sprint spec's `--revert HEAD` UX: users audit the diff before
 -    applying, so "undo all auto-edits" is the safe escape hatch.
 +    Coarser than an "undo-the-most-recent-harvest" operation — any
 +    auto-harvested section is removed, regardless of which harvest run
 +    added it. We don't track per-run provenance in the section tags, so
 +    fine-grained per-harvest rollback isn't possible without schema
 +    work. "Undo all auto-edits" is the safe escape hatch users reach
 +    for after reviewing a diff anyway; if fine-grained rollback becomes
 +    a real need, a follow-up adds a run_id tag and a
 +    `revert_by_run(run_id)` sibling.
      """
      survivors = tuple(s for s in parsed.sections if not s.auto_harvest)
      removed_ids = tuple(s.section_id for s in parsed.sections if s.auto_harvest)

tests/unit/cli/test_harvest_cmd.pymodified

          # Then revert
          result = runner.invoke(app, ["--home", str(tmp_path), "harvest", str(doc), "--revert"])
          assert result.exit_code == 0, result.output
 -        assert "reverted 1" in result.output
 +        assert "stripped 1" in result.output
 +        assert "all harvest runs" in result.output
          from dlm.doc.parser import parse_file

tests/unit/harvest/test_applier.pymodified

      HarvestCandidate,
      apply_plan,
      build_plan,
 -    revert_last_harvest,
 +    revert_all_auto_harvests,
+ )
  _FRONTMATTER = """---
          # Now revert
          parsed_with_harvest = parse_file(target)
          assert any(s.auto_harvest for s in parsed_with_harvest.sections)
 -        summary = revert_last_harvest(parsed_with_harvest, target=target)
 +        summary = revert_all_auto_harvests(parsed_with_harvest, target=target)
          assert summary.added == 0
          # summary.added_section_ids carries the IDs of the REMOVED sections
          target = tmp_path / "doc.dlm"
          _write_dlm(target, "## hello\n")
          parsed = parse_file(target)
 -        summary = revert_last_harvest(parsed, target=target)
 +        summary = revert_all_auto_harvests(parsed, target=target)
          assert summary.added == 0
          assert summary.added_section_ids == ()