Files
multi-agent-mux/.agents/skills/lib_py/delegation/service.py
T
GodopuandClaude Fable 5.1 c82ea75a15 fix(issue-10,11,13,15): complete agy purge, orchestrator purge, workspace-anchored registry
Issue #10 - agy purge_artifacts left resumable pieces behind: it now also
removes the SQLite sidecars (-wal/-shm/-journal), the title annotation and
the presence lock (the lock only once no live process references the
conversation), and residual_artifacts() reports anything under
~/.gemini/antigravity-cli still carrying the uuid.

Issue #13 - the orchestrator has no herdr_sessions row, so its conversation
could not be purged by any skill. `lib_py.agents purge <agent|auto> <uuid>`
resolves the adapter from what is on disk (orchestrator_uuids stores bare
uuids), refuses while a live process names the uuid (conversation_in_use:
process list minus the caller's own lineage, plus lsof), and prints what it
purged. `orc_onboard.sh --remove <uuid> --purge-conversation --yes [--agent]`
runs it before the registry update so a refusal changes nothing (exit 4
without --yes, 5 while in use).

Issue #11 - "Successfully removeed": conjugate add/remove explicitly.

Issue #15 - the job registry and audit log followed the caller's cwd, so the
pytest suite (create_session.sh with its default onboarding job, run from the
repo root) had left 593 test records in the real .mam/jobs. Defaults now
resolve MAM_JOBS_DIR / DELEGATE_JOB_LOGS_DIR, then $WORKSPACE_ROOT/.mam/...,
then the cwd (mqtt_common.default_registry_dir / get_logs_dir; registry.py,
publish_event.py, service.py, create_session.sh, stop_session.sh); the
sandbox fixture pins both. The tier suites that used to leak now leave the
real registry untouched (881 records before and after).

Tests: test_issue10_13_purge.py (13), test_issue15_registry_isolation.py (7);
T-O13 pins the corrected message; the R1 helper test and B-9 logs-dir test
now assert the workspace-anchored contract; publish_event snapshot updated.

Refs #10 #11 #13 #15

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01VCgu9Fa9iT7TbJUSzdq4Ff
2026-09-13 08:18:56 +09:00

108 lines
4.5 KiB
Python

"""DelegationService — one façade over registering, publishing and supervising.
Phase 1 keeps every behaviour in the existing entry points; this only groups
them so a long-running caller (the phase 2a engine) has a single object to hold,
optionally with a persistent MQTT connection. CLI and shell callers always use
`persistent=False`, because a process that exits after one publish gains nothing
from connection reuse.
"""
from __future__ import annotations
import logging
from typing import Any, Dict, List, Optional
from lib_py.delegation import daemon, mqtt_common, publish_event, registry
logger = logging.getLogger("delegate_job.service")
class DelegationService(object):
def __init__(self, registry_dir=None, persistent=False):
self.registry_dir = registry_dir or mqtt_common.default_registry_dir()
self.persistent = persistent
self._publisher = None
# -- lifecycle ---------------------------------------------------------
def __enter__(self):
if self.persistent:
from lib_py.delegation.publisher import PersistentPublisher
self._publisher = PersistentPublisher()
self._publisher.open()
return self
def __exit__(self, exc_type, exc, tb):
self.close()
return False
def close(self):
if self._publisher is not None:
self._publisher.close()
self._publisher = None
# -- operations --------------------------------------------------------
def submit_job(self, prompt, agent="claude-code", agent_session="herdr:claude", **kw):
return registry.register_job(
prompt=prompt, agent=agent, agent_session=agent_session,
registry_dir=self.registry_dir, **kw
)
def publish_event(self, job_id, event, detail="", data=None, attempts=3,
expect_dispatch_token=None, attempt_id=None):
"""Publish one event. Returns the same exit status as the CLI (0 / 2 / 4)."""
eff_dispatch_token = expect_dispatch_token
eff_attempt_id = attempt_id
if data and isinstance(data, dict):
if eff_dispatch_token is None:
eff_dispatch_token = data.get("dispatch_token")
if eff_attempt_id is None:
eff_attempt_id = data.get("attempt_id")
try:
rec = self.load_job(job_id)
actual_tok = rec.get("dispatch_token")
rec_attempt = rec.get("attempt_id", rec.get("iteration", 1))
except FileNotFoundError:
rec = None
actual_tok = None
rec_attempt = 1
if rec is not None and actual_tok is not None:
if eff_dispatch_token is None and eff_attempt_id is None:
if event in ("completed", "error", "cancelled") and rec_attempt > 1:
logger.error("dispatch token required: redispatched job %s carries a dispatch token "
"but none was provided", job_id)
return 4
elif eff_dispatch_token is not None and actual_tok != eff_dispatch_token:
return 4
elif eff_attempt_id is not None and rec_attempt != eff_attempt_id:
return 4
elif eff_dispatch_token is not None and actual_tok != eff_dispatch_token:
return 4
prepared = publish_event.prepare_event(
job_id=job_id, event=event, detail=detail,
data=data, registry_dir=self.registry_dir,
dispatch_token=eff_dispatch_token, attempt_id=eff_attempt_id,
)
# Local first, as in the CLI: the event reaches events.log before the
# publish can block on the broker (see publish_event.record_local_event).
publish_event.record_local_event(prepared, self.registry_dir)
publisher = self._publisher
if publisher is None:
from lib_py.delegation.publisher import OneShotPublisher
publisher = OneShotPublisher()
ok, error = publisher.publish_with_retry(prepared, attempts=attempts)
publish_event.record_outcome(
prepared, self.registry_dir, ok, error,
expected_dispatch_token=eff_dispatch_token,
expected_attempt=eff_attempt_id,
local_event_recorded=True,
)
return 0 if ok else 2
def ensure_subscriber_daemon(self, job_id, workdir=None):
return daemon.ensure_subscriber_daemon(job_id, workdir)
def load_job(self, job_id) -> Dict[str, Any]:
return mqtt_common.load_job(job_id, self.registry_dir)