alissa-tools-github-orcloop 0.18.0__tar.gz → 0.18.2__tar.gz

{alissa_tools_github_orcloop-0.18.0/src/main/alissa_tools_github_orcloop.egg-info → alissa_tools_github_orcloop-0.18.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alissa-tools-github-orcloop
-Version: 0.18.0
+Version: 0.18.2
 Summary: ALISSA-TOOLS-GITHUB-ORCLOOP
 Home-page: https://alissa.app
 Author: Fahera

{alissa_tools_github_orcloop-0.18.0 → alissa_tools_github_orcloop-0.18.2}/setup.py

@@ -56,6 +56,10 @@ setup(
     entry_points={
         "console_scripts": [
             "alissa-orcloop=alissa.tools.github.orcloop.__main__:main",
+            # The sentinel pass's bounded lever over the seats' consoles
+            # (W4, issue #112): reads the passcodes from the environment
+            # itself and never prints one.
+            "orcloop-lever=alissa.tools.github.orcloop.lever:main",
         ]
     },
     install_requires=requirements,

{alissa_tools_github_orcloop-0.18.0 → alissa_tools_github_orcloop-0.18.2}/src/main/alissa/tools/github/orcloop/__main__.py

@@ -36,8 +36,10 @@ from .alissa_client import AlissaClient, AlissaError
 from .config import (
     FEED_BOW,
     MERGE_METHODS,
+    MERGE_POLICIES,
     RELEASE_FEEDS,
     REPOS_SOURCES,
+    WATCHDOG_MODES,
     Config,
     load_config_file,
     resolve_config_path,
@@ -446,6 +448,130 @@ def build_parser() -> argparse.ArgumentParser:
         help="merge only: hold a head that reports no checks, even if the config "
         "allows it",
     )
+    # --- the merge policy (issue #116) ------------------------------------
+    over.add_argument(
+        "--merge-policy",
+        choices=MERGE_POLICIES,
+        help="merge only: strict (auto only), standard (the default: auto only, "
+        "today's edge) or yolo (also merge an `operator — <class>: …` approve "
+        "whose class is in --merge-yolo-merge-class, after posting the validation "
+        "floor on the origin task; unclassed and hold-listed classes hold)",
+    )
+    over.add_argument(
+        "--merge-yolo-merge-class",
+        dest="merge_yolo_merge_classes",
+        action="append",
+        metavar="CLASS",
+        help="merge only (yolo): an operator class the policy MERGES; repeatable, "
+        "REPLACES the default set (unverified-ux, unverified-runtime)",
+    )
+    over.add_argument(
+        "--merge-yolo-hold-class",
+        dest="merge_yolo_hold_classes",
+        action="append",
+        metavar="CLASS",
+        help="merge only (yolo): an operator class the policy HOLDS; repeatable, "
+        "REPLACES the default set (schema-migration, data-backfill, secrets-env, "
+        "infra-deploy, billing, security, release-act). A class in both lists is "
+        "a fatal startup error",
+    )
+    over.add_argument(
+        "--merge-allow-no-checks-repo",
+        dest="merge_allow_no_checks_repos",
+        action="append",
+        metavar="OWNER/REPO",
+        help="merge only: a repository whose heads may merge with no check reported "
+        "(the per-repo scope of --merge-allow-no-checks); repeatable",
+    )
+    follow_ups = over.add_mutually_exclusive_group()
+    follow_ups.add_argument(
+        "--merge-follow-ups",
+        dest="merge_follow_ups",
+        action="store_true",
+        default=None,
+        help="merge only: enumerate follow-up pull requests (`Follow-up-To: #k`) as "
+        "candidates (default: on under yolo, off otherwise)",
+    )
+    follow_ups.add_argument(
+        "--no-merge-follow-ups",
+        dest="merge_follow_ups",
+        action="store_false",
+        help="merge only: never enumerate follow-up pull requests",
+    )
+    over.add_argument(
+        "--merge-followup-candidates-per-repo",
+        type=int,
+        metavar="N",
+        help="merge only: at most N follow-up candidates per repo per poll (default 5)",
+    )
+
+    # --- the flow watchdog and the seat consoles (W4, issue #112) --------
+    over.add_argument(
+        "--seat-consoles-json",
+        metavar="JSON",
+        help="the seats' consoles, as a JSON list: [{\"seat\": \"devloop\", \"url\": "
+        "\"http://dark-devloop-shared.railway.internal:8080\", \"passcodeEnv\": "
+        "\"ALISSA_ORC_DEVLOOP_PASSCODE\"}, …] — the passcode itself comes from the "
+        "named environment variable, never from here. Prefer "
+        "ALISSA_ORC_SEAT_CONSOLES_JSON",
+    )
+    over.add_argument(
+        "--watchdog",
+        choices=WATCHDOG_MODES,
+        metavar="{" + ",".join(WATCHDOG_MODES) + "}",
+        help="the flow watchdog: 'off' reads nothing; 'observe' (the default) reads "
+        "every seat console each poll and narrates what it would pull; 'on' climbs "
+        "decline → kill → retry, one rung per poll, on sessions a seat reports "
+        "waiting past --watchdog-grace-seconds, pages account-level conditions "
+        "and holds releases into that seat's repos",
+    )
+    over.add_argument(
+        "--watchdog-grace-seconds",
+        type=int,
+        metavar="SECONDS",
+        help="watchdog only: how long a waiting session is the seat's own responder's "
+        "to answer before the orchestrator climbs a rung (default 180; >= 0)",
+    )
+    over.add_argument(
+        "--watchdog-retry-seconds",
+        type=int,
+        metavar="SECONDS",
+        help="watchdog only: after a kill, how long the lane may show no respawn "
+        "before the seat's console is asked to retry it (default 600; >= 0)",
+    )
+    over.add_argument(
+        "--watchdog-idle-minutes",
+        type=int,
+        metavar="MINUTES",
+        help="watchdog only: a live, non-waiting session idle longer than this has "
+        "its pane read; unclassified idleness is narrated and paged once, never "
+        "killed (default 45; >= 1)",
+    )
+
+    levers = over.add_mutually_exclusive_group()
+    levers.add_argument(
+        "--sentinel-levers",
+        dest="sentinel_levers",
+        action="store_true",
+        default=None,
+        help="sentinel only: let the pass pull the bounded `orcloop-lever` verbs "
+        "(pane, answer decline/escape, kill, retry) after a pane capture, at most "
+        "--sentinel-max-levers per pass, every pull listed in its findings (off by "
+        "default — with it off the directive is the report-only one, unchanged)",
+    )
+    levers.add_argument(
+        "--no-sentinel-levers",
+        dest="sentinel_levers",
+        action="store_false",
+        help="sentinel only: keep the pass report-only, even if the config enables levers",
+    )
+    over.add_argument(
+        "--sentinel-max-levers",
+        type=int,
+        metavar="N",
+        help="sentinel only: how many lever ACTIONS (decline/escape/kill/retry) one pass "
+        "may make — pane captures are not counted (default 3; >= 0)",
+    )
 
     dry = over.add_mutually_exclusive_group()
     dry.add_argument(
@@ -508,7 +634,26 @@ def overrides_from(args: argparse.Namespace) -> dict:
         "merge_hold_label": args.merge_hold_label,
         "merge_maintain_label": args.merge_maintain_label,
         "merge_allow_no_checks": args.merge_allow_no_checks,
+        "merge_policy": args.merge_policy,
+        "merge_yolo_merge_classes": (
+            tuple(args.merge_yolo_merge_classes) if args.merge_yolo_merge_classes else None
+        ),
+        "merge_yolo_hold_classes": (
+            tuple(args.merge_yolo_hold_classes) if args.merge_yolo_hold_classes else None
+        ),
+        "merge_allow_no_checks_repos": (
+            tuple(args.merge_allow_no_checks_repos) if args.merge_allow_no_checks_repos else None
+        ),
+        "merge_follow_ups": args.merge_follow_ups,
+        "merge_followup_candidates_per_repo": args.merge_followup_candidates_per_repo,
         "fleet_vitals_enabled": args.fleet_vitals_enabled,
+        "seat_consoles_json": args.seat_consoles_json,
+        "watchdog": args.watchdog,
+        "watchdog_grace_seconds": args.watchdog_grace_seconds,
+        "watchdog_retry_seconds": args.watchdog_retry_seconds,
+        "watchdog_idle_minutes": args.watchdog_idle_minutes,
+        "sentinel_levers": args.sentinel_levers,
+        "sentinel_max_levers": args.sentinel_max_levers,
     }
 
 
@@ -647,6 +792,29 @@ def log_effective_config(config: Config) -> None:
         )
     else:
         log.debug("sentinel edge: disabled")
+    if config.sentinel_enabled and config.sentinel_levers:
+        log.info(
+            "sentinel levers: ON — a pass may pull at most %d bounded `orcloop-lever` "
+            "action(s) after a pane capture (captures not counted)", config.sentinel_max_levers,
+        )
+    if config.watchdog_active:
+        # Seat names, URLs and the passcode VARIABLE names -- never a value.
+        log.info(
+            "flow watchdog: %s — seats %s; grace %ds, retry after %ds, idle floor %dmin%s",
+            config.watchdog.upper(),
+            ", ".join(
+                f"{seat.seat} ({seat.url}, passcode from {seat.passcode_env}"
+                + (f", repos {', '.join(seat.repos)}" if seat.repos else ", every repo") + ")"
+                for seat in config.seat_consoles
+            ),
+            config.watchdog_grace_seconds, config.watchdog_retry_seconds,
+            config.watchdog_idle_minutes,
+            "" if config.watchdog_pulls else " (narrating only, pulling nothing)",
+        )
+    elif config.seat_consoles:
+        log.info("flow watchdog: OFF (%d seat console(s) declared, none read)", len(config.seat_consoles))
+    else:
+        log.debug("flow watchdog: no seat consoles declared")
     if config.merge_when_ready:
         log.info(
             "merge edge: ON — merging PRs by %s on an approve from %s carrying "
@@ -656,7 +824,19 @@ def log_effective_config(config: Config) -> None:
             ", ".join("@" + login for login in config.merge_reviewer_logins),
             config.merge_method, config.merge_hold_label, config.merge_maintain_label,
             ", ".join(config.merge_hold_paths) or "(none)",
-            "merged" if config.merge_allow_no_checks else "held",
+            "merged" if config.merge_allow_no_checks else (
+                f"merged in {', '.join(config.merge_allow_no_checks_repos)}, held elsewhere"
+                if config.merge_allow_no_checks_repos else "held"
+            ),
+        )
+        log.info(
+            "merge policy: %s — yolo merges classes %s, holds classes %s (unclassed and "
+            "unlisted hold; hard-stop paths hold in every policy); follow-up PRs %s",
+            config.merge_policy,
+            ", ".join(config.merge_yolo_merge_classes) or "(none)",
+            ", ".join(config.merge_yolo_hold_classes) or "(none)",
+            f"enumerated (at most {config.merge_followup_candidates_per_repo} per repo per poll)"
+            if config.merge_follow_ups else "not enumerated",
         )
     else:
         log.debug("merge edge: disabled")

{alissa_tools_github_orcloop-0.18.0 → alissa_tools_github_orcloop-0.18.2}/src/main/alissa/tools/github/orcloop/alissa_client.py

@@ -638,6 +638,11 @@ class Task:
     # Defaults to `full`: a `Task` built by hand carries whatever its author put
     # in it, and treating that as partial would hold releases on nothing.
     view: str = VIEW_FULL
+    # The task's `reporterId`, verbatim -- the actor the merge policy's
+    # validation floor (issue #116) assigns the "Validate after merge" task
+    # to. "" when the payload omitted it, in which case the downstream task
+    # defaults to the calling actor and the floor says so.
+    reporter_id: str = ""
 
 
 def _query(params: dict) -> str:
@@ -1311,6 +1316,7 @@ class AlissaClient:
             context_count=context_count,
             updated_at=updated_at,
             view=payload_view,
+            reporter_id=str(task.get("reporterId") or ""),
         )
 
     def get_task_context(self, ref: str) -> list[ContextItem]:
