alissa-tools-github-orcloop 0.3.0__tar.gz → 0.3.1__tar.gz

{alissa_tools_github_orcloop-0.3.0/src/main/alissa_tools_github_orcloop.egg-info → alissa_tools_github_orcloop-0.3.1}/PKG-INFO

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

{alissa_tools_github_orcloop-0.3.0 → alissa_tools_github_orcloop-0.3.1}/src/main/alissa/tools/github/orcloop/__main__.py

@@ -84,9 +84,10 @@ def build_parser() -> argparse.ArgumentParser:
         dest="repos",
         action="append",
         metavar="OWNER/REPO",
-        help="watch this repo; repeatable. When given, REPLACES the config "
-        "`repos` list. The allowlist is fail-closed: an empty allowlist is a "
-        "fatal startup error, not a no-op.",
+        help="watch this repo; repeatable, and one flag may carry several "
+        "entries separated by `|` (the daemon-family convention) or `,`. When "
+        "given, REPLACES the config `repos` list. The allowlist is fail-closed: "
+        "an empty allowlist is a fatal startup error, not a no-op.",
     )
     over.add_argument("--label", metavar="LABEL", help="issue label released work carries")
     over.add_argument("--poll-interval", type=int, metavar="SECONDS")

{alissa_tools_github_orcloop-0.3.0 → alissa_tools_github_orcloop-0.3.1}/src/main/alissa/tools/github/orcloop/config.py

@@ -21,6 +21,20 @@ watch nothing, but boot anyway), an empty orcloop allowlist is **fatal at
 startup** — the orchestrator releases work into `alissa:develop` issues and
 closes the loop on merge, so it never runs against an unbounded repo set.
 
+REPOS SEPARATOR (O7). A repo list written as one string — `ALISSA_ORC_REPOS`,
+a `--repo a/b|c/d` flag, or a single-element list in the config file — is split
+on **both `|` and `,`**, mixed freely. `|` is the daemon **family convention**
+(devloop's `ALISSA_DEV_REPOS` has always been pipe-separated); comma stays
+accepted for backward compatibility with every orcloop release up to 0.3.0.
+The convention matters because the operator points several Railway services at
+ONE list through a variable reference — `ALISSA_ORC_REPOS=${{dev.ALISSA_DEV_REPOS}}`
+— which only works if both daemons read the same separator. Entries are
+whitespace-stripped, empties from splitting are dropped (so a trailing
+separator is harmless), duplicates collapse, and each surviving entry must look
+like `owner/repo` (a bare word or a pasted URL is a fatal startup error naming
+the offending entry). An allowlist that is empty *after* parsing stays fatal —
+fail-closed is unchanged.
+
 The marker contract (`Autonomous-Dev` / `Autonomous-Scope` issue-body
 trailers) is parsed in `markers.py`; the keys that name those trailers live
 here (`marker_key`, `scope_key`) so an operator can rename them per-deployment.
@@ -51,6 +65,7 @@ from __future__ import annotations
 
 import json
 import os
+import re
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any, Mapping
@@ -91,9 +106,37 @@ RELEASE_FEEDS = (FEED_SCAN, FEED_BOW)
 # Keys carrying a boolean; env strings for these need real parsing (bool("false")
 # is True, which would silently invert the setting).
 _BOOL_KEYS = frozenset({"dry_run", "close_loop_enabled"})
-# Keys carrying a list of strings; an env value is comma-separated.
+# Keys carrying a list of strings. In an env value they are separator-delimited;
+# `repos` accepts the family's `|` as well as `,` (see REPO_SEPARATORS), every
+# other list key is comma-separated.
 _LIST_KEYS = frozenset({"repos", "bow_owners"})
 
+# The separators a one-string repo list may use, in preference order. `|` is the
+# daemon-family convention (devloop's ALISSA_DEV_REPOS), which is what lets one
+# Railway variable reference feed both daemons; `,` is what orcloop shipped
+# through 0.3.0 and stays accepted. Mixing them in one value is fine.
+REPO_SEPARATORS = ("|", ",")
+_REPO_SPLIT_RE = re.compile("[" + re.escape("".join(REPO_SEPARATORS)) + "]")
+
+# What an allowlist entry must look like once split: exactly one `/`, a GitHub
+# owner (alphanumerics and hyphens, not leading/trailing) and a repo name
+# (alphanumerics, `.`, `_`, `-`) that is neither all dots nor `.git`-suffixed
+# (in any casing, matching the hint branch below — spelled as a character class
+# rather than re.IGNORECASE, which would also relax the two strict classes) —
+# both are names GitHub itself refuses. Deliberately strict enough to reject
+# the mistakes a separator change invites — a bare word (`widgets`, which names
+# no owner) and a pasted URL or git remote (`https://github.com/acme/widgets`,
+# `git@github.com:acme/widgets.git`), each of which would otherwise become an
+# allowlist row the daemon silently never matches.
+#
+# Every exclusion here is one spelling GitHub refuses that the character class
+# would otherwise accept, so this is the line new ones get added to; the hint
+# table in `_validate_repo_entry` is where each earns its own message.
+_REPO_NAME_RE = re.compile(
+    r"^[A-Za-z0-9](?:[A-Za-z0-9-]*[A-Za-z0-9])?"
+    r"/(?!\.+$)(?!.*\.[Gg][Ii][Tt]$)[A-Za-z0-9._-]+$"
+)
+
 MIN_POLL_INTERVAL = 10  # the GitHub search API allows 30 req/min
 
 DEFAULT_ALISSA_ENDPOINT = "https://api.alissa.app"
@@ -134,6 +177,86 @@ def _string_list(value: Any, key: str) -> tuple[str, ...]:
     return tuple(value)
 
 
+def split_repo_entries(raw: str) -> list[str]:
+    """Split one repo-list string into entries on `|` and/or `,`.
+
+    Whitespace around an entry is stripped and empties are dropped, so a
+    trailing separator, a doubled one, and `a/b | c/d` all behave. This is the
+    ONE place the separator set is applied: the library's env layer, the CLI
+    flag, the config file, and the container's `render_config.py` all route
+    through it, so no surface can end up accepting a different syntax.
+
+    Splitting only — shape validation is `normalize_repos`, because the config
+    file may also hand over an already-split JSON list.
+    """
+    return [entry for part in _REPO_SPLIT_RE.split(raw) if (entry := part.strip())]
+
+
+def normalize_repos(values: tuple[str, ...] | list[str]) -> tuple[str, ...]:
+    """Turn the raw `repos` layer value into the validated allowlist.
+
+    Every element is itself split (an entry may carry a whole separated list —
+    that is exactly what `ALISSA_ORC_REPOS` and a `--repo a/b|c/d` flag look
+    like), duplicates collapse case-insensitively keeping the operator's first
+    spelling (GitHub names are case-insensitive, and `watches` matches them
+    that way — a repeat is a duplicated GitHub search term, not a second lane),
+    and each survivor is validated as `owner/repo`.
+
+    Emptiness is NOT judged here: `Config.build` owns the fail-closed guard so
+    the operator gets its one canonical message.
+    """
+    out: list[str] = []
+    seen: set[str] = set()
+    for value in values:
+        for entry in split_repo_entries(value):
+            _validate_repo_entry(entry)
+            if (key := entry.casefold()) not in seen:
+                seen.add(key)
+                out.append(entry)
+    return tuple(out)
+
+
+def _validate_repo_entry(entry: str) -> None:
+    """Reject anything that is not an `owner/repo` name, naming the entry.
+
+    Fail loudly rather than carry it: an unmatchable allowlist entry is not
+    inert, it is a repo the operator believes is watched and is not.
+    """
+    if _REPO_NAME_RE.match(entry):
+        return
+    if (
+        "://" in entry
+        or "@" in entry
+        or ":" in entry
+        or entry.casefold().startswith(("github.com/", "www."))
+    ):
+        # Covers a pasted browser URL, a scheme-less `github.com/...`, and an
+        # SSH remote (`git@github.com:acme/widgets.git`) — which has no `://`
+        # and only one `/`, so without the `@`/`:` tests it would fall through
+        # to the bare message.
+        hint = " — that looks like a URL or a git remote; use only the " \
+               "`owner/repo` part"
+    elif entry.casefold().endswith(".git") and "/" in entry:
+        # Ordered AFTER the URL/remote branch so the two messages COMPOSE: a
+        # full remote keeps "use only the `owner/repo` part", and the
+        # `acme/widgets.git` that following that advice yields gets the
+        # remaining half of the fix here. Without this branch, the first
+        # message walks the operator from a loud abort into a silent no-match.
+        hint = (" — drop the trailing `.git`; that is the clone URL's suffix, "
+                "not part of the repo name")
+    elif "/" not in entry:
+        hint = " — no `/`, so it names no owner"
+    elif entry.count("/") > 1:
+        hint = " — too many `/`; an entry is one owner and one repo"
+    else:
+        hint = ""
+    raise ValueError(
+        f"repos entry {entry!r} is not an owner/repo name{hint}. Entries look "
+        f"like `acme/widgets` and are separated by `|` (the daemon-family "
+        f"convention) or `,`, e.g. \"acme/widgets|acme/gadgets\"."
+    )
+
+
 def _env_bool(env_name: str, raw: str) -> bool:
     value = raw.strip().lower()
     if value in _ENV_TRUE:
@@ -164,6 +287,11 @@ def env_overrides(environ: Mapping[str, str] | None = None) -> dict[str, Any]:
         raw = env[env_name]
         if key in _BOOL_KEYS:
             out[key] = _env_bool(env_name, raw)
+        elif key == "repos":
+            # Separator-tolerant (`|` and `,`); shape-validated in `build`
+            # alongside the file and CLI layers, so one bad entry reports the
+            # same way wherever it came from.
+            out[key] = tuple(split_repo_entries(raw))
         elif key in _LIST_KEYS:
             out[key] = tuple(
                 item for part in raw.split(",") if (item := part.strip())
@@ -181,7 +309,9 @@ class Config:
     # Fail-closed allowlist of owner/repo. Empty is REJECTED at build (see
     # build's guard) — the orchestrator never runs against an unbounded set.
     # The dataclass default is () only to mark "unset"; a real Config always
-    # carries at least one repo.
+    # carries at least one repo. Entries reach `build` as `|`- and/or
+    # `,`-separated text from any layer and land here split, validated,
+    # de-duplicated, and in the operator's own casing (see `normalize_repos`).
     repos: tuple[str, ...] = ()
 
     label: str = "alissa:develop"
@@ -313,7 +443,12 @@ class Config:
         # The env layer wins over everything, including a value set on the CLI.
         raw.update(env_overrides(environ))
 
-        repos = _string_list(raw.get("repos", cls.repos), "repos")
+        # Split-then-validate: whichever layer won, an entry may still be a
+        # whole `a/b|c/d` list (that is what one Railway variable reference
+        # looks like), so normalize before the fail-closed check — a value of
+        # only separators parses to nothing and must read as "empty", not as
+        # one bogus repo.
+        repos = normalize_repos(_string_list(raw.get("repos", cls.repos), "repos"))
         if not repos:
             # Fail-closed: the orchestrator spawns develop work and closes the
             # loop on merge. An empty allowlist would let anyone who can label
@@ -321,7 +456,8 @@ class Config:
             raise ValueError(
                 "repos allowlist is empty — the orchestrator is fail-closed and "
                 "refuses to start with no repos. Set `repos` in the config file, "
-                "pass one or more --repo flags, or set ALISSA_ORC_REPOS."
+                "pass one or more --repo flags, or set ALISSA_ORC_REPOS "
+                "(entries separated by `|`, or `,`)."
             )
 
         interval = int(raw.get("poll_interval", cls.poll_interval))

alissa_tools_github_orcloop-0.3.1/src/main/alissa/tools/github/orcloop/version

@@ -0,0 +1 @@
+0.3.1

{alissa_tools_github_orcloop-0.3.0 → alissa_tools_github_orcloop-0.3.1/src/main/alissa_tools_github_orcloop.egg-info}/PKG-INFO

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

alissa_tools_github_orcloop-0.3.0/src/main/alissa/tools/github/orcloop/version

@@ -1 +0,0 @@
-0.3.0