GodopuandClaude Opus 5
78cb9ecfa9
Adds the python side of the delegation helpers and switches lib.sh over to it.
daemon.py port of start_watchdog. Same monitor path, same pgrep pattern, so
a daemon started by either implementation is found by the other;
same stderr wording and exit 1 when reconcile.sh is missing; same
"print the PID" contract, multiple pgrep matches included, since
the shell echoed them all and trimming would be a silent change.
start_new_session detaches it, and SIGHUP is ignored across the
exec so it outlives its parent exactly as nohup did.
cli.py thin router. submit/publish forward to the existing main() of the
module that already owned the behaviour, so exit codes, stdout
shape and side effects cannot drift between the shell path and
the script path. Only ensure-daemon carries logic of its own.
service.py DelegationService facade, with an optional persistent connection
for the phase 2a engine. CLI and shell always use one-shot.
lib.sh keeps the three legacy bodies verbatim as _*_legacy behind
MAM_DELEGATION_PY=0, which is the instant rollback switch. PYTHONPATH is passed
explicitly so `-m` resolves lib_py from the tree this lib.sh belongs to, which
is what makes a frozen loop run frozen delegation code. start_watchdog survives
as an alias for ensure_subscriber_daemon.
The wrapper and run_loop.sh are untouched; reconcile.sh gains only the
ensure_env_loaded line from the previous commit.
Verified: C-01..C-09 pass against both the legacy and the python bodies, the
daemon dedups and survives its parent, the cli reproduces the legacy failure
line exactly, and publish failure semantics (status synced, seq consumed,
audit records published=false) are identical through the shim and the cli.
tier1+tier2 109 passed; bash -n clean on all six shell files.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UrDNJkHmm18uu7n7JwV5Qd
91 lines
3.4 KiB
Python
91 lines
3.4 KiB
Python
"""`python -m lib_py.delegation.cli` — the router the shell helpers call.
|
|
|
|
Deliberately thin: every subcommand delegates to the existing `main()` of the
|
|
module that already owned that behaviour, so exit codes, stdout shape and side
|
|
effects cannot drift between the shell path and the script path. The one piece
|
|
of real logic here is `ensure-daemon`, which reproduces the shell helper's
|
|
stderr wording and exit status for a missing monitor script.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import argparse
|
|
import logging
|
|
import sys
|
|
from typing import List, Optional
|
|
|
|
from lib_py.delegation import daemon, mqtt_common, publish_event, registry
|
|
|
|
logger = logging.getLogger("delegate_job.cli")
|
|
|
|
|
|
def _build_parser() -> argparse.ArgumentParser:
|
|
parser = argparse.ArgumentParser(
|
|
prog="lib_py.delegation.cli",
|
|
description="delegation helpers invoked by lib.sh",
|
|
)
|
|
sub = parser.add_subparsers(dest="command", required=True)
|
|
|
|
p_submit = sub.add_parser("submit", help="register a job; prints the job id")
|
|
p_submit.add_argument("--prompt", required=True)
|
|
p_submit.add_argument("--agent", default="claude-code")
|
|
p_submit.add_argument("--agent-session", default="herdr:claude")
|
|
p_submit.add_argument("--registry-dir", default=None)
|
|
|
|
p_pub = sub.add_parser("publish", help="publish a job lifecycle event")
|
|
p_pub.add_argument("--job", required=True)
|
|
p_pub.add_argument("--event", default="progress", choices=publish_event.VALID_EVENTS)
|
|
p_pub.add_argument("--detail", default="")
|
|
p_pub.add_argument("--data", default=None)
|
|
p_pub.add_argument("--retained", action="store_true")
|
|
p_pub.add_argument("--registry-dir", default=None)
|
|
p_pub.add_argument("--attempts", type=int, default=3)
|
|
p_pub.add_argument("-v", "--verbose", action="store_true")
|
|
|
|
p_daemon = sub.add_parser("ensure-daemon", help="start the subscriber daemon if absent")
|
|
p_daemon.add_argument("--job", required=True)
|
|
p_daemon.add_argument("--workdir", default=None)
|
|
|
|
return parser
|
|
|
|
|
|
def main(argv: Optional[List[str]] = None) -> int:
|
|
mqtt_common.ensure_env_loaded()
|
|
args = _build_parser().parse_args(argv)
|
|
|
|
if args.command == "submit":
|
|
forward = ["register", "--prompt", args.prompt,
|
|
"--agent", args.agent, "--agent-session", args.agent_session]
|
|
if args.registry_dir:
|
|
forward = ["--registry-dir", args.registry_dir] + forward
|
|
return registry.main(forward)
|
|
|
|
if args.command == "publish":
|
|
forward = ["--job", args.job, "--event", args.event,
|
|
"--detail", args.detail, "--attempts", str(args.attempts)]
|
|
if args.data is not None:
|
|
forward += ["--data", args.data]
|
|
if args.retained:
|
|
forward += ["--retained"]
|
|
if args.registry_dir:
|
|
forward += ["--registry-dir", args.registry_dir]
|
|
if args.verbose:
|
|
forward += ["--verbose"]
|
|
return publish_event.main(forward)
|
|
|
|
if args.command == "ensure-daemon":
|
|
try:
|
|
pids = daemon.ensure_subscriber_daemon(args.job, args.workdir)
|
|
except FileNotFoundError as exc:
|
|
# Byte-identical to the legacy shell helper's failure path.
|
|
print("ERROR: monitor script not found: {}".format(exc.args[0]), file=sys.stderr)
|
|
return 1
|
|
for pid in pids:
|
|
print(pid)
|
|
return 0
|
|
|
|
return 1
|
|
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(main())
|