agentic-runner 3.30.1__tar.gz → 3.30.3__tar.gz

{agentic_runner-3.30.1 → agentic_runner-3.30.3}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.5
 Name: agentic-runner
-Version: 3.30.1
+Version: 3.30.3
 Summary: The Agentic OS Runner: an activity-only Temporal executor for workspaces, Agent Runtimes and verb seams
 License-Expression: AGPL-3.0-only
 License-File: LICENSE
 Requires-Python: >=3.12
-Requires-Dist: agentic-runner-contracts==3.30.1
+Requires-Dist: agentic-runner-contracts==3.30.3
 Requires-Dist: cryptography<51,>=50
 Requires-Dist: httpx<1.0,>=0.27
 Requires-Dist: pydantic-settings<3.0,>=2.0

{agentic_runner-3.30.1 → agentic_runner-3.30.3}/pyproject.toml

@@ -10,7 +10,7 @@ dependencies = [
   # Exactly this release's contracts: the two ship as one version, and an unpinned
   # requirement let `uv tool upgrade` keep an older contracts wheel the Runner cannot
   # import from (QTS-1473). `scripts/set-version.py` moves it with the version.
-  "agentic-runner-contracts==3.30.1",
+  "agentic-runner-contracts==3.30.3",
   # Imported directly by `registration.py` (the Ed25519 identity that signs every
   # heartbeat); already present transitively through pyjwt[crypto], declared because
   # we import it.

{agentic_runner-3.30.1 → agentic_runner-3.30.3}/src/agentic_runner/__init__.py

@@ -7,6 +7,6 @@ stay on the platform; this package imports none of them, and a CI partition test
 (``tests/test_package_partition.py``) fails the build if that changes.
 """
 
-__version__ = "3.30.1"
+__version__ = "3.30.3"
 
 __all__ = ["__version__"]

{agentic_runner-3.30.1 → agentic_runner-3.30.3}/src/agentic_runner/workstation.py

@@ -39,7 +39,7 @@ import sys
 import tempfile
 import time
 from collections.abc import Callable, Mapping, Sequence
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from datetime import UTC, datetime
 from pathlib import Path
 from typing import Any, Final, Literal
@@ -81,6 +81,7 @@ from agentic_runner_contracts.runner_registration import (
 __all__ = [
     "CLI_FLOORS",
     "CLI_NAMES",
+    "DRAIN_TIMEOUT_SECONDS",
     "ROOT_ENV",
     "CliMissingError",
     "RunnerPaths",
@@ -111,6 +112,11 @@ __all__ = [
 ROOT_ENV: Final = "AGENTIC_RUNNER_WORKSTATION_ROOT"
 
 _LABEL_PREFIX: Final = "agentic-runner"
+# The drain waits out an in-flight Directive (issue 02), as the chart's
+# terminationGracePeriodSeconds does. Without it the service manager SIGKILLs the drain:
+# systemd after 90 s, launchd after 20 s (QTS-2166), and launchd caps it at 60 s however
+# high ExitTimeOut is set (QTS-2178), so on macOS `stop` and `restart` drain first.
+DRAIN_TIMEOUT_SECONDS: Final = 2100
 
 Run = Callable[..., subprocess.CompletedProcess[str]]
 
@@ -458,6 +464,9 @@ class ServiceDefinition:
     start: list[list[str]]
     stop: list[list[str]]
     restart: list[list[str]]
+    # Sends SIGTERM outside the service manager's own stop, which `stop` and `restart` then
+    # run only once the process has drained. Empty where that stop already waits it out.
+    drain: list[list[str]] = field(default_factory=list)
 
 
 def runner_command(name: str, root: Path) -> list[str]:
@@ -507,6 +516,7 @@ def _launch_agent(
             "RunAtLoad": True,
             # Restart a crash, not a clean `stop`: SIGTERM drains and exits 0.
             "KeepAlive": {"SuccessfulExit": False},
+            "ExitTimeOut": DRAIN_TIMEOUT_SECONDS,
             "ProcessType": "Background",
             "StandardOutPath": str(paths.log),
             "StandardErrorPath": str(paths.log),
@@ -521,6 +531,10 @@ def _launch_agent(
         # One call, not bootout then bootstrap: launchd refuses a bootstrap of a label it
         # still holds, and it holds it until the old process has drained.
         restart=[["launchctl", "kickstart", "-k", f"{domain}/{name}"]],
+        # launchd SIGKILLs a stop of its own after at most 60 s, whatever ExitTimeOut says,
+        # but leaves alone a process that exits on a signal it only forwarded (CI, QTS-2178).
+        # A clean exit is not restarted: KeepAlive above.
+        drain=[["launchctl", "kill", "SIGTERM", f"{domain}/{name}"]],
     )
 
 
@@ -544,9 +558,7 @@ def _systemd_user_unit(
         f"Environment={_systemd_quote('PATH=' + settings.path)}\n"
         "Restart=on-failure\n"
         "RestartSec=10\n"
-        # The drain waits out an in-flight Directive (issue 02); systemd's default 90 s
-        # would SIGKILL it.
-        "TimeoutStopSec=2100\n"
+        f"TimeoutStopSec={DRAIN_TIMEOUT_SECONDS}\n"
         "KillMode=mixed\n\n"
         "[Install]\n"
         "WantedBy=default.target\n"
@@ -875,7 +887,9 @@ def restart(
     """
 
     previous = process_id(paths)
-    _drive_service(paths, "restart", **driver)
+    _drive_service(paths, "restart", sleep=sleep, clock=clock, **driver)
+    # Taken after the call: the drain and then `kickstart -k`, or `systemctl restart`, return
+    # only once the old process has exited, so the drain spends none of it (QTS-2172).
     deadline = clock() + timeout
     while (pid := process_id(paths)) is None or pid == previous:
         if clock() >= deadline:
@@ -893,9 +907,17 @@ def _drive_service(
     platform: str = sys.platform,
     home: Path | None = None,
     run: Run = subprocess.run,
+    sleep: Callable[[float], None] = time.sleep,
+    clock: Callable[[], float] = time.monotonic,
 ) -> None:
     settings = WorkstationSettings.load(paths)
     definition = service_definition(paths, settings, platform=platform, home=home)
+    if verb != "start" and definition.drain and process_id(paths) is not None:
+        drive(definition.drain, run=run)
+        # Past the budget the service manager's stop below ends it, as systemd's would.
+        deadline = clock() + DRAIN_TIMEOUT_SECONDS
+        while process_id(paths) is not None and clock() < deadline:
+            sleep(1.0)
     drive(getattr(definition, verb), run=run)