Continuing the round-3 deep-pass cleanup. Three more run-blockers
+ one robustness fix.
RB5 — MERGING handler never invoked from master loop:
``run_merging_tick`` was exported by the master package but no caller
fired it. Workflows that transition to MERGING (via reviewer
approval) would sit there indefinitely with no Forgejo merge call.
Fix:
- ``master/loop.py`` accepts a ``merging_args=(owner, repo,
merge_callback)`` kwarg. When set, the tick fires every iteration
(cheap if no workflows in MERGING).
- ``MasterTickReport`` gains ``merging: MergingHandlerReport | None``.
- ``master/__main__.py`` wires it from the Forgejo callback bundle.
RB6 — periodic discovery never fires:
``run_discovery`` was only called at startup via
``run_startup_backfill`` + the ``--discovery-only-once`` smoke flag.
PRs created after master startup would not be discovered until the
master restarted.
Fix:
- ``master/loop.py`` accepts ``discovery_args=(owner, repo, list_prs,
list_issues)`` or the 5-tuple with kwargs. Periodic tick on its
own cadence (``CONTROLLER_DISCOVERY_INTERVAL_S``, default 30s).
- ``MasterTickReport`` gains ``discovery: DiscoveryReport | None``.
- ``master/__main__.py`` wires it + threads ``require_opt_in_label``
through.
RB-robust — worker calls create_all defensively:
Master is normally responsible for schema creation (workers run
After= it via systemd ordering). But if the worker is started in
isolation (test / local dev / unit ordering broken), it'd crash on
the first query against missing tables.
Fix:
- ``worker/__main__.py`` calls ``create_all(engine)`` after
``build_engine``. ``create_all`` is idempotent (CREATE TABLE IF
NOT EXISTS); safe to call from both master + worker.
- ``cleveragents-controller-worker@.service`` adds
``After=cleveragents-controller-master.service`` +
``Wants=cleveragents-controller-master.service`` so systemd
enforces the start ordering in production.
Total: 703 controller tests pass (no test changes; all new wiring
is exercised by master_main_loop tests via the new kwargs).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
drew
251eeb21ff