From 941cc4ba65bf2d952825ee080ba5119929020f88 Mon Sep 17 00:00:00 2001
From: Agent <agent@example.com>
Date: Wed, 1 Apr 2026 17:58:04 +0000
Subject: [PATCH 1/9] =?UTF-8?q?fix:=20bug:=20dispatcher=20fails=20in=20edg?=
 =?UTF-8?q?e=20container=20=E2=80=94=20lib/env.sh=20not=20available=20(#11?=
 =?UTF-8?q?9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/disinto                    |  4 +++-
 docker/edge/Dockerfile         |  3 ++-
 docker/edge/entrypoint-edge.sh | 16 ++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100755 docker/edge/entrypoint-edge.sh

diff --git a/bin/disinto b/bin/disinto
index 7a9482b..530cf1f 100755
--- a/bin/disinto
+++ b/bin/disinto
@@ -278,9 +278,11 @@ services:
     ports:
       - "80:80"
       - "443:443"
+    environment:
+      - DISINTO_VERSION=${DISINTO_VERSION:-main}
+      - FORGE_URL=http://forgejo:3000
     volumes:
       - ./docker/Caddyfile:/etc/caddy/Caddyfile
-      - ./docker/edge/dispatcher.sh:/usr/local/bin/dispatcher.sh:ro
       - caddy_data:/data
       - /var/run/docker.sock:/var/run/docker.sock
     depends_on:
diff --git a/docker/edge/Dockerfile b/docker/edge/Dockerfile
index 8914a51..7076f51 100644
--- a/docker/edge/Dockerfile
+++ b/docker/edge/Dockerfile
@@ -1,3 +1,4 @@
 FROM caddy:alpine
 RUN apk add --no-cache bash jq curl git docker-cli
-COPY dispatcher.sh /usr/local/bin/dispatcher.sh
+COPY entrypoint-edge.sh /usr/local/bin/entrypoint-edge.sh
+ENTRYPOINT ["bash", "/usr/local/bin/entrypoint-edge.sh"]
diff --git a/docker/edge/entrypoint-edge.sh b/docker/edge/entrypoint-edge.sh
new file mode 100755
index 0000000..b070b61
--- /dev/null
+++ b/docker/edge/entrypoint-edge.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+DISINTO_VERSION="${DISINTO_VERSION:-main}"
+DISINTO_REPO="${FORGE_URL:-http://forgejo:3000}/johba/disinto.git"
+
+# Shallow clone at the pinned version
+if [ ! -d /opt/disinto/.git ]; then
+  git clone --depth 1 --branch "$DISINTO_VERSION" "$DISINTO_REPO" /opt/disinto
+fi
+
+# Start dispatcher in background
+bash /opt/disinto/docker/edge/dispatcher.sh &
+
+# Caddy as main process
+exec caddy run --config /etc/caddy/Caddyfile --adapter caddyfile

From ad0b0e181fc90ef2ba749b547c5205f1f25f9c71 Mon Sep 17 00:00:00 2001
From: Agent <agent@example.com>
Date: Wed, 1 Apr 2026 18:14:18 +0000
Subject: [PATCH 2/9] =?UTF-8?q?fix:=20bug:=20agents=20Dockerfile=20build?=
 =?UTF-8?q?=20fails=20=E2=80=94=20SOPS=20checksum=20download=20unreachable?=
 =?UTF-8?q?=20(#120)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore               |  4 ++-
 bin/disinto              | 57 ++++++++++++++++++++++++++++++++++++++++
 docker/agents/Dockerfile | 18 +++++--------
 3 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index b828cf5..fc2d715 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,6 @@ gardener/dust.jsonl
 
 # Individual encrypted secrets (managed by disinto secrets add)
 secrets/
-.woodpecker/smoke-init.yml
+
+# Pre-built binaries for Docker builds (avoid network calls during build)
+docker/agents/bin/
diff --git a/bin/disinto b/bin/disinto
index 530cf1f..74faa68 100755
--- a/bin/disinto
+++ b/bin/disinto
@@ -2367,6 +2367,55 @@ disinto_run() {
   return "$rc"
 }
 
+# ── Pre-build: download binaries to docker/agents/bin/ ────────────────────────
+# This avoids network calls during docker build (needed for Docker-in-LXD builds)
+# Returns 0 on success, 1 on failure
+download_agent_binaries() {
+  local bin_dir="${FACTORY_ROOT}/docker/agents/bin"
+  mkdir -p "$bin_dir"
+
+  echo "Downloading agent binaries to ${bin_dir}..."
+
+  # Download SOPS
+  local sops_file="${bin_dir}/sops"
+  if [ ! -f "$sops_file" ]; then
+    echo "  Downloading SOPS v3.9.4..."
+    curl -sL https://github.com/getsops/sops/releases/download/v3.9.4/sops-v3.9.4.linux.amd64 -o "$sops_file"
+    if [ ! -f "$sops_file" ]; then
+      echo "Error: failed to download SOPS" >&2
+      return 1
+    fi
+  fi
+  # Verify checksum
+  echo "  Verifying SOPS checksum..."
+  if ! echo "5488e32bc471de7982ad895dd054bbab3ab91c417a118426134551e9626e4e85  ${sops_file}" | sha256sum -c - >/dev/null 2>&1; then
+    echo "Error: SOPS checksum verification failed" >&2
+    return 1
+  fi
+  chmod +x "$sops_file"
+
+  # Download tea CLI
+  local tea_file="${bin_dir}/tea"
+  if [ ! -f "$tea_file" ]; then
+    echo "  Downloading tea CLI v0.9.2..."
+    curl -sL https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-amd64 -o "$tea_file"
+    if [ ! -f "$tea_file" ]; then
+      echo "Error: failed to download tea CLI" >&2
+      return 1
+    fi
+  fi
+  # Verify checksum
+  echo "  Verifying tea CLI checksum..."
+  if ! echo "be10cdf9a619e3c0f121df874960ed19b53e62d1c7036cf60313a28b5227d54d  ${tea_file}" | sha256sum -c - >/dev/null 2>&1; then
+    echo "Error: tea CLI checksum verification failed" >&2
+    return 1
+  fi
+  chmod +x "$tea_file"
+
+  echo "Binaries downloaded and verified successfully"
+  return 0
+}
+
 # ── up command ────────────────────────────────────────────────────────────────
 
 disinto_up() {
@@ -2377,6 +2426,14 @@ disinto_up() {
     exit 1
   fi
 
+  # Pre-build: download binaries to docker/agents/bin/ to avoid network calls during docker build
+  echo "── Pre-build: downloading agent binaries ────────────────────────"
+  if ! download_agent_binaries; then
+    echo "Error: failed to download agent binaries" >&2
+    exit 1
+  fi
+  echo ""
+
   # Decrypt secrets to temp .env if SOPS available and .env.enc exists
   local tmp_env=""
   local enc_file="${FACTORY_ROOT}/.env.enc"
diff --git a/docker/agents/Dockerfile b/docker/agents/Dockerfile
index 0b6fad5..8d675d4 100644
--- a/docker/agents/Dockerfile
+++ b/docker/agents/Dockerfile
@@ -3,20 +3,16 @@ FROM debian:bookworm-slim
 RUN apt-get update && apt-get install -y --no-install-recommends \
     bash curl git jq tmux cron python3 python3-pip openssh-client ca-certificates age shellcheck \
     && pip3 install --break-system-packages networkx \
-    && curl -sL https://github.com/getsops/sops/releases/download/v3.9.4/sops-v3.9.4.linux.amd64 \
-       -o /usr/local/bin/sops \
-    && curl -sL https://github.com/getsops/sops/releases/download/v3.9.4/sops-v3.9.4.checksums.txt \
-       -o /tmp/sops-checksums.txt \
-    && sha256sum -c --ignore-missing /tmp/sops-checksums.txt \
-    && rm -f /tmp/sops-checksums.txt \
-    && chmod +x /usr/local/bin/sops \
     && rm -rf /var/lib/apt/lists/*
 
+# Pre-built binaries (copied from docker/agents/bin/)
+# SOPS — encrypted data decryption tool
+COPY bin/sops /usr/local/bin/sops
+RUN chmod +x /usr/local/bin/sops
+
 # tea CLI — official Gitea/Forgejo CLI for issue/label/comment operations
-# Checksum from https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-amd64.sha256
-RUN curl -sL https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-amd64 -o /usr/local/bin/tea \
-    && echo "be10cdf9a619e3c0f121df874960ed19b53e62d1c7036cf60313a28b5227d54d  /usr/local/bin/tea" | sha256sum -c - \
-    && chmod +x /usr/local/bin/tea
+COPY bin/tea /usr/local/bin/tea
+RUN chmod +x /usr/local/bin/tea
 
 # Claude CLI is mounted from the host via docker-compose volume.
 # No internet access to cli.anthropic.com required at build time.

From e617999074ba0a73d351f4706f05ff207014eb11 Mon Sep 17 00:00:00 2001
From: Agent <agent@example.com>
Date: Wed, 1 Apr 2026 18:16:56 +0000
Subject: [PATCH 3/9] fix: correct build context for agents Dockerfile

---
 bin/disinto              | 8 ++++++--
 docker/agents/Dockerfile | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bin/disinto b/bin/disinto
index 74faa68..3c7507d 100755
--- a/bin/disinto
+++ b/bin/disinto
@@ -226,7 +226,9 @@ services:
       - woodpecker
 
   agents:
-    build: ./docker/agents
+    build:
+      context: .
+      dockerfile: docker/agents/Dockerfile
     restart: unless-stopped
     security_opt:
       - apparmor=unconfined
@@ -256,7 +258,9 @@ services:
       - disinto-net
 
   runner:
-    build: ./docker/agents
+    build:
+      context: .
+      dockerfile: docker/agents/Dockerfile
     profiles: ["vault"]
     security_opt:
       - apparmor=unconfined
diff --git a/docker/agents/Dockerfile b/docker/agents/Dockerfile
index 8d675d4..31bcaa2 100644
--- a/docker/agents/Dockerfile
+++ b/docker/agents/Dockerfile
@@ -7,11 +7,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 # Pre-built binaries (copied from docker/agents/bin/)
 # SOPS — encrypted data decryption tool
-COPY bin/sops /usr/local/bin/sops
+COPY docker/agents/bin/sops /usr/local/bin/sops
 RUN chmod +x /usr/local/bin/sops
 
 # tea CLI — official Gitea/Forgejo CLI for issue/label/comment operations
-COPY bin/tea /usr/local/bin/tea
+COPY docker/agents/bin/tea /usr/local/bin/tea
 RUN chmod +x /usr/local/bin/tea
 
 # Claude CLI is mounted from the host via docker-compose volume.

From 1eefd5ac72f3eec3430e3d8ff7cd2ddf1d83d07e Mon Sep 17 00:00:00 2001
From: Agent <agent@example.com>
Date: Wed, 1 Apr 2026 18:28:45 +0000
Subject: [PATCH 4/9] fix: correct entrypoint.sh COPY path for root build
 context

---
 docker/agents/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/agents/Dockerfile b/docker/agents/Dockerfile
index 31bcaa2..f58af00 100644
--- a/docker/agents/Dockerfile
+++ b/docker/agents/Dockerfile
@@ -23,7 +23,7 @@ RUN useradd -m -u 1000 -s /bin/bash agent
 # Copy disinto code into the image
 COPY . /home/agent/disinto
 
-COPY entrypoint.sh /entrypoint.sh
+COPY docker/agents/entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
 # Entrypoint runs as root to start the cron daemon;

From 323b1d390ba0dea485c3c7263b27b6ce2cb5372c Mon Sep 17 00:00:00 2001
From: Agent <agent@example.com>
Date: Wed, 1 Apr 2026 19:00:12 +0000
Subject: [PATCH 5/9] fix: feat: Forgejo API mock server for CI smoke tests
 (#123)

---
 tests/mock-forgejo.py | 631 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 631 insertions(+)
 create mode 100755 tests/mock-forgejo.py

diff --git a/tests/mock-forgejo.py b/tests/mock-forgejo.py
new file mode 100755
index 0000000..456eabc
--- /dev/null
+++ b/tests/mock-forgejo.py
@@ -0,0 +1,631 @@
+#!/usr/bin/env python3
+"""Mock Forgejo API server for CI smoke tests.
+
+Implements 15 Forgejo API endpoints that disinto init calls.
+State stored in-memory (dicts), responds instantly.
+"""
+
+import base64
+import hashlib
+import json
+import os
+import re
+import signal
+import sys
+import uuid
+from http.server import HTTPServer, BaseHTTPRequestHandler
+from socketserver import ThreadingMixIn
+from urllib.parse import parse_qs, urlparse
+
+# Global state
+state = {
+    "users": {},          # key: username -> user object
+    "tokens": {},         # key: token_sha1 -> token object
+    "repos": {},          # key: "owner/repo" -> repo object
+    "orgs": {},           # key: orgname -> org object
+    "labels": {},         # key: "owner/repo" -> list of labels
+    "collaborators": {},  # key: "owner/repo" -> set of usernames
+    "protections": {},    # key: "owner/repo" -> list of protections
+    "oauth2_apps": [],    # list of oauth2 app objects
+}
+
+next_ids = {"users": 1, "tokens": 1, "repos": 1, "orgs": 1, "labels": 1, "oauth2_apps": 1}
+
+SHUTDOWN_REQUESTED = False
+
+
+def log_request(handler, method, path, status):
+    """Log request details."""
+    print(f"[{handler.log_date_time_string()}] {method} {path} {status}", file=sys.stderr)
+
+
+def json_response(handler, status, data):
+    """Send JSON response."""
+    body = json.dumps(data).encode("utf-8")
+    handler.send_response(status)
+    handler.send_header("Content-Type", "application/json")
+    handler.send_header("Content-Length", len(body))
+    handler.end_headers()
+    handler.wfile.write(body)
+
+
+def basic_auth_user(handler):
+    """Extract username from Basic auth header. Returns None if invalid."""
+    auth_header = handler.headers.get("Authorization", "")
+    if not auth_header.startswith("Basic "):
+        return None
+    try:
+        decoded = base64.b64decode(auth_header[6:]).decode("utf-8")
+        username, _ = decoded.split(":", 1)
+        return username
+    except Exception:
+        return None
+
+
+def token_auth_valid(handler):
+    """Check if Authorization header contains token. Doesn't validate value."""
+    auth_header = handler.headers.get("Authorization", "")
+    return auth_header.startswith("token ")
+
+
+def require_token(handler):
+    """Require token auth. Return user or None if invalid."""
+    if not token_auth_valid(handler):
+        return None
+    return True  # Any token is valid for mock purposes
+
+
+def require_basic_auth(handler, required_user=None):
+    """Require basic auth. Return username or None if invalid."""
+    username = basic_auth_user(handler)
+    if username is None:
+        return None
+    # Check user exists in state
+    if username not in state["users"]:
+        return None
+    if required_user and username != required_user:
+        return None
+    return username
+
+
+class ForgejoHandler(BaseHTTPRequestHandler):
+    """HTTP request handler for mock Forgejo API."""
+
+    def log_message(self, format, *args):
+        """Override to use our logging."""
+        pass  # We log in do_request
+
+    def do_request(self, method):
+        """Route request to appropriate handler."""
+        parsed = urlparse(self.path)
+        path = parsed.path
+        query = parse_qs(parsed.query)
+
+        log_request(self, method, self.path, "PENDING")
+
+        # Strip /api/v1/ prefix for routing
+        route_path = path
+        if route_path.startswith("/api/v1/"):
+            route_path = route_path[8:]
+
+        # Route to handler
+        try:
+            # First try exact match (with / replaced by _)
+            handler_path = route_path.replace("/", "_")
+            handler_name = f"handle_{method}_{handler_path}"
+            handler = getattr(self, handler_name, None)
+
+            if handler:
+                handler(query)
+            else:
+                # Try pattern matching for routes with dynamic segments
+                self._handle_patterned_route(method, route_path, query)
+        except Exception as e:
+            log_request(self, method, self.path, 500)
+            json_response(self, 500, {"message": str(e)})
+
+    def _handle_patterned_route(self, method, route_path, query):
+        """Handle routes with dynamic segments using pattern matching."""
+        # Define patterns: (regex, handler_name)
+        patterns = [
+            # Users patterns
+            (r"^users/([^/]+)$", f"handle_{method}_users_username"),
+            (r"^users/([^/]+)/tokens$", f"handle_{method}_users_username_tokens"),
+            # Repos patterns
+            (r"^repos/([^/]+)/([^/]+)$", f"handle_{method}_repos_owner_repo"),
+            (r"^repos/([^/]+)/([^/]+)/labels$", f"handle_{method}_repos_owner_repo_labels"),
+            (r"^repos/([^/]+)/([^/]+)/branch_protections$", f"handle_{method}_repos_owner_repo_branch_protections"),
+            (r"^repos/([^/]+)/([^/]+)/collaborators/([^/]+)$", f"handle_{method}_repos_owner_repo_collaborators_collaborator"),
+            # Org patterns
+            (r"^orgs/([^/]+)/repos$", f"handle_{method}_orgs_org_repos"),
+            # User patterns
+            (r"^user/repos$", f"handle_{method}_user_repos"),
+            (r"^user/applications/oauth2$", f"handle_{method}_user_applications_oauth2"),
+            # Admin patterns
+            (r"^admin/users$", f"handle_{method}_admin_users"),
+            (r"^admin/users/([^/]+)$", f"handle_{method}_admin_users_username"),
+            # Org patterns
+            (r"^orgs$", f"handle_{method}_orgs"),
+            # OAuth2 patterns
+            (r"^user/applications/oauth2$", f"handle_{method}_user_applications_oauth2"),
+        ]
+
+        for pattern, handler_name in patterns:
+            if re.match(pattern, route_path):
+                handler = getattr(self, handler_name, None)
+                if handler:
+                    handler(query)
+                    return
+
+        self.handle_404()
+
+    def do_GET(self):
+        self.do_request("GET")
+
+    def do_POST(self):
+        self.do_request("POST")
+
+    def do_PATCH(self):
+        self.do_request("PATCH")
+
+    def do_PUT(self):
+        self.do_request("PUT")
+
+    def handle_GET_version(self, query):
+        """GET /api/v1/version"""
+        json_response(self, 200, {"version": "11.0.0-mock"})
+
+    def handle_GET_users_username(self, query):
+        """GET /api/v1/users/{username}"""
+        # Extract username from path
+        parts = self.path.split("/")
+        if len(parts) >= 5:
+            username = parts[4]
+        else:
+            json_response(self, 404, {"message": "user does not exist"})
+            return
+
+        if username in state["users"]:
+            json_response(self, 200, state["users"][username])
+        else:
+            json_response(self, 404, {"message": "user does not exist"})
+
+    def handle_GET_repos_owner_repo(self, query):
+        """GET /api/v1/repos/{owner}/{repo}"""
+        parts = self.path.split("/")
+        if len(parts) >= 6:
+            owner = parts[4]
+            repo = parts[5]
+        else:
+            json_response(self, 404, {"message": "repository not found"})
+            return
+
+        key = f"{owner}/{repo}"
+        if key in state["repos"]:
+            json_response(self, 200, state["repos"][key])
+        else:
+            json_response(self, 404, {"message": "repository not found"})
+
+    def handle_GET_repos_owner_repo_labels(self, query):
+        """GET /api/v1/repos/{owner}/{repo}/labels"""
+        parts = self.path.split("/")
+        if len(parts) >= 6:
+            owner = parts[4]
+            repo = parts[5]
+        else:
+            json_response(self, 404, {"message": "repository not found"})
+            return
+
+        require_token(self)
+
+        key = f"{owner}/{repo}"
+        if key in state["labels"]:
+            json_response(self, 200, state["labels"][key])
+        else:
+            json_response(self, 200, [])
+
+    def handle_GET_user_applications_oauth2(self, query):
+        """GET /api/v1/user/applications/oauth2"""
+        require_token(self)
+        json_response(self, 200, state["oauth2_apps"])
+
+    def handle_GET_mock_shutdown(self, query):
+        """GET /mock/shutdown"""
+        global SHUTDOWN_REQUESTED
+        SHUTDOWN_REQUESTED = True
+        json_response(self, 200, {"status": "shutdown"})
+
+    def handle_POST_admin_users(self, query):
+        """POST /api/v1/admin/users"""
+        require_token(self)
+
+        content_length = int(self.headers.get("Content-Length", 0))
+        body = self.rfile.read(content_length).decode("utf-8")
+        data = json.loads(body) if body else {}
+
+        username = data.get("username")
+        email = data.get("email")
+
+        if not username or not email:
+            json_response(self, 400, {"message": "username and email are required"})
+            return
+
+        user_id = next_ids["users"]
+        next_ids["users"] += 1
+
+        user = {
+            "id": user_id,
+            "login": username,
+            "email": email,
+            "full_name": data.get("full_name", ""),
+            "is_admin": data.get("admin", False),
+            "must_change_password": data.get("must_change_password", False),
+            "login_name": data.get("login_name", username),
+            "visibility": data.get("visibility", "public"),
+            "avatar_url": f"https://seccdn.libravatar.org/avatar/{hashlib.md5(email.encode()).hexdigest()}",
+        }
+
+        state["users"][username] = user
+        json_response(self, 201, user)
+
+    def handle_POST_users_username_tokens(self, query):
+        """POST /api/v1/users/{username}/tokens"""
+        username = require_basic_auth(self)
+        if not username:
+            json_response(self, 401, {"message": "invalid authentication"})
+            return
+
+        content_length = int(self.headers.get("Content-Length", 0))
+        body = self.rfile.read(content_length).decode("utf-8")
+        data = json.loads(body) if body else {}
+
+        token_name = data.get("name")
+        if not token_name:
+            json_response(self, 400, {"message": "name is required"})
+            return
+
+        token_id = next_ids["tokens"]
+        next_ids["tokens"] += 1
+
+        # Deterministic token: sha256(username + name)[:40]
+        token_str = hashlib.sha256(f"{username}{token_name}".encode()).hexdigest()[:40]
+
+        token = {
+            "id": token_id,
+            "name": token_name,
+            "sha1": token_str,
+            "scopes": data.get("scopes", ["all"]),
+            "created_at": "2026-04-01T00:00:00Z",
+            "expires_at": None,
+        }
+
+        state["tokens"][token_str] = token
+        json_response(self, 201, token)
+
+    def handle_POST_orgs(self, query):
+        """POST /api/v1/orgs"""
+        require_token(self)
+
+        content_length = int(self.headers.get("Content-Length", 0))
+        body = self.rfile.read(content_length).decode("utf-8")
+        data = json.loads(body) if body else {}
+
+        username = data.get("username")
+        if not username:
+            json_response(self, 400, {"message": "username is required"})
+            return
+
+        org_id = next_ids["orgs"]
+        next_ids["orgs"] += 1
+
+        org = {
+            "id": org_id,
+            "username": username,
+            "full_name": username,
+            "avatar_url": f"https://seccdn.libravatar.org/avatar/{hashlib.md5(username.encode()).hexdigest()}",
+            "visibility": data.get("visibility", "public"),
+        }
+
+        state["orgs"][username] = org
+        json_response(self, 201, org)
+
+    def handle_POST_orgs_org_repos(self, query):
+        """POST /api/v1/orgs/{org}/repos"""
+        require_token(self)
+
+        parts = self.path.split("/")
+        if len(parts) >= 6:
+            org = parts[4]
+        else:
+            json_response(self, 404, {"message": "organization not found"})
+            return
+
+        content_length = int(self.headers.get("Content-Length", 0))
+        body = self.rfile.read(content_length).decode("utf-8")
+        data = json.loads(body) if body else {}
+
+        repo_name = data.get("name")
+        if not repo_name:
+            json_response(self, 400, {"message": "name is required"})
+            return
+
+        repo_id = next_ids["repos"]
+        next_ids["repos"] += 1
+
+        key = f"{org}/{repo_name}"
+        repo = {
+            "id": repo_id,
+            "full_name": key,
+            "name": repo_name,
+            "owner": {"id": state["orgs"][org]["id"], "login": org},
+            "empty": False,
+            "default_branch": data.get("default_branch", "main"),
+            "description": data.get("description", ""),
+            "private": data.get("private", False),
+            "html_url": f"https://example.com/{key}",
+            "ssh_url": f"git@example.com:{key}.git",
+            "clone_url": f"https://example.com/{key}.git",
+            "created_at": "2026-04-01T00:00:00Z",
+        }
+
+        state["repos"][key] = repo
+        json_response(self, 201, repo)
+
+    def handle_POST_user_repos(self, query):
+        """POST /api/v1/user/repos"""
+        require_token(self)
+
+        content_length = int(self.headers.get("Content-Length", 0))
+        body = self.rfile.read(content_length).decode("utf-8")
+        data = json.loads(body) if body else {}
+
+        repo_name = data.get("name")
+        if not repo_name:
+            json_response(self, 400, {"message": "name is required"})
+            return
+
+        # Get authenticated user from token
+        auth_header = self.headers.get("Authorization", "")
+        token = auth_header.split(" ", 1)[1] if " " in auth_header else ""
+
+        # Find user by token
+        owner = None
+        for uname, tok in state["tokens"].items():
+            if tok.get("sha1") == token:
+                owner = uname
+                break
+
+        if not owner:
+            json_response(self, 401, {"message": "invalid token"})
+            return
+
+        repo_id = next_ids["repos"]
+        next_ids["repos"] += 1
+
+        key = f"{owner}/{repo_name}"
+        repo = {
+            "id": repo_id,
+            "full_name": key,
+            "name": repo_name,
+            "owner": {"id": state["users"].get(owner, {}).get("id", 0), "login": owner},
+            "empty": False,
+            "default_branch": data.get("default_branch", "main"),
+            "description": data.get("description", ""),
+            "private": data.get("private", False),
+            "html_url": f"https://example.com/{key}",
+            "ssh_url": f"git@example.com:{key}.git",
+            "clone_url": f"https://example.com/{key}.git",
+            "created_at": "2026-04-01T00:00:00Z",
+        }
+
+        state["repos"][key] = repo
+        json_response(self, 201, repo)
+
+    def handle_POST_repos_owner_repo_labels(self, query):
+        """POST /api/v1/repos/{owner}/{repo}/labels"""
+        require_token(self)
+
+        parts = self.path.split("/")
+        if len(parts) >= 6:
+            owner = parts[4]
+            repo = parts[5]
+        else:
+            json_response(self, 404, {"message": "repository not found"})
+            return
+
+        content_length = int(self.headers.get("Content-Length", 0))
+        body = self.rfile.read(content_length).decode("utf-8")
+        data = json.loads(body) if body else {}
+
+        label_name = data.get("name")
+        label_color = data.get("color")
+
+        if not label_name or not label_color:
+            json_response(self, 400, {"message": "name and color are required"})
+            return
+
+        label_id = next_ids["labels"]
+        next_ids["labels"] += 1
+
+        key = f"{owner}/{repo}"
+        label = {
+            "id": label_id,
+            "name": label_name,
+            "color": label_color,
+            "description": data.get("description", ""),
+            "url": f"https://example.com/api/v1/repos/{key}/labels/{label_id}",
+        }
+
+        if key not in state["labels"]:
+            state["labels"][key] = []
+        state["labels"][key].append(label)
+        json_response(self, 201, label)
+
+    def handle_POST_repos_owner_repo_branch_protections(self, query):
+        """POST /api/v1/repos/{owner}/{repo}/branch_protections"""
+        require_token(self)
+
+        parts = self.path.split("/")
+        if len(parts) >= 6:
+            owner = parts[4]
+            repo = parts[5]
+        else:
+            json_response(self, 404, {"message": "repository not found"})
+            return
+
+        content_length = int(self.headers.get("Content-Length", 0))
+        body = self.rfile.read(content_length).decode("utf-8")
+        data = json.loads(body) if body else {}
+
+        branch_name = data.get("branch_name", "main")
+        key = f"{owner}/{repo}"
+
+        # Generate unique ID for protection
+        if key in state["protections"]:
+            protection_id = len(state["protections"][key]) + 1
+        else:
+            protection_id = 1
+
+        protection = {
+            "id": protection_id,
+            "repo_id": state["repos"].get(key, {}).get("id", 0),
+            "branch_name": branch_name,
+            "rule_name": data.get("rule_name", branch_name),
+            "enable_push": data.get("enable_push", False),
+            "enable_merge_whitelist": data.get("enable_merge_whitelist", True),
+            "merge_whitelist_usernames": data.get("merge_whitelist_usernames", ["admin"]),
+            "required_approvals": data.get("required_approvals", 1),
+            "apply_to_admins": data.get("apply_to_admins", True),
+        }
+
+        if key not in state["protections"]:
+            state["protections"][key] = []
+        state["protections"][key].append(protection)
+        json_response(self, 201, protection)
+
+    def handle_POST_user_applications_oauth2(self, query):
+        """POST /api/v1/user/applications/oauth2"""
+        require_token(self)
+
+        content_length = int(self.headers.get("Content-Length", 0))
+        body = self.rfile.read(content_length).decode("utf-8")
+        data = json.loads(body) if body else {}
+
+        app_name = data.get("name")
+        if not app_name:
+            json_response(self, 400, {"message": "name is required"})
+            return
+
+        app_id = next_ids["oauth2_apps"]
+        next_ids["oauth2_apps"] += 1
+
+        app = {
+            "id": app_id,
+            "name": app_name,
+            "client_id": str(uuid.uuid4()),
+            "client_secret": hashlib.sha256(str(uuid.uuid4()).encode()).hexdigest(),
+            "redirect_uris": data.get("redirect_uris", []),
+            "confidential_client": data.get("confidential_client", True),
+            "created_at": "2026-04-01T00:00:00Z",
+        }
+
+        state["oauth2_apps"].append(app)
+        json_response(self, 201, app)
+
+    def handle_PATCH_admin_users_username(self, query):
+        """PATCH /api/v1/admin/users/{username}"""
+        if not require_token(self):
+            json_response(self, 401, {"message": "invalid authentication"})
+            return
+
+        parts = self.path.split("/")
+        if len(parts) >= 6:
+            username = parts[5]
+        else:
+            json_response(self, 404, {"message": "user does not exist"})
+            return
+
+        if username not in state["users"]:
+            json_response(self, 404, {"message": "user does not exist"})
+            return
+
+        content_length = int(self.headers.get("Content-Length", 0))
+        body = self.rfile.read(content_length).decode("utf-8")
+        data = json.loads(body) if body else {}
+
+        user = state["users"][username]
+        for key, value in data.items():
+            # Map 'admin' to 'is_admin' for consistency
+            update_key = 'is_admin' if key == 'admin' else key
+            if update_key in user:
+                user[update_key] = value
+
+        json_response(self, 200, user)
+
+    def handle_PUT_repos_owner_repo_collaborators_collaborator(self, query):
+        """PUT /api/v1/repos/{owner}/{repo}/collaborators/{collaborator}"""
+        require_token(self)
+
+        parts = self.path.split("/")
+        if len(parts) >= 7:
+            owner = parts[4]
+            repo = parts[5]
+            collaborator = parts[6]
+        else:
+            json_response(self, 404, {"message": "repository not found"})
+            return
+
+        content_length = int(self.headers.get("Content-Length", 0))
+        body = self.rfile.read(content_length).decode("utf-8")
+        data = json.loads(body) if body else {}
+
+        key = f"{owner}/{repo}"
+        if key not in state["collaborators"]:
+            state["collaborators"][key] = set()
+        state["collaborators"][key].add(collaborator)
+
+        self.send_response(204)
+        self.send_header("Content-Length", 0)
+        self.end_headers()
+
+    def handle_404(self):
+        """Return 404 for unknown routes."""
+        json_response(self, 404, {"message": "route not found"})
+
+
+class ThreadingHTTPServer(ThreadingMixIn, HTTPServer):
+    """Threaded HTTP server for handling concurrent requests."""
+    daemon_threads = True
+
+
+def main():
+    """Start the mock server."""
+    global SHUTDOWN_REQUESTED
+
+    port = int(os.environ.get("MOCK_FORGE_PORT", 3000))
+    server = ThreadingHTTPServer(("0.0.0.0", port), ForgejoHandler)
+    try:
+        server.socket.setsockopt(2, 4, 1)  # SO_REUSEADDR
+    except OSError:
+        pass  # Not all platforms support this
+
+    print(f"Mock Forgejo server starting on port {port}", file=sys.stderr)
+
+    def shutdown_handler(signum, frame):
+        global SHUTDOWN_REQUESTED
+        SHUTDOWN_REQUESTED = True
+
+    signal.signal(signal.SIGTERM, shutdown_handler)
+    signal.signal(signal.SIGINT, shutdown_handler)
+
+    try:
+        server.serve_forever()
+    except KeyboardInterrupt:
+        pass
+    finally:
+        server.shutdown()
+        print("Mock Forgejo server stopped", file=sys.stderr)
+
+
+if __name__ == "__main__":
+    main()

From ac85f86cd9d9fb35282fbf6b692592dc608c21b4 Mon Sep 17 00:00:00 2001
From: Agent <agent@example.com>
Date: Wed, 1 Apr 2026 19:10:14 +0000
Subject: [PATCH 6/9] fix: mock-forgejo.py - correct collaborator index and
 user/repos owner lookup

- Fix collaborator PUT: use parts[7] instead of parts[6]
- Fix user/repos: store username in token object and use it for lookup
- Fix /mock/shutdown: strip leading slash unconditionally
- Fix SIGTERM: call server.shutdown() in a thread
- Use socket module constants for setsockopt
- Remove duplicate pattern
---
 tests/mock-forgejo.py | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/tests/mock-forgejo.py b/tests/mock-forgejo.py
index 456eabc..df05db7 100755
--- a/tests/mock-forgejo.py
+++ b/tests/mock-forgejo.py
@@ -11,7 +11,9 @@ import json
 import os
 import re
 import signal
+import socket
 import sys
+import threading
 import uuid
 from http.server import HTTPServer, BaseHTTPRequestHandler
 from socketserver import ThreadingMixIn
@@ -103,10 +105,12 @@ class ForgejoHandler(BaseHTTPRequestHandler):
 
         log_request(self, method, self.path, "PENDING")
 
-        # Strip /api/v1/ prefix for routing
+        # Strip /api/v1/ prefix for routing (or leading slash for other routes)
         route_path = path
         if route_path.startswith("/api/v1/"):
             route_path = route_path[8:]
+        elif route_path.startswith("/"):
+            route_path = route_path.lstrip("/")
 
         # Route to handler
         try:
@@ -146,8 +150,6 @@ class ForgejoHandler(BaseHTTPRequestHandler):
             (r"^admin/users/([^/]+)$", f"handle_{method}_admin_users_username"),
             # Org patterns
             (r"^orgs$", f"handle_{method}_orgs"),
-            # OAuth2 patterns
-            (r"^user/applications/oauth2$", f"handle_{method}_user_applications_oauth2"),
         ]
 
         for pattern, handler_name in patterns:
@@ -297,6 +299,7 @@ class ForgejoHandler(BaseHTTPRequestHandler):
             "scopes": data.get("scopes", ["all"]),
             "created_at": "2026-04-01T00:00:00Z",
             "expires_at": None,
+            "username": username,  # Store username for lookup
         }
 
         state["tokens"][token_str] = token
@@ -388,11 +391,11 @@ class ForgejoHandler(BaseHTTPRequestHandler):
         auth_header = self.headers.get("Authorization", "")
         token = auth_header.split(" ", 1)[1] if " " in auth_header else ""
 
-        # Find user by token
+        # Find user by token (use stored username field)
         owner = None
-        for uname, tok in state["tokens"].items():
-            if tok.get("sha1") == token:
-                owner = uname
+        for tok_sha1, tok in state["tokens"].items():
+            if tok_sha1 == token:
+                owner = tok.get("username")
                 break
 
         if not owner:
@@ -567,10 +570,10 @@ class ForgejoHandler(BaseHTTPRequestHandler):
         require_token(self)
 
         parts = self.path.split("/")
-        if len(parts) >= 7:
+        if len(parts) >= 8:
             owner = parts[4]
             repo = parts[5]
-            collaborator = parts[6]
+            collaborator = parts[7]
         else:
             json_response(self, 404, {"message": "repository not found"})
             return
@@ -605,7 +608,7 @@ def main():
     port = int(os.environ.get("MOCK_FORGE_PORT", 3000))
     server = ThreadingHTTPServer(("0.0.0.0", port), ForgejoHandler)
     try:
-        server.socket.setsockopt(2, 4, 1)  # SO_REUSEADDR
+        server.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
     except OSError:
         pass  # Not all platforms support this
 
@@ -614,6 +617,8 @@ def main():
     def shutdown_handler(signum, frame):
         global SHUTDOWN_REQUESTED
         SHUTDOWN_REQUESTED = True
+        # Can't call server.shutdown() directly from signal handler in threaded server
+        threading.Thread(target=server.shutdown, daemon=True).start()
 
     signal.signal(signal.SIGTERM, shutdown_handler)
     signal.signal(signal.SIGINT, shutdown_handler)

From 7eacb27c627a836c4488853158b60a51b196408b Mon Sep 17 00:00:00 2001
From: Agent <agent@example.com>
Date: Wed, 1 Apr 2026 19:36:04 +0000
Subject: [PATCH 7/9] =?UTF-8?q?fix:=20refactor:=20simplify=20gardener=20fo?=
 =?UTF-8?q?rmula=20=E2=80=94=20remove=20AD=20check,=20portfolio,=20blocked?=
 =?UTF-8?q?-review,=20stale-PR=20(#127)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 formulas/run-gardener.toml | 210 ++++++-------------------------------
 gardener/AGENTS.md         |   5 +-
 2 files changed, 33 insertions(+), 182 deletions(-)

diff --git a/formulas/run-gardener.toml b/formulas/run-gardener.toml
index a262ac2..58eb82b 100644
--- a/formulas/run-gardener.toml
+++ b/formulas/run-gardener.toml
@@ -1,16 +1,15 @@
 # formulas/run-gardener.toml — Gardener housekeeping formula
 #
 # Defines the gardener's complete run: grooming (Claude session via
-# gardener-run.sh) + blocked-review + AGENTS.md maintenance + final
-# commit-and-pr.
+# gardener-run.sh) + AGENTS.md maintenance + final commit-and-pr.
 #
-# No memory, no journal. The gardener does mechanical housekeeping
-# based on current state — it doesn't need to remember past runs.
+# Gardener has journaling via .profile (issue #97), so it learns from
+# past runs and improves over time.
 #
-# Steps: preflight → grooming → dust-bundling → blocked-review → stale-pr-recycle → agents-update → commit-and-pr
+# Steps: preflight -> grooming -> dust-bundling -> agents-update -> commit-and-pr
 
 name        = "run-gardener"
-description = "Mechanical housekeeping: grooming, blocked review, docs update"
+description = "Mechanical housekeeping: grooming, dust bundling, docs update"
 version     = 1
 
 [context]
@@ -120,15 +119,17 @@ DUST (trivial — single-line edit, rename, comment, style, whitespace):
   of 3+ into one backlog issue.
 
 VAULT (needs human decision or external resource):
-  File a vault procurement item at $OPS_REPO_ROOT/vault/pending/<id>.md:
-    # <What decision or resource is needed>
-    ## What
-    <description>
-    ## Why
-    <which issue this unblocks>
-    ## Unblocks
-    - #NNN — <title>
-  Log: echo "VAULT: filed $OPS_REPO_ROOT/vault/pending/<id>.md for #NNN — <reason>" >> "$RESULT_FILE"
+  File a vault procurement item using vault_request():
+    source "$(dirname "$0")/../lib/vault.sh"
+    TOML_CONTENT="# Vault action: <action_id>
+context = \"<description of what decision/resource is needed>\"
+unblocks = [\"#NNN\"]
+
+[execution]
+# Commands to run after approval
+"
+    PR_NUM=$(vault_request "<action_id>" "$TOML_CONTENT")
+    echo "VAULT: filed PR #${PR_NUM} for #NNN — <reason>" >> "$RESULT_FILE"
 
 CLEAN (only if truly nothing to do):
   echo 'CLEAN' >> "$RESULT_FILE"
@@ -142,25 +143,7 @@ Sibling dependency rule (CRITICAL):
   NEVER add bidirectional ## Dependencies between siblings (creates deadlocks).
   Use ## Related for cross-references: "## Related\n- #NNN (sibling)"
 
-7. Architecture decision alignment check (AD check):
-   For each open issue labeled 'backlog', check whether the issue
-   contradicts any architecture decision listed in the
-   ## Architecture Decisions section of AGENTS.md.
-   Read AGENTS.md and extract the AD table. For each backlog issue,
-   compare the issue title and body against each AD. If an issue
-   clearly violates an AD:
-   a. Write a comment action to the manifest:
-        echo '{"action":"comment","issue":NNN,"body":"Closing: violates AD-NNN (<decision summary>). See AGENTS.md § Architecture Decisions."}' >> "$PROJECT_REPO_ROOT/gardener/pending-actions.jsonl"
-   b. Write a close action to the manifest:
-        echo '{"action":"close","issue":NNN,"reason":"violates AD-NNN"}' >> "$PROJECT_REPO_ROOT/gardener/pending-actions.jsonl"
-   c. Log to the result file:
-        echo "ACTION: closed #NNN — violates AD-NNN" >> "$RESULT_FILE"
-
-   Only close for clear, unambiguous violations. If the issue is
-   borderline or could be interpreted as compatible, leave it open
-   and file a VAULT item for human decision instead.
-
-8. Quality gate — backlog label enforcement:
+6. Quality gate — backlog label enforcement:
    For each open issue labeled 'backlog', verify it has the required
    sections for dev-agent pickup:
    a. Acceptance criteria — body must contain at least one checkbox
@@ -181,28 +164,11 @@ Sibling dependency rule (CRITICAL):
    Well-structured issues (both sections present) are left untouched —
    they are ready for dev-agent pickup.
 
-9. Portfolio lifecycle — maintain ## Addressables and ## Observables in AGENTS.md:
-   Read the current Addressables and Observables tables from AGENTS.md.
-
-   a. ADD: if a recently closed issue shipped a new deployment, listing,
-      package, or external presence not yet in the table, add a row.
-   b. PROMOTE: if an addressable now has measurement wired (an evidence
-      process reads from it), move it to the Observables section.
-   c. REMOVE: if an addressable was decommissioned (vision change
-      invalidated it, service shut down), remove the row and log why.
-   d. FLAG: if an addressable has been live > 2 weeks with Observable? = No
-      and no evidence process is planned, add a comment to the result file:
-        echo "ACTION: flagged addressable '<name>' — live >2 weeks, no observation path" >> "$RESULT_FILE"
-
-   Stage AGENTS.md if changed — the commit-and-pr step handles the actual commit.
-
 Processing order:
   1. Handle PRIORITY_blockers_starving_factory first — promote or resolve
-  2. AD alignment check — close backlog issues that violate architecture decisions
-  3. Quality gate — strip backlog from issues missing acceptance criteria or affected files
-  4. Process tech-debt issues by score (impact/effort)
-  5. Classify remaining items as dust or route to vault
-  6. Portfolio lifecycle — update addressables/observables tables
+  2. Quality gate — strip backlog from issues missing acceptance criteria or affected files
+  3. Process tech-debt issues by score (impact/effort)
+  4. Classify remaining items as dust or route to vault
 
 Do NOT bundle dust yourself — the dust-bundling step handles accumulation,
 dedup, TTL expiry, and bundling into backlog issues.
@@ -257,126 +223,12 @@ session, so changes there would be lost.
 
 5. If no DUST items were emitted and no groups are ripe, skip this step.
 
-CRITICAL: If this step fails, log the failure and move on to blocked-review.
+CRITICAL: If this step fails, log the failure and move on.
 """
 needs = ["grooming"]
 
 # ─────────────────────────────────────────────────────────────────────
-# Step 4: blocked-review — triage blocked issues
-# ─────────────────────────────────────────────────────────────────────
-
-[[steps]]
-id    = "blocked-review"
-title = "Review issues labeled blocked"
-description = """
-Review all issues labeled 'blocked' and decide their fate.
-(See issue #352 for the blocked label convention.)
-
-1. Fetch all blocked issues:
-     curl -sf -H "Authorization: token $FORGE_TOKEN" \
-       "$FORGE_API/issues?state=open&type=issues&labels=blocked&limit=50"
-
-2. For each blocked issue, read the full body and comments:
-     curl -sf -H "Authorization: token $FORGE_TOKEN" \
-       "$FORGE_API/issues/<number>"
-     curl -sf -H "Authorization: token $FORGE_TOKEN" \
-       "$FORGE_API/issues/<number>/comments"
-
-3. Check dependencies — extract issue numbers from ## Dependencies /
-   ## Depends on / ## Blocked by sections. For each dependency:
-     curl -sf -H "Authorization: token $FORGE_TOKEN" \
-       "$FORGE_API/issues/<dep_number>"
-   Check if the dependency is now closed.
-
-4. For each blocked issue, choose ONE action:
-
-   UNBLOCK — all dependencies are now closed or the blocking condition resolved:
-   a. Write a remove_label action to the manifest:
-        echo '{"action":"remove_label","issue":NNN,"label":"blocked"}' >> "$PROJECT_REPO_ROOT/gardener/pending-actions.jsonl"
-   b. Write a comment action to the manifest:
-        echo '{"action":"comment","issue":NNN,"body":"Unblocked: <explanation of what resolved the blocker>"}' >> "$PROJECT_REPO_ROOT/gardener/pending-actions.jsonl"
-
-   NEEDS HUMAN — blocking condition is ambiguous, requires architectural
-   decision, or involves external factors:
-   a. Write a comment action to the manifest:
-        echo '{"action":"comment","issue":NNN,"body":"<diagnostic: what you found and what decision is needed>"}' >> "$PROJECT_REPO_ROOT/gardener/pending-actions.jsonl"
-   b. Leave the 'blocked' label in place
-
-   CLOSE — issue is stale (blocked 30+ days with no progress on blocker),
-   the blocker is wontfix, or the issue is no longer relevant:
-   a. Write a comment action to the manifest:
-        echo '{"action":"comment","issue":NNN,"body":"Closing: <reason — stale blocker, no longer relevant, etc.>"}' >> "$PROJECT_REPO_ROOT/gardener/pending-actions.jsonl"
-   b. Write a close action to the manifest:
-        echo '{"action":"close","issue":NNN,"reason":"<stale blocker / no longer relevant / etc.>"}' >> "$PROJECT_REPO_ROOT/gardener/pending-actions.jsonl"
-
-CRITICAL: If this step fails, log the failure and move on.
-"""
-needs = ["dust-bundling"]
-
-# ─────────────────────────────────────────────────────────────────────
-# Step 5: stale-pr-recycle — recycle stale failed PRs back to backlog
-# ─────────────────────────────────────────────────────────────────────
-
-[[steps]]
-id    = "stale-pr-recycle"
-title = "Recycle stale failed PRs back to backlog"
-description = """
-Detect open PRs where CI has failed and no work has happened in 24+ hours.
-These represent abandoned dev-agent attempts — recycle them so the pipeline
-can retry with a fresh session.
-
-1. Fetch all open PRs:
-     curl -sf -H "Authorization: token $FORGE_TOKEN" \
-       "$FORGE_API/pulls?state=open&limit=50"
-
-2. For each PR, check all four conditions before recycling:
-
-   a. CI failed — get the HEAD SHA from the PR's head.sha field, then:
-        curl -sf -H "Authorization: token $FORGE_TOKEN" \
-          "$FORGE_API/commits/<head_sha>/status"
-      Only proceed if the combined state is "failure" or "error".
-      Skip PRs with "success", "pending", or no CI status.
-
-   b. Last push > 24 hours ago — get the commit details:
-        curl -sf -H "Authorization: token $FORGE_TOKEN" \
-          "$FORGE_API/git/commits/<head_sha>"
-      Parse the committer.date field. Only proceed if it is older than:
-        $(date -u -d '24 hours ago' +%Y-%m-%dT%H:%M:%SZ)
-
-   c. Linked issue exists — extract the issue number from the PR body.
-      Look for "Fixes #NNN" or "ixes #NNN" patterns (case-insensitive).
-      If no linked issue found, skip this PR (cannot reset labels).
-
-   d. No active tmux session — check:
-        tmux has-session -t "dev-${PROJECT_NAME}-<issue_number>" 2>/dev/null
-      If a session exists, someone may still be working — skip this PR.
-
-3. For each PR that passes all checks (failed CI, 24+ hours stale,
-   linked issue found, no active session):
-
-   a. Write a comment on the PR explaining the recycle:
-        echo '{"action":"comment","issue":<pr_number>,"body":"Recycling stale CI failure for fresh attempt. Previous PR: #<pr_number>"}' >> "$PROJECT_REPO_ROOT/gardener/pending-actions.jsonl"
-
-   b. Write a close_pr action:
-        echo '{"action":"close_pr","pr":<pr_number>}' >> "$PROJECT_REPO_ROOT/gardener/pending-actions.jsonl"
-
-   c. Remove the in-progress label from the linked issue:
-        echo '{"action":"remove_label","issue":<issue_number>,"label":"in-progress"}' >> "$PROJECT_REPO_ROOT/gardener/pending-actions.jsonl"
-
-   d. Add the backlog label to the linked issue:
-        echo '{"action":"add_label","issue":<issue_number>,"label":"backlog"}' >> "$PROJECT_REPO_ROOT/gardener/pending-actions.jsonl"
-
-   e. Log to result file:
-        echo "ACTION: recycled PR #<pr_number> (linked issue #<issue_number>) — stale CI failure" >> "$RESULT_FILE"
-
-4. If no stale failed PRs found, skip this step.
-
-CRITICAL: If this step fails, log the failure and move on to agents-update.
-"""
-needs = ["blocked-review"]
-
-# ─────────────────────────────────────────────────────────────────────
-# Step 6: agents-update — AGENTS.md watermark staleness + size enforcement
+# Step 4: agents-update — AGENTS.md watermark staleness + size enforcement
 # ─────────────────────────────────────────────────────────────────────
 
 [[steps]]
@@ -497,10 +349,10 @@ needed. You wouldn't dump a 500-page wiki on a new hire's first morning.
 CRITICAL: If this step fails for any reason, log the failure and move on.
 Do NOT let an AGENTS.md failure prevent the commit-and-pr step.
 """
-needs = ["stale-pr-recycle"]
+needs = ["dust-bundling"]
 
 # ─────────────────────────────────────────────────────────────────────
-# Step 7: commit-and-pr — single commit with all file changes
+# Step 5: commit-and-pr — single commit with all file changes
 # ─────────────────────────────────────────────────────────────────────
 
 [[steps]]
@@ -554,16 +406,14 @@ executes them after the PR merges.
         PR_NUMBER=$(echo "$PR_RESPONSE" | jq -r '.number')
    h. Save PR number for orchestrator tracking:
         echo "$PR_NUMBER" > /tmp/gardener-pr-${PROJECT_NAME}.txt
-   i. Signal the orchestrator to monitor CI:
-        echo "PHASE:awaiting_ci" > "$PHASE_FILE"
-   j. STOP and WAIT. Do NOT return to the primary branch.
-      The orchestrator polls CI, injects results and review feedback.
-      When you receive injected CI or review feedback, follow its
-      instructions, then write PHASE:awaiting_ci and wait again.
+   i. The orchestrator handles CI/review via pr_walk_to_merge.
+      The gardener stays alive to inject CI results and review feedback
+      as they come in, then executes the pending-actions manifest after merge.
 
 4. If no file changes existed (step 2 found nothing):
-     echo "PHASE:done" > "$PHASE_FILE"
+     # Nothing to commit — the gardener has no work to do this run.
+     exit 0
 
-5. If PR creation fails, log the error and write PHASE:failed.
+5. If PR creation fails, log the error and exit.
 """
 needs = ["agents-update"]
diff --git a/gardener/AGENTS.md b/gardener/AGENTS.md
index c9ba3b1..cd473ba 100644
--- a/gardener/AGENTS.md
+++ b/gardener/AGENTS.md
@@ -22,7 +22,8 @@ directly from cron like the planner, predictor, and supervisor.
   `PHASE:awaiting_ci` — injects CI results and review feedback, re-signals
   `PHASE:awaiting_ci` after fixes, signals `PHASE:awaiting_review` on CI pass.
   Executes pending-actions manifest after PR merge.
-- `formulas/run-gardener.toml` — Execution spec: preflight, grooming, dust-bundling, blocked-review, agents-update, commit-and-pr
+- `formulas/run-gardener.toml` — Execution spec: preflight, grooming, dust-bundling,
+  agents-update, commit-and-pr
 - `gardener/pending-actions.json` — Manifest of deferred repo actions (label changes,
   closures, comments, issue creation). Written during grooming steps, committed to the
   PR, reviewed alongside AGENTS.md changes, executed by gardener-run.sh after merge.
@@ -34,7 +35,7 @@ directly from cron like the planner, predictor, and supervisor.
 **Lifecycle**: gardener-run.sh (cron 0,6,12,18) → `check_active gardener` → lock + memory guard →
 load formula + context → create tmux session →
 Claude grooms backlog (writes proposed actions to manifest), bundles dust,
-reviews blocked issues, updates AGENTS.md, commits manifest + docs to PR →
+updates AGENTS.md, commits manifest + docs to PR →
 `PHASE:awaiting_ci` (stays alive) → CI pass → `PHASE:awaiting_review` →
 review feedback → address + re-signal → merge → gardener-run.sh executes
 manifest actions via API → `PHASE:done`. When blocked on external resources

From e40ea2acf289d352d911b8de3d1055f65b89568b Mon Sep 17 00:00:00 2001
From: Agent <agent@example.com>
Date: Wed, 1 Apr 2026 20:09:34 +0000
Subject: [PATCH 8/9] =?UTF-8?q?fix:=20bug:=20dispatcher=20PR=20lookup=20fa?=
 =?UTF-8?q?ils=20=E2=80=94=20--diff-filter=3DA=20misses=20merge=20commits?=
 =?UTF-8?q?=20(#129)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/disinto                    |  6 +++
 docker/edge/dispatcher.sh      | 79 +++++++++++++++++-----------------
 docker/edge/entrypoint-edge.sh |  3 ++
 3 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/bin/disinto b/bin/disinto
index 3c7507d..323dce7 100755
--- a/bin/disinto
+++ b/bin/disinto
@@ -285,6 +285,12 @@ services:
     environment:
       - DISINTO_VERSION=${DISINTO_VERSION:-main}
       - FORGE_URL=http://forgejo:3000
+      - FORGE_REPO=johba/disinto
+      - FORGE_OPS_REPO=johba/disinto-ops
+      - FORGE_TOKEN=${FORGE_TOKEN:-}
+      - OPS_REPO_ROOT=/opt/disinto-ops
+      - PROJECT_REPO_ROOT=/opt/disinto
+      - PRIMARY_BRANCH=main
     volumes:
       - ./docker/Caddyfile:/etc/caddy/Caddyfile
       - caddy_data:/data
diff --git a/docker/edge/dispatcher.sh b/docker/edge/dispatcher.sh
index 109978a..c06c082 100755
--- a/docker/edge/dispatcher.sh
+++ b/docker/edge/dispatcher.sh
@@ -109,33 +109,33 @@ get_pr_for_file() {
   local file_name
   file_name=$(basename "$file_path")
 
-  # Get recent commits that added this specific file
-  local commits
-  commits=$(git -C "$OPS_REPO_ROOT" log --oneline --diff-filter=A -- "vault/actions/${file_name}" 2>/dev/null | head -20) || true
+  # Step 1: find the commit that added the file
+  local add_commit
+  add_commit=$(git -C "$OPS_REPO_ROOT" log --diff-filter=A --format="%H" \
+    -- "vault/actions/${file_name}" 2>/dev/null | head -1)
 
-  if [ -z "$commits" ]; then
+  if [ -z "$add_commit" ]; then
     return 1
   fi
 
-  # For each commit, check if it's a merge commit from a PR
-  while IFS= read -r commit; do
-    local commit_sha commit_msg
+  # Step 2: find the merge commit that contains it via ancestry path
+  local merge_line
+  merge_line=$(git -C "$OPS_REPO_ROOT" log --merges --ancestry-path \
+    "${add_commit}..HEAD" --oneline 2>/dev/null | head -1)
 
-    commit_sha=$(echo "$commit" | awk '{print $1}')
-    commit_msg=$(git -C "$OPS_REPO_ROOT" log -1 --format="%B" "$commit_sha" 2>/dev/null) || continue
+  if [ -z "$merge_line" ]; then
+    return 1
+  fi
 
-    # Check if this is a merge commit (has "Merge pull request" in message)
-    if [[ "$commit_msg" =~ "Merge pull request" ]]; then
-      # Extract PR number from merge message (e.g., "Merge pull request #123")
-      local pr_num
-      pr_num=$(echo "$commit_msg" | grep -oP '#\d+' | head -1 | tr -d '#') || true
+  # Step 3: extract PR number from merge commit message
+  # Forgejo format: "Merge pull request 'title' (#N) from branch into main"
+  local pr_num
+  pr_num=$(echo "$merge_line" | grep -oP '#\d+' | head -1 | tr -d '#')
 
-      if [ -n "$pr_num" ]; then
-        echo "$pr_num"
-        return 0
-      fi
-    fi
-  done <<< "$commits"
+  if [ -n "$pr_num" ]; then
+    echo "$pr_num"
+    return 0
+  fi
 
   return 1
 }
@@ -146,8 +146,11 @@ get_pr_for_file() {
 get_pr_merger() {
   local pr_number="$1"
 
+  # Use ops repo API URL for PR lookups (not disinto repo)
+  local ops_api="${FORGE_URL}/api/v1/repos/${FORGE_OPS_REPO}"
+
   curl -sf -H "Authorization: token ${FORGE_TOKEN}" \
-    "${FORGE_API}/pulls/${pr_number}" 2>/dev/null | jq -r '{
+    "${ops_api}/pulls/${pr_number}" 2>/dev/null | jq -r '{
       username: .merge_user?.login // .user?.login,
       merged: .merged,
       merged_at: .merged_at // empty
@@ -290,28 +293,26 @@ launch_runner() {
   local secrets_array
   secrets_array="${VAULT_ACTION_SECRETS:-}"
 
-  if [ -z "$secrets_array" ]; then
-    log "ERROR: Action ${action_id} has no secrets declared"
-    write_result "$action_id" 1 "No secrets declared in TOML"
-    return 1
-  fi
-
   # Build command array (safe from shell injection)
   local -a cmd=(docker compose run --rm runner)
 
-  # Add environment variables for secrets
-  for secret in $secrets_array; do
-    secret=$(echo "$secret" | xargs)
-    if [ -n "$secret" ]; then
-      # Verify secret exists in vault
-      if [ -z "${!secret:-}" ]; then
-        log "ERROR: Secret '${secret}' not found in vault for action ${action_id}"
-        write_result "$action_id" 1 "Secret not found in vault: ${secret}"
-        return 1
+  # Add environment variables for secrets (if any declared)
+  if [ -n "$secrets_array" ]; then
+    for secret in $secrets_array; do
+      secret=$(echo "$secret" | xargs)
+      if [ -n "$secret" ]; then
+        # Verify secret exists in vault
+        if [ -z "${!secret:-}" ]; then
+          log "ERROR: Secret '${secret}' not found in vault for action ${action_id}"
+          write_result "$action_id" 1 "Secret not found in vault: ${secret}"
+          return 1
+        fi
+        cmd+=(-e "$secret")
       fi
-      cmd+=(-e "$secret")
-    fi
-  done
+    done
+  else
+    log "Action ${action_id} has no secrets declared — runner will execute without extra env vars"
+  fi
 
   # Add formula and action id as arguments (after service name)
   local formula="${VAULT_ACTION_FORMULA:-}"
diff --git a/docker/edge/entrypoint-edge.sh b/docker/edge/entrypoint-edge.sh
index b070b61..506d569 100755
--- a/docker/edge/entrypoint-edge.sh
+++ b/docker/edge/entrypoint-edge.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
+# Set USER before sourcing env.sh (Alpine doesn't set USER)
+export USER="${USER:-root}"
+
 DISINTO_VERSION="${DISINTO_VERSION:-main}"
 DISINTO_REPO="${FORGE_URL:-http://forgejo:3000}/johba/disinto.git"
 

From 978dd8834753c34f9c57a4c90fd64ee6b02deb0c Mon Sep 17 00:00:00 2001
From: Agent <agent@example.com>
Date: Wed, 1 Apr 2026 20:21:31 +0000
Subject: [PATCH 9/9] fix: add --reverse to get_pr_for_file ancestry lookup
 (#129)

---
 docker/edge/dispatcher.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/edge/dispatcher.sh b/docker/edge/dispatcher.sh
index c06c082..84cfed8 100755
--- a/docker/edge/dispatcher.sh
+++ b/docker/edge/dispatcher.sh
@@ -120,8 +120,9 @@ get_pr_for_file() {
 
   # Step 2: find the merge commit that contains it via ancestry path
   local merge_line
+  # Use --reverse to get the oldest (direct PR merge) first, not the newest
   merge_line=$(git -C "$OPS_REPO_ROOT" log --merges --ancestry-path \
-    "${add_commit}..HEAD" --oneline 2>/dev/null | head -1)
+    --reverse "${add_commit}..HEAD" --oneline 2>/dev/null | head -1)
 
   if [ -z "$merge_line" ]; then
     return 1