@miller-tech/uap 1.94.0 → 1.95.0

package/templates/hooks/deliver_autoroute.py

@@ -12,12 +12,14 @@ the block carries route == "deliver", the helper:
   3. Prints the (possibly annotated) block message on stdout for the hook to
      surface to the agent.
 
-Default (autoroute off): just logs the intent + returns the message unchanged —
-no behavior change. The hook still blocks (exit 2); this only enriches the block.
+Autoroute is ON by default (UAP_DELIVER_AUTOROUTE=0 to disable): the blocked
+intent is logged AND routed. The hook still blocks (exit 2); this only enriches
+the block message and kicks off the sanctioned path in the background.
 """
 import argparse
 import json
 import os
+import re
 import sys
 import time
 from pathlib import Path
@@ -28,8 +30,11 @@ UAP_DIR = ".uap"
 
 
 def _autoroute_enabled() -> bool:
-    v = os.environ.get("UAP_DELIVER_AUTOROUTE", "").lower()
-    return v not in {"", "0", "off", "false", "no"}
+    # Default ON: a blocked source edit auto-routes into `uap deliver` in the
+    # background instead of dead-ending the agent. Opt out with
+    # UAP_DELIVER_AUTOROUTE=0/off/false/no.
+    v = os.environ.get("UAP_DELIVER_AUTOROUTE", "on").lower()
+    return v not in {"0", "off", "false", "no"}
 
 
 def decide(out: dict, tool: str, args: dict, autoroute_on: bool, seen_files: set) -> dict:
@@ -37,6 +42,11 @@ def decide(out: dict, tool: str, args: dict, autoroute_on: bool, seen_files: set
     reason = out.get("reason", "")
     route = out.get("route")
     hint = out.get("deliverHint") or ""
+    # Older enforcers emitted a full command line ('uap deliver "..."'); the
+    # hint is the INSTRUCTION — unwrap so the mission text isn't a command.
+    m = re.fullmatch(r'uap deliver "(.+)"', hint.strip())
+    if m:
+        hint = m.group(1)
     file_path = args.get("file_path") or args.get("path") or args.get("target") or ""
 
     if route != "deliver":
@@ -49,7 +59,7 @@ def decide(out: dict, tool: str, args: dict, autoroute_on: bool, seen_files: set
     if spawn:
         message = reason + " [auto-routed to `uap deliver` — running in the background]"
     elif autoroute_on and file_path in seen_files:
-        message = reason + " [already auto-routed to `uap deliver` this session — wait for it]"
+        message = reason + " [already auto-routed to `uap deliver` for this file — see .uap/autoroute.log / pending-deliver.jsonl]"
     return {"message": message, "route": route, "spawn": spawn,
             "file_path": file_path, "hint": hint, "intent": intent}
 
@@ -65,16 +75,56 @@ def _load_seen(root: Path) -> set:
         return set()
 
 
+LOCK_FILE = "autoroute.lock"
+LOG_FILE = "autoroute.log"
+
+
+def _pid_alive(pid: int) -> bool:
+    try:
+        os.kill(pid, 0)
+        return True
+    except Exception:
+        return False
+
+
+def _acquire_slot(root: Path) -> bool:
+    """One in-flight autoroute deliver per repo: a lockfile holding the child
+    pid. Stale locks (dead pid) are reclaimed. Best-effort; failure = no slot."""
+    lock = root / UAP_DIR / LOCK_FILE
+    try:
+        if lock.exists():
+            pid = int(lock.read_text().strip() or "0")
+            if pid and _pid_alive(pid):
+                return False
+        return True
+    except Exception:
+        return False
+
+
 def _spawn_deliver(root: Path, hint: str) -> None:
-    """Spawn `uap deliver "<hint>"` fully detached. Best-effort; never raises."""
+    """Spawn `uap deliver -- "<hint>"` fully detached. Best-effort; never
+    raises. The hint is passed after `--` (a pure operand — no flag smuggling),
+    bounded turn budget, output logged to .uap/autoroute.log for visibility."""
     import subprocess
+    if hint.startswith("-"):
+        return  # never let a hint be parsed as a flag
+    if not _acquire_slot(root):
+        return  # another autoroute mission is already converging in this repo
+    try:
+        log = (root / UAP_DIR / LOG_FILE).open("a")
+    except Exception:
+        log = subprocess.DEVNULL
     try:
-        subprocess.Popen(
-            ["uap", "deliver", hint],
+        proc = subprocess.Popen(
+            ["uap", "deliver", "--max-turns", "5", "--ceiling", "10", "--", hint],
             cwd=str(root),
-            stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, stdin=subprocess.DEVNULL,
+            stdout=log, stderr=log, stdin=subprocess.DEVNULL,
             start_new_session=True,
         )
+        try:
+            (root / UAP_DIR / LOCK_FILE).write_text(str(proc.pid))
+        except Exception:
+            pass
     except Exception:
         pass
 
@@ -111,7 +161,7 @@ def main() -> None:
     if d["spawn"]:
         try:
             with _seen_path(root).open("a") as f:
-                f.write(d["file_path"] + "\n")
+                f.write(d["file_path"].replace("\n", " ").replace("\r", " ") + "\n")
         except Exception:
             pass
         _spawn_deliver(root, d["hint"])