@@ -1399,6 +1405,39 @@ class AlissaClient:
             {"content": body},
         )
 
+    def create_downstream_task(
+        self, ref: str, *, title: str, definition_of_done: str, description: str,
+        criteria: "Sequence[dict]", assign_to_actor_id: str = "",
+    ) -> str:
+        """Create a task DOWNSTREAM of `ref` (`POST /v1/tasks/:id/downstream`)
+        and return the new task's opaque id -- all the create answers
+        (`{"taskId": …}`; the number is a `get_task` away). The merge policy's
+        validation floor (issue #116) is the one caller: the "Validate after
+        merge" task on the origin task, assigned to the origin's reporter.
+
+        `criteria` is the API's shape verbatim (`{id, type, description}`
+        objects -- plain strings are refused with a 400). Permission is the
+        parent's OWNER, which the daemon's token is on the tasks it released;
+        a refusal comes back as the base `AlissaError` and the caller decides
+        (the floor skips the merge)."""
+        body: dict = {
+            "title": title,
+            "definitionOfDone": definition_of_done,
+            "description": description,
+            "validationCriteria": list(criteria),
+        }
+        if assign_to_actor_id:
+            body["assignToActorId"] = assign_to_actor_id
+        payload = self._request(
+            "POST",
+            f"/v1/tasks/{urllib.parse.quote(str(ref), safe='')}/downstream",
+            body,
+        )
+        task_id = payload.get("taskId") if isinstance(payload, dict) else None
+        if not isinstance(task_id, str) or not task_id:
+            raise AlissaError(0, payload, "downstream create answered no taskId")
+        return task_id
+
     def post_loop_events(self, events: "Sequence[dict]") -> dict:
         """Push one batch of loop events (`POST /v1/loop-events`, O34).