riskrails 4.1.0 → 4.3.0

package/hooks/guard/dialog.py

@@ -45,6 +45,7 @@ INTERPRETER_RE = re.compile(r"^python3?$")
 INTERPRETER_FLAG_RE = re.compile(r"^-[IS]+$")
 PUSH_REF_RE = re.compile(r"^[A-Za-z0-9._/-]+$")
 NPX_PACKAGE_RE = re.compile(r"^riskrails@[0-9A-Za-z.+-]+$")
+BATCH_ON = {"--by": True, "--why": False}   # `batch on` options, each at most once; True = required. rr_state/labels.py keeps the same table
 TS = "%Y-%m-%dT%H:%M:%SZ"
 
 # hooks/guard/dialog.py -> the plugin root; the Stop reminder names its
@@ -217,12 +218,12 @@ def validate_label(label):
     if state_label_ok(tokens):
         return None
     return ("a label starts with git commit, git push, a human-only state.py command (approve, reject, "
-            "profile set, verify/review/start --by, memory enable) or npx riskrails@<v>")
+            "profile set, verify/review/start --by, batch on --by, memory enable) or npx riskrails@<v>")
 
 
 def state_label_ok(tokens):
     """python3 [-I|-S…] <…/state.py> approve|reject|profile set|verify --by|
-    review --by|start --mode … --by|memory enable [--author S] [--period month|quarter|year]
+    review --by|start --mode … --by|batch on --by S [--why S]|memory enable [--author S] [--period month|quarter|year]
     [--index none|sqlite]: each option at most once, as two words, in any order, and no other
     memory verb. rr_state/labels.py keeps the same rule; tests/test_dialog_contract.py pins the
     two equal."""
@@ -236,6 +237,11 @@ def state_label_ok(tokens):
     rest = tokens[i + 1:]
     while rest[:1] in (["--root"], ["--runtime"]) and len(rest) >= 2:
         rest = rest[2:]
+    if rest[:2] == ["batch", "on"]:
+        names, values = rest[2::2], rest[3::2]
+        return (len(names) == len(values) == len(set(names)) and set(names) <= set(BATCH_ON)
+                and all(n in names for n, need in BATCH_ON.items() if need)
+                and all(v[:1] not in ("", "-") for v in values))
     if rest[:1] in (["approve"], ["reject"]) or rest[:2] == ["profile", "set"]:
         return True
     if rest[:1] in (["verify"], ["review"]):
@@ -589,6 +595,10 @@ def is_git_label(label):
     return (label or "").split()[:1] == ["git"]
 
 
+def is_npx_label(label):
+    return (label or "").split()[:1] == ["npx"]
+
+
 def used_note(pick):
     """What a deny after the gate spent a git pick adds (review focus 1)."""
     return ("\n\nThe pick %s was used by this call and is spent; the command did not run. To ask the human "

package/hooks/guard/ere.py

@@ -528,11 +528,18 @@ class _Found:                               # pylint: disable=too-few-public-met
 
 
 class Compiled:
-    """One pattern in one mode. `rx` is None when the pattern is invalid."""
-    __slots__ = ("rx", "required", "anchored", "dfa")
+    """One pattern in one mode. `rx` is None when the pattern is invalid.
+
+    The pattern is parsed here (parse errors are caught here), but the regex
+    and the DFA are built on the first read of `rx`: `search` runs the cheap
+    `required` prefilter first, so a subject it rejects never pays for
+    `re.compile` (a fresh process holds ~34 patterns, most never get past it).
+    """
+    __slots__ = ("_rx", "_pending", "required", "anchored", "dfa")
 
     def __init__(self, pattern, mode, capture):
-        self.rx = None
+        self._rx = None
+        self._pending = None                # (tree, mode, capture) until built
         self.required = None
         self.anchored = False
         self.dfa = None
@@ -546,18 +553,30 @@ class Compiled:
                 tree = _strip_leading(tree)
             elif capture:
                 self.anchored = _starts_with_dotstar(tree)
-            flags = re.ASCII if mode == "b" else 0
-            self.rx = re.compile(_emit(tree, mode), flags)
-            if not capture and _nested(tree) and _dfa_ok(tree):
-                self.dfa = _Dfa(tree, mode)
+            self._pending = (tree, mode, capture)
         except (EreError, re.error, RecursionError, OverflowError):
-            self.rx = None
+            self._pending = None
+
+    @property
+    def rx(self):
+        if self._pending is not None:
+            tree, mode, capture = self._pending
+            self._pending = None
+            try:
+                flags = re.ASCII if mode == "b" else 0
+                self._rx = re.compile(_emit(tree, mode), flags)
+                if not capture and _nested(tree) and _dfa_ok(tree):
+                    self.dfa = _Dfa(tree, mode)
+            except (EreError, re.error, RecursionError, OverflowError):
+                self._rx = None
+                self.dfa = None
+        return self._rx
 
     def search(self, subject):
-        if self.rx is None:
-            return None
         if self.required is not None and not any(r in subject for r in self.required):
             return None
+        if self.rx is None:
+            return None
         if self.dfa is not None:
             return _Found() if self.dfa.search(subject) else None
         return self.rx.match(subject) if self.anchored else self.rx.search(subject)

package/hooks/guard/git.py

@@ -285,7 +285,8 @@ class GitGuard:
                     return
         except Exception:                   # pylint: disable=broad-exception-caught
             pass
-        raise Deny(text_to_b("CONSENT_REQUIRED \u2014 no live pick of this session is this command.") + WHY_CONSENT)
+        raise Deny(text_to_b("CONSENT_REQUIRED \u2014 no live pick of this session is this command. Ask the human in "
+                                 "the dialog; or they run it in their own terminal.") + WHY_CONSENT)
 
     def _drop_status(self, path):
         """`[ "${#path}" -lt 3 ] || path="${path:3}"`, counted in the locale's characters."""