alissa-tools-github-devloop 0.8.27__tar.gz → 0.8.29__tar.gz

{alissa_tools_github_devloop-0.8.27/src/main/alissa_tools_github_devloop.egg-info → alissa_tools_github_devloop-0.8.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alissa-tools-github-devloop
-Version: 0.8.27
+Version: 0.8.29
 Summary: ALISSA-TOOLS-GITHUB-DEVLOOP
 Home-page: https://alissa.app
 Author: Fahera

{alissa_tools_github_devloop-0.8.27 → alissa_tools_github_devloop-0.8.29}/src/main/alissa/tools/github/devloop/config.py

@@ -26,6 +26,10 @@ through to the config rather than fail the daemon's boot on a mode of `''`.
 `fleet_vitals_enabled` through `ALISSA_DEV_FLEET_VITALS_ENABLED` likewise.
 `revert_label` rides `ALISSA_REVERT_LABEL` the same way (issue #131): a
 non-blank value wins over the CLI and the file, a blank one falls through.
+
+`regenerate` (issue #138) is env-only: `ALISSA_DEV_REGENERATE` maps
+repo-scoped globs to the command that regenerates them, and the daemon only
+ever RENDERS that map into a worker's directive -- it never runs the command.
 """
 
 from __future__ import annotations
@@ -116,6 +120,94 @@ ENV_FLEET_VITALS = "ALISSA_DEV_FLEET_VITALS_ENABLED"
 # it (no `_DEV_` infix), because that is the name the operator runbook gives.
 ENV_REVERT_LABEL = "ALISSA_REVERT_LABEL"
 
+# The regenerable-paths map (issue #138): `owner/repo:<glob>=<command>`
+# entries, `|`-separated (the daemon-family list separator -- a command may
+# itself carry `,`, `;` or spaces, so `|` is the ONLY separator here), default
+# empty. Env-only, read straight from the environment like ENV_REVERT_LABEL:
+# not a config key, not a build ARG, not written by the config generator. Each
+# entry is validated at load and a malformed one is refused by NAME -- the
+# variable's and the entry's -- because the failure mode of a silently
+# dropped entry is a worker hand-merging a generated file a poll later. The
+# command is rendered into the worker's directive and runs INSIDE the
+# worker's worktree as part of the session; the daemon never executes it.
+ENV_REGENERATE = "ALISSA_DEV_REGENERATE"
+
+# `owner/repo` for a regenerate entry: exactly one `/`, no whitespace, and no
+# `:` (the separator that ends it). Shape only, like the actor-id check.
+_REGENERATE_REPO_RE = re.compile(r"^[^\s/:]+/[^\s/:]+\Z")
+
+
+@dataclass(frozen=True)
+class RegenerateRule:
+    """One `ALISSA_DEV_REGENERATE` entry: files under `glob` in `repo` are a
+    pure function of the code, regenerated by `command` (run in the worker's
+    worktree, never by the daemon). `repo` keeps the operator's casing;
+    matching casefolds, as `Config.watches` does."""
+
+    repo: str
+    glob: str
+    command: str
+
+
+def parse_regenerate(raw: str) -> "tuple[RegenerateRule, ...]":
+    """Parse the ALISSA_DEV_REGENERATE value into rules, refusing malformed
+    entries by name.
+
+    The grammar is `owner/repo:<glob>=<command>` per entry, split on `|`
+    ONLY: the repo ends at the first `:`, the glob at the first `=`, and the
+    command is everything after it (so a command may carry `=` and `:`, and a
+    glob may carry `:` but not `=`). Whitespace around an entry and its three
+    parts is stripped; empty entries (a trailing `|`) are dropped, so a blank
+    or unset variable is the empty map -- today's behaviour exactly. An
+    entry with a missing part, a repo that is not `owner/repo`, or the same
+    repo+glob given twice with different commands is a ValueError naming
+    ENV_REGENERATE and the entry: a dropped entry would surface a poll later
+    as a hand-merged generated file, which is the very thing the map exists
+    to prevent. Exact duplicates collapse.
+    """
+    rules: "list[RegenerateRule]" = []
+    seen: "dict[tuple[str, str], RegenerateRule]" = {}
+    for part in (raw or "").split("|"):
+        entry = part.strip()
+        if not entry:
+            continue
+
+        def refuse(problem: str) -> ValueError:
+            return ValueError(
+                f"{ENV_REGENERATE} entry {entry!r} is malformed: {problem} "
+                f"(expected owner/repo:<glob>=<command>, entries separated "
+                f"by '|')"
+            )
+
+        repo, colon, rest = entry.partition(":")
+        if not colon:
+            raise refuse("missing ':' between the repo and the glob")
+        repo = repo.strip()
+        if not _REGENERATE_REPO_RE.match(repo):
+            raise refuse(f"repo {repo!r} is not of the form owner/repo")
+        glob, equals, command = rest.partition("=")
+        if not equals:
+            raise refuse("missing '=' between the glob and the command")
+        glob = glob.strip()
+        command = command.strip()
+        if not glob:
+            raise refuse("the glob is empty")
+        if not command:
+            raise refuse("the command is empty")
+        rule = RegenerateRule(repo=repo, glob=glob, command=command)
+        key = (repo.casefold(), glob)
+        prior = seen.get(key)
+        if prior is not None:
+            if prior.command != command:
+                raise refuse(
+                    f"{repo}:{glob} is already mapped to {prior.command!r}"
+                )
+            continue
+        seen[key] = rule
+        rules.append(rule)
+    return tuple(rules)
+
+
 # The prompt responder's master switch (issue #127): `on` answers, `observe`
 # classifies and narrates but sends nothing, `off` never captures a pane.
 PROMPT_ON = "on"
@@ -744,6 +836,12 @@ class Config:
     # to act (at the incident's growth rate, ~2 days). 0 never warns.
     disk_warn_percent: int = 80
 
+    # The regenerable-paths map (issue #138), from ALISSA_DEV_REGENERATE only
+    # (no config key, no CLI flag). Empty by default, and empty means every
+    # worker directive renders byte-identical to a build without the map.
+    # Read through `regenerate_for(owner, repo)`, never executed here.
+    regenerate: tuple[RegenerateRule, ...] = ()
+
     dry_run: bool = False
 
     # Derived at build time: `repos` casefolded for matching. GitHub names are
@@ -875,6 +973,13 @@ class Config:
         and gets an answer that includes the enrolled repos."""
         return full_name.casefold() in self._repo_match
 
+    def regenerate_for(self, owner: str, repo: str) -> "tuple[RegenerateRule, ...]":
+        """The regenerate rules scoped to `owner/repo`, in the order the
+        operator wrote them; empty for a repo with no entry. Casefolded like
+        `watches`: GitHub names are case-insensitive."""
+        wanted = f"{owner}/{repo}".casefold()
+        return tuple(r for r in self.regenerate if r.repo.casefold() == wanted)
+
     def trusts_feed_owner(self, actor_id: "str | None") -> bool:
         """May a Body of Work owned by this actor act as a repo feed?
 
@@ -900,9 +1005,10 @@ class Config:
         """Merge the layers and validate. `overrides` entries that are None mean
         "not specified on the CLI" and fall through to the file / defaults.
 
-        `environ` is only read for `ALISSA_DEV_REPOS_SOURCE`, which rides one
-        rail above the CLI (see the module docstring); it defaults to the real
-        environment and is a parameter so a test never has to monkeypatch it."""
+        `environ` is only read for the env rails (`ALISSA_DEV_REPOS_SOURCE`
+        and its siblings, see the module docstring, plus the env-only
+        `ALISSA_DEV_REGENERATE` map); it defaults to the real environment and
+        is a parameter so a test never has to monkeypatch it."""
         raw: dict[str, Any] = dict(file_data or {})
 
         if "workspace_root" in raw:
@@ -994,6 +1100,9 @@ class Config:
             revert_label = env_revert_label
         if not revert_label.strip():
             raise ValueError("revert_label must not be blank")
+        # The regenerable-paths map (issue #138): env-only, validated here so
+        # a malformed entry fails the boot by name instead of a directive.
+        regenerate = parse_regenerate(env_map.get(ENV_REGENERATE, ""))
 
         bow_owners = normalize_bow_owners(raw.get("bow_owners", cls.bow_owners))
 
@@ -1284,6 +1393,7 @@ class Config:
                 raw.get("cache_paths", cls.cache_paths), "cache_paths"
             ),
             disk_warn_percent=warn_percent,
+            regenerate=regenerate,
             dry_run=bool(raw.get("dry_run", cls.dry_run)),
         )
 

{alissa_tools_github_devloop-0.8.27 → alissa_tools_github_devloop-0.8.29}/src/main/alissa/tools/github/devloop/loop.py

@@ -458,7 +458,7 @@ from collections import Counter
 from dataclasses import dataclass, replace
 from enum import Enum
 from pathlib import Path
-from typing import Callable
+from typing import Callable, Sequence
 
 from . import janitor
 from . import fleet_vitals as fleet_vitals_mod
@@ -486,6 +486,7 @@ from .config import (
     PROMPT_OFF,
     REPOS_BOWS,
     Config,
+    RegenerateRule,
 )
 from .ghclient import (
     FIRST_PARENT_MAX_PAGES,
@@ -771,6 +772,49 @@ _SHELL_RULE = (
     "change the command; do not retry it. "
 )
 
+# The regenerate-on-conflict rule (issue #138), rendered into every worker
+# directive that can end up merging main into its branch -- develop, resume,
+# fix, fix-resume and maintain -- and ONLY for a repo with entries in
+# ALISSA_DEV_REGENERATE: `render_regenerate_rule` returns "" otherwise, so a
+# repo without entries (and a deployment without the variable) renders every
+# directive byte-identical to before the rule existed. A generated file is a
+# pure function of the code; a hand-merge of it usually works and is still
+# the wrong operation (the repo's generated-drift CI job fails any hand-merge
+# that does not match, at the cost of a review round), so the rule is: take
+# either side, finish the merge, rerun the generator, commit. The command
+# runs in the worker's worktree as part of the session -- the daemon never
+# executes it, it only spells it here.
+_REGENERATE_RULE_ONE = (
+    "If merging main conflicts inside `{glob}`, do not hand-merge it: "
+    "`git checkout --theirs -- <paths>` (or `--ours` — either side), finish "
+    "the merge, run `{command}`, and commit the regenerated files in the "
+    "same push; the repo's CI verifies them. "
+)
+_REGENERATE_RULE_MANY = (
+    "If merging main conflicts inside {paths}, do not hand-merge it: "
+    "`git checkout --theirs -- <paths>` (or `--ours` — either side), finish "
+    "the merge, run that path's regenerate command, and commit the "
+    "regenerated files in the same push; the repo's CI verifies them. "
+)
+
+
+def render_regenerate_rule(rules: "Sequence[RegenerateRule]") -> str:
+    """The rule for one repo's ALISSA_DEV_REGENERATE entries, or "" when it
+    has none. One entry renders the issue's own sentence with the glob and the
+    command substituted; several render one sentence naming each glob with
+    its command. Always ends in a space so it splices between two sentences
+    of a directive, and its placeholder renders to nothing when empty."""
+    if not rules:
+        return ""
+    if len(rules) == 1:
+        return _REGENERATE_RULE_ONE.format(
+            glob=rules[0].glob, command=rules[0].command
+        )
+    named = [f"`{r.glob}` (regenerate with `{r.command}`)" for r in rules]
+    paths = ", ".join(named[:-1]) + " or " + named[-1]
+    return _REGENERATE_RULE_MANY.format(paths=paths)
+
+
 DEV_DIRECTIVE = (
     "You are an IMPLEMENTER, not a reviewer. Implement GitHub issue "
     "{issue_url} (attempt {attempt} of {cap}) — the issue is your "
@@ -786,7 +830,8 @@ DEV_DIRECTIVE = (
     + _BRANCH_RULE
     + _SHELL_RULE
     + "Implement to the issue's acceptance criteria and VERIFY locally (run the "
-    "repo's test/style/type scripts) before publishing. Open a DRAFT PR whose "
+    "repo's test/style/type scripts) before publishing. {regenerate_rule}"
+    "Open a DRAFT PR whose "
     "body contains `Closes #{number}` and BOTH task refs — the origin task "
     "AND your implementation task: the PR body is the canonical cross-actor "
     "record, and each actor's tasks live in its own partition — and attach "
@@ -845,7 +890,8 @@ RESUME_DIRECTIVE = (
     "are unchanged and still authoritative — and VERIFY locally (run the "
     "repo's test/style/type scripts) before publishing. NEVER force-push: "
     "history stays append-only, or the PR's review threads lose their "
-    "anchors. Keep the PR body carrying `Closes #{number}` and BOTH task refs "
+    "anchors. {regenerate_rule}"
+    "Keep the PR body carrying `Closes #{number}` and BOTH task refs "
     "(the origin task AND your implementation task) — restoring them if the "
     "dead session did not. "
     + _SHELL_RULE
@@ -906,7 +952,7 @@ FIX_DIRECTIVE = (
     + "FIRST verify the triage of every prior review finding per CR8: exactly "
     "one reasoned `[triage:*]` reply on each finding's thread — post any that "
     "are missing. Then fix the pursued findings on the same branch and VERIFY "
-    "locally (run the repo's test/style/type scripts). "
+    "locally (run the repo's test/style/type scripts). {regenerate_rule}"
     + _NEWER_ROUNDS
     + _FIX_DELIVERY_NOTE
     + " "
@@ -964,7 +1010,7 @@ FIX_RESUME_DIRECTIVE = (
     "thread it already answered. Then fix the pursued findings, completing "
     "the ORIGINAL acceptance criteria the issue set, and VERIFY locally (run "
     "the repo's test/style/type scripts). NEVER force-push: history stays "
-    "append-only, or the review threads lose their anchors. "
+    "append-only, or the review threads lose their anchors. {regenerate_rule}"
     + _NEWER_ROUNDS
     + _FIX_DELIVERY_NOTE
     + " "
@@ -1015,6 +1061,7 @@ MAINTAIN_DIRECTIVE = (
     "while history is append-only — resolving any conflicts so BOTH sides' "
     "intent is preserved, then run the repo's four scripts (unit tests, "
     "coverage, style, types) and get ALL of them green before publishing. "
+    "{regenerate_rule}"
     + _REVIEW_SEAT
     + "The terminal sequence's ORDER is load-bearing: push the merge commit, "
     "THEN re-request review from {reviewers} — the push stales any approve, "
@@ -3680,6 +3727,7 @@ class DevWatcher:
             "none resolved — follow the alissa-pr-review skill's reviewer "
             "resolution"
         )
+        regenerate_rule = self._regenerate_rule(issue.owner, issue.repo)
         if resume_pr is not None:
             directive = RESUME_DIRECTIVE.format(
                 issue_url=issue.url,
@@ -3693,6 +3741,7 @@ class DevWatcher:
                 head_ref=resume_pr.head_ref,
                 worktree_dir=worktree_dir(resume_pr.head_ref),
                 dead_session=dead_session,
+                regenerate_rule=regenerate_rule,
             )
         else:
             directive = DEV_DIRECTIVE.format(
@@ -3703,6 +3752,7 @@ class DevWatcher:
                 task_instruction=task_instruction,
                 reviewers=reviewers,
                 session=name,
+                regenerate_rule=regenerate_rule,
             )
 
         # assign_self FIRST: the assignment is the server-side in-flight
@@ -6802,6 +6852,7 @@ class DevWatcher:
             reviewer=review.author,
             session=name,
             dead_session=dead_session,
+            regenerate_rule=self._regenerate_rule(pr.owner, pr.repo),
         )
 
         # BEFORE the enqueue (issue #53), for the reason _spawn spells out:
@@ -7065,6 +7116,7 @@ class DevWatcher:
             worktree_dir=worktree_dir(pr.head_ref),
             reviewers=reviewers,
             session=name,
+            regenerate_rule=self._regenerate_rule(pr.owner, pr.repo),
         )
 
         # BEFORE the enqueue (issue #53), for the reason _spawn spells out:
@@ -7685,6 +7737,13 @@ class DevWatcher:
         if self._append_activity(owner, repo, number, line, display_slug):
             self.state.record_activity(slug_key, number, kind)
 
+    def _regenerate_rule(self, owner: str, repo: str) -> str:
+        """The regenerate-on-conflict clause for this repo's directives
+        (issue #138): "" -- and so a byte-identical directive -- unless
+        ALISSA_DEV_REGENERATE names `owner/repo`. Shared by all five worker
+        directives. Rendered only: the command is the worker's to run."""
+        return render_regenerate_rule(self.config.regenerate_for(owner, repo))
+
     def _ensure_hub(self, owner: str, repo: str) -> tuple[Path, str | None]:
         """Resolve a spawn's cwd (the hub ROOT), hub-ifying the repo first if
         configured. Shared by all three edges (issue, fix, and maintenance

alissa_tools_github_devloop-0.8.29/src/main/alissa/tools/github/devloop/version

@@ -0,0 +1 @@
+0.8.29

{alissa_tools_github_devloop-0.8.27 → alissa_tools_github_devloop-0.8.29/src/main/alissa_tools_github_devloop.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alissa-tools-github-devloop
-Version: 0.8.27
+Version: 0.8.29
 Summary: ALISSA-TOOLS-GITHUB-DEVLOOP
 Home-page: https://alissa.app
 Author: Fahera

alissa_tools_github_devloop-0.8.27/src/main/alissa/tools/github/devloop/version

@@ -1 +0,0 @@
-0.8.27