tests: unit coverage for the fossil-screenshot fix

(follow-up to previous commit — test appends initially landed in the wrong
clone; content identical)

bridge/bridge.py

@@ -41,11 +41,11 @@ from datetime import UTC, datetime
 from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
 
 GITEA_API = os.environ.get("GITEA_API", "https://git.autonomic.zone/api/v1")
-DRONE_URL = os.environ.get("DRONE_URL", "https://drone.ci.commoninternet.net")
+DRONE_URL = os.environ.get("DRONE_URL", "https://drone.ci.autonomic.zone")
 # Dashboard base URL — where per-run artifacts (summary card PNG, level badge SVG) are served
 # (Phase 3 U2.3: /runs/<run_id>/...). The PR comment (U3) embeds the card + badge from here. The
 # run_id is the Drone build number (== `num`), so the URLs are /runs/<num>/{summary.png,badge.svg}.
-DASH_URL = os.environ.get("DASH_URL", "https://ci.commoninternet.net")
+DASH_URL = os.environ.get("DASH_URL", "https://ci.autonomic.zone")
 CI_REPO = os.environ.get("CI_REPO", "recipe-maintainers/cc-ci")
 TRIGGER = "!testme"
 # Hidden HTML-comment marker embedded in the bot's PR comment so a re-`!testme` UPDATES the same

dashboard/dashboard.py

@@ -22,7 +22,7 @@ import urllib.error
 import urllib.request
 from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
 
-DRONE_URL = os.environ.get("DRONE_URL", "https://drone.ci.commoninternet.net")
+DRONE_URL = os.environ.get("DRONE_URL", "https://drone.ci.autonomic.zone")
 CI_REPO = os.environ.get("CI_REPO", "recipe-maintainers/cc-ci")
 CACHE_TTL = int(os.environ.get("CACHE_TTL", "30"))
 # Per-recipe history display cap (phase dash): a long-lived recipe (plausible/custom-html have 30+

nix/hosts/cc-ci-hetzner/configuration.nix

@@ -34,10 +34,21 @@
   };
 
   # Root SSH authorized keys — preserved across nixos-rebuild switches.
+  # 2026-09-28: synced to the live /root/.ssh/authorized_keys on cc-ci (which had drifted:
+  # several keys had been added manually and would have been wiped by the next rebuild).
+  # Claude-sandbox keys removed at operator request; new `nptest` and
+  # `notplants-orchestrator` keys added.
   users.users.root.openssh.authorizedKeys.keys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOk8NaeBdPbS2gfUvbny8h0AkZlVjGYHzx4QPXSJ38gd claude@claude-vm"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGZGp/DQTFuD1GvsyTzCVBUTmoWqcb5T+Z7zZo5nYLXO"
+    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDhgo41nt8/L+Cr0PKd8jQK45mw/A+h041j6LQ8JWZisEVaQOzr6s9rxPL8VT5ML4P3/4bMblzdDiXWlJxymcb+yk5S5TnVrMavzHEDhWHwEvTRMe6xNTmsU6cmmhRw7PJqqQ+0GTlQalu3I4jkC0kTF7kuPwduUOgUuSpJqxvDTwYiXoyVnOQHAIygh+BmQvYUz0PBfQgIhgcbYmGZ++T0DnMzdGFzW2UB/iy5mymnpmbaZCgLy0w8AoDE+0YLtUc4gwTXc183nvqO1i7LQr+3jBYkv5ZthCCc52vXFHDSw9xZ5ohsOrBvoi5foRbqinmU5/t0aTK7SSrat7xXm/odIOyS+S7PJyeEcsXN6d5zdxbabAy5vLfodEaKGZd4rqQeDCxOTPAS/BlrBV/EV714n4E+fSOAllAuMBO4IibJM/gLJrh2Dql3co50QW9HEDeSC7iqp2lxRBDxvUs3rIEzy7o4HSN8chqBUK1bbBY6B17fuNHIpBAw4akRVVvPnVM= trav@trav480sweet"
+    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC6jrKj7iZUNRLBTZG0vZM1D/BXtARhhB4+GrvpyuqmPb9iw2ifT9YqRUwgyGrOW9U6nIAR9yFnfp9+FkyhEKWByqEBbe/zYKlGLRGjfsIdDdW29QQ3hvmqNyboCkXLxZGat93poYhnoomqicmGD/xST4s0OUhcK9E494lUmenlD9dcMZW1aKpJ+9O4Dq6A7nk2z1e4KFcZdrZDI2Hgg+gfEdsKZQqd/R3Mls/eVKpzhfv3Y8BiNoHssUChVf8IGESqTOBOR7Dk7FsU5Z2ZcnQ1coxY7VlBn4fPjTWmz/Ac0jLqgcpCLpNyQzFPDVMYZKYrPVoqBeKVhN5YnfwR5OVP8YsakT/obLwC43sx/esXfjhVGcsRoGpiLOfazzNw/eC8s6FlS8cesOubEM37a7F25z4UEG3d487oM7EjQ39gBCCj/KRgUimCKMWsm6yIas4OSctBWEAo/NhZp0gwulSRxleW6eJCNNwzOmWjdzYIVWoVP0EIeM95Tq8PVUN7gpc= aadil@t480"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMyHSi12R0+HCVBz7+d9fyOBnoJi8Nsj5D7vQ9UQO8a5"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJVlfoLBPseQ9fA9534KmRg2KWcksKZGzAJIpHJ2JpsI mfowler.email@protonmail.com"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAcyTGb/wVgdhg5oBCZZvBaR1RuUQRY/3WHnOQpNDCsp claude-cc-ci-sandbox@20260526"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHOcLo0YBa0UYi7i/l8K/Y/7cF2OclmDqSTlAsHM0dOS notplants-orchestrator-ed25519"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMniNzAzuI527bfk/EipqFILFayUCwYXDoZ3R7+QgYq6"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKmGDZC6wrOQNJAW5PPDpxgEXXrcsnIU4b3QJLtq05RQ cc-ci-loops-to-root@cc-ci"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIONhAh8/jjH8v8AOZIlzL8yyNyb5VihefIEkaHschoJy nptest"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHIa8iunWtA4mqLKV6MuiTo3RkVj2ucsk3gLL4ArMEPO notplants-orchestrator"
   ];
 
   # Firewall — Hetzner has a public IP, so open 80+443 for Traefik.

nix/modules/acme-dns.nix

@@ -1,8 +1,13 @@
-# Restricted DNS-01 certificate issuance for ci.commoninternet.net.
+# Restricted DNS-01 certificate issuance for ci.autonomic.zone (+ legacy ci.commoninternet.net).
 #
 # This host is authoritative only for acme.commoninternet.net. Gandi continues
-# to own commoninternet.net; it delegates this narrow zone and one permanent
-# _acme-challenge CNAME manually. No Gandi credential is present here.
+# to own commoninternet.net AND autonomic.zone; both zones delegate their narrow
+# _acme-challenge CNAME to the same acme-dns account. No Gandi credential is present here.
+#
+# Domain cutover 2026-09: ONE cert now covers BOTH zones (SANs: ci/*.ci.autonomic.zone +
+# ci/*.ci.commoninternet.net) — a single secret pair flows through the unchanged
+# warm_reconcile._traefik_setup ssl_cert/ssl_key flow, avoiding dual-cert SNI entirely.
+# The legacy commoninternet.net SANs are dropped in Phase 4 (post-bake reissue).
 { config, pkgs, ... }:
 let
   publicIPv4 = config.cc-ci.publicIPv4;
@@ -42,11 +47,40 @@ let
 
   # These are wiring values only. The acme-dns account JSON is generated by
   # Lego below /var/lib/acme and never enters Nix, git, or /etc.
+  # Storage path points at the NEW cert's dir; cc-ci-acme-storage-seed.service
+  # (below) clones the legacy account entry into it under the new zone key so
+  # Lego can write the new zone's TXT via the same (registration-disabled)
+  # acme-dns account — the CNAME for _acme-challenge.ci.autonomic.zone already
+  # delegates to that account's subdomain.
   legoEnvironment = pkgs.writeText "cc-ci-acme-dns-lego.env" ''
     ACME_DNS_API_BASE=http://127.0.0.1:8080
-    ACME_DNS_STORAGE_PATH=/var/lib/acme/ci.commoninternet.net/acme-dns-accounts.json
+    ACME_DNS_STORAGE_PATH=/var/lib/acme/ci.autonomic.zone/acme-dns-accounts.json
     ACME_DNS_ALLOWLIST=127.0.0.1/32
   '';
+
+  # Seed the new cert's acmedns storage from the legacy one: same acme-dns
+  # account (same subdomain/credentials — the only thing the DNS CNAME points
+  # at), re-keyed for the new zone. Idempotent; runs before the ACME unit.
+  acmeStorageSeed = pkgs.writeShellApplication {
+    name = "cc-ci-acme-storage-seed";
+    runtimeInputs = with pkgs; [ jq coreutils ];
+    text = ''
+      src=/var/lib/acme/ci.commoninternet.net/acme-dns-accounts.json
+      dst=/var/lib/acme/ci.autonomic.zone/acme-dns-accounts.json
+      install -d -m 0700 /var/lib/acme/ci.autonomic.zone
+      if [ ! -s "$src" ]; then
+        echo "storage seed: no legacy accounts.json — skipping (fresh host?)"
+        exit 0
+      fi
+      jq 'if has("ci.autonomic.zone") then .
+          elif has("ci.commoninternet.net") then
+            . + { "ci.autonomic.zone": .["ci.commoninternet.net"] }
+          else . end' "$src" > "$dst.tmp"
+      mv "$dst.tmp" "$dst"
+      chmod 0600 "$dst"
+      echo "storage seed: ok"
+    '';
+  };
 in
 {
   imports = [ ./options.nix ];
@@ -77,78 +111,106 @@ in
       "f /var/lib/ci-certs/acme-production-enabled 0600 root root -"
     ];
 
-    services.acme-dns = {
-      description = "Restricted authoritative DNS for cc-ci ACME DNS-01";
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network-online.target" ];
-      wants = [ "network-online.target" ];
-      serviceConfig = {
-        User = "acme-dns";
-        Group = "acme-dns";
-        StateDirectory = "acme-dns";
-        StateDirectoryMode = "0700";
-        WorkingDirectory = "/var/lib/acme-dns";
-        ExecStart = "${pkgs.acme-dns}/bin/acme-dns -c ${acmeDnsConfig}";
-        Restart = "on-failure";
-        RestartSec = "5s";
-        AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
-        CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
-        NoNewPrivileges = true;
-        PrivateTmp = true;
-        PrivateDevices = true;
-        ProtectHome = true;
-        ProtectSystem = "strict";
-        ReadWritePaths = [ "/var/lib/acme-dns" ];
-        RestrictAddressFamilies = [ "AF_INET" "AF_UNIX" ];
+    # Three systemd units (W201 statix): one attrset, distinct unit names — avoids
+    # `services = { ... }` attribute sets repeating the `services` key.
+    services = {
+      acme-dns = {
+        description = "Restricted authoritative DNS for cc-ci ACME DNS-01";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network-online.target" ];
+        wants = [ "network-online.target" ];
+        serviceConfig = {
+          User = "acme-dns";
+          Group = "acme-dns";
+          StateDirectory = "acme-dns";
+          StateDirectoryMode = "0700";
+          WorkingDirectory = "/var/lib/acme-dns";
+          ExecStart = "${pkgs.acme-dns}/bin/acme-dns -c ${acmeDnsConfig}";
+          Restart = "on-failure";
+          RestartSec = "5s";
+          AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
+          CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
+          NoNewPrivileges = true;
+          PrivateTmp = true;
+          PrivateDevices = true;
+          ProtectHome = true;
+          ProtectSystem = "strict";
+          ReadWritePaths = [ "/var/lib/acme-dns" ];
+          RestrictAddressFamilies = [ "AF_INET" "AF_UNIX" ];
+        };
       };
-    };
 
-    # Traefik consumes its wildcard as immutable Swarm secrets, so a renewed
-    # host certificate must be copied and reconciled rather than merely reloaded.
-    # This service is started only by the production-mode ACME postRun hook.
-    services.cc-ci-acme-traefik-handoff = {
-      description = "Install renewed cc-ci wildcard into Traefik Swarm secrets";
-      after = [ "docker.service" "deploy-proxy.service" ];
-      requires = [ "docker.service" ];
-      path = [ pkgs.coreutils pkgs.docker pkgs.systemd pkgs.gnugrep ];
-      serviceConfig = {
-        Type = "oneshot";
-        UMask = "0077";
+      # Seed the new cert's acmedns storage before the ACME unit first runs (see
+      # acmeStorageSeed above). Ordering via the generated acme unit name.
+      cc-ci-acme-storage-seed = {
+        description = "Seed ci.autonomic.zone acme-dns storage from the legacy account";
+        after = [ "acme-dns.service" ];
+        wantedBy = [ "acme-ci.autonomic.zone.service" ];
+        before = [ "acme-ci.autonomic.zone.service" ];
+        serviceConfig = {
+          Type = "oneshot";
+          UMask = "0077";
+        };
+        script = "${acmeStorageSeed}/bin/cc-ci-acme-storage-seed";
       };
-      script = ''
-        src=/var/lib/acme/ci.commoninternet.net
-        dst=/var/lib/ci-certs/live
-        test -s "$src/fullchain.pem"
-        test -s "$src/key.pem"
-        install -d -m 0700 "$dst"
-        install -m 0444 "$src/fullchain.pem" "$dst/fullchain.pem.new"
-        install -m 0400 "$src/key.pem" "$dst/privkey.pem.new"
-        mv -f "$dst/fullchain.pem.new" "$dst/fullchain.pem"
-        mv -f "$dst/privkey.pem.new" "$dst/privkey.pem"
 
-        # deploy-proxy performs the health-gated Swarm rollout. Its reconciler
-        # derives a fresh version from the public certificate chain and inserts
-        # the matching ssl_cert/ssl_key secrets before deploying Traefik.
-        systemctl restart deploy-proxy.service
+      # Traefik consumes its wildcard as immutable Swarm secrets, so a renewed
+      # host certificate must be copied and reconciled rather than merely reloaded.
+      # This service is started only by the production-mode ACME postRun hook.
+      # Traefik consumes its wildcard as immutable Swarm secrets, so a renewed
+      # host certificate must be copied and reconciled rather than merely reloaded.
+      # This service is started only by the production-mode ACME postRun hook.
+      cc-ci-acme-traefik-handoff = {
+        description = "Install renewed cc-ci wildcard into Traefik Swarm secrets";
+        after = [ "docker.service" "deploy-proxy.service" ];
+        requires = [ "docker.service" ];
+        path = [ pkgs.coreutils pkgs.docker pkgs.systemd pkgs.gnugrep ];
+        serviceConfig = {
+          Type = "oneshot";
+          UMask = "0077";
+        };
+        script = ''
+          src=/var/lib/acme/ci.autonomic.zone
+          dst=/var/lib/ci-certs/live
+          test -s "$src/fullchain.pem"
+          test -s "$src/key.pem"
+          install -d -m 0700 "$dst"
+          install -m 0444 "$src/fullchain.pem" "$dst/fullchain.pem.new"
+          install -m 0400 "$src/key.pem" "$dst/privkey.pem.new"
+          mv -f "$dst/fullchain.pem.new" "$dst/fullchain.pem"
+          mv -f "$dst/privkey.pem.new" "$dst/privkey.pem"
 
-        # A successful rollout no longer references old wildcard versions. Best
-        # effort removal retains any secret Docker still reports as in use.
-        keep="v$(sha256sum "$dst/fullchain.pem" | cut -c1-16)"
-        docker secret ls --format '{{.Name}}' | \
-          grep -E '^traefik_ci_commoninternet_net_ssl_(cert|key)_v' | \
-          grep -v -E "_(ssl_cert|ssl_key)_$keep\$" | \
-          while IFS= read -r stale; do docker secret rm "$stale" || true; done
-      '';
+          # deploy-proxy performs the health-gated Swarm rollout. Its reconciler
+          # derives a fresh version from the public certificate chain and inserts
+          # the matching ssl_cert/ssl_key secrets before deploying Traefik.
+          systemctl restart deploy-proxy.service
+
+          # A successful rollout no longer references old wildcard versions. Best
+          # effort removal retains any secret Docker still reports as in use.
+          keep="v$(sha256sum "$dst/fullchain.pem" | cut -c1-16)"
+          docker secret ls --format '{{.Name}}' | \
+            grep -E '^traefik_ci_commoninternet_net_ssl_(cert|key)_v' | \
+            grep -v -E "_(ssl_cert|ssl_key)_$keep\$" | \
+            while IFS= read -r stale; do docker secret rm "$stale" || true; done
+        '';
+      };
     };
   };
 
   security.acme = {
     acceptTerms = true;
-    certs."ci.commoninternet.net" = {
-      domain = "ci.commoninternet.net";
-      extraDomainNames = [ "*.ci.commoninternet.net" ];
-      # Staging issuance succeeded using the permanent, narrowly delegated
-      # CNAME. Production uses the same restricted acme-dns account.
+    certs."ci.autonomic.zone" = {
+      domain = "ci.autonomic.zone";
+      # Dual-zone SANs: the new zone + the legacy one. One cert = one ssl_cert/ssl_key
+      # secret pair = zero traefik reconciler changes. Phase 4 drops the legacy SANs.
+      extraDomainNames = [
+        "*.ci.autonomic.zone"
+        "ci.commoninternet.net"
+        "*.ci.commoninternet.net"
+      ];
+      # Staging issuance proved the permanent, narrowly delegated CNAME and the
+      # restricted acme-dns account. Production uses the same account (re-keyed
+      # for the new zone by cc-ci-acme-storage-seed.service).
       dnsProvider = "acmedns";
       environmentFile = "/etc/acme-dns/lego.env";
       dnsResolver = "1.1.1.1:53";

nix/modules/bridge.nix

@@ -33,7 +33,8 @@ let
         image: cc-ci-bridge:${imageTag}
         environment:
           - GITEA_API=https://git.autonomic.zone/api/v1
-          - DRONE_URL=https://drone.ci.commoninternet.net
+          - DRONE_URL=https://drone.ci.autonomic.zone
+          - DASH_URL=https://ci.autonomic.zone
           - CI_REPO=recipe-maintainers/cc-ci
           - BRIDGE_LISTEN=0.0.0.0:8080
           # Polling is PRIMARY (outbound, read-only, always on); the /hook webhook is an optional
@@ -57,7 +58,7 @@ let
           labels:
             - "traefik.enable=true"
             - "traefik.http.services.ccci-bridge.loadbalancer.server.port=8080"
-            - "traefik.http.routers.ccci-bridge.rule=Host(`ci.commoninternet.net`) && PathPrefix(`/hook`)"
+            - "traefik.http.routers.ccci-bridge.rule=(Host(`ci.autonomic.zone`) || Host(`ci.commoninternet.net`)) && PathPrefix(`/hook`)"
             - "traefik.http.routers.ccci-bridge.entrypoints=web-secure"
             - "traefik.http.routers.ccci-bridge.tls=true"
     networks:

nix/modules/dashboard.nix

@@ -1,4 +1,4 @@
-# Results dashboard (§4.5, D7): the YunoHost-CI-like overview at ci.commoninternet.net. Reads the
+# Results dashboard (§4.5, D7): the YunoHost-CI-like overview at ci.autonomic.zone. Reads the
 # Drone API (read-only) and renders latest-run-per-recipe + SVG badges. Packaged as a Nix-built OCI
 # image and run as a swarm service on `proxy`, routed by traefik at Host(ci.commoninternet.net) — the
 # comment-bridge's Host && PathPrefix(`/hook`) rule is longer, so /hook still wins (priority by rule
@@ -33,7 +33,7 @@ let
       app:
         image: cc-ci-dashboard:${imageTag}
         environment:
-          - DRONE_URL=https://drone.ci.commoninternet.net
+          - DRONE_URL=https://drone.ci.autonomic.zone
           - CI_REPO=recipe-maintainers/cc-ci
           - DASH_LISTEN=0.0.0.0:8080
           - DRONE_TOKEN_FILE=/run/secrets/drone_token
@@ -57,7 +57,7 @@ let
           labels:
             - "traefik.enable=true"
             - "traefik.http.services.ccci-dashboard.loadbalancer.server.port=8080"
-            - "traefik.http.routers.ccci-dashboard.rule=Host(`ci.commoninternet.net`)"
+            - "traefik.http.routers.ccci-dashboard.rule=Host(`ci.autonomic.zone`) || Host(`ci.commoninternet.net`)"
             - "traefik.http.routers.ccci-dashboard.entrypoints=web-secure"
             - "traefik.http.routers.ccci-dashboard.tls=true"
     networks:

nix/modules/docker-prune.nix

@@ -30,9 +30,11 @@ let
         exit 0
       fi
       # NEVER prune mid-run: a live run-app stack means a deploy/test is in flight (mid-pull layers
-      # can look prunable). Run-app services: <=4char>-<6hex>_ci_commoninternet_net_* (lifecycle.py).
+      # can look prunable). Run-app services: <=4char>-<6hex>_<zone-stem>_* (lifecycle.py).
+      # Zone stem matches BOTH ci_autonomic_zone (current) and ci_commoninternet_net
+      # (legacy stacks from before the 2026-09 domain cutover) during the bake window.
       if docker service ls --format '{{.Name}}' \
-           | grep -qE '^[a-z0-9]{1,4}-[0-9a-f]{6}_ci_commoninternet_net_'; then
+           | grep -qE '^[a-z0-9]{1,4}-[0-9a-f]{6}_ci_(autonomic_zone|commoninternet_net)_'; then
         echo "docker-prune: a run-app stack is live — skipping (never prune mid-run)"
         exit 0
       fi

nix/modules/drone-runner.nix

@@ -35,7 +35,7 @@ in
     wantedBy = [ "multi-user.target" ];
     environment = {
       DRONE_RPC_PROTO = "https";
-      DRONE_RPC_HOST = "drone.ci.commoninternet.net";
+      DRONE_RPC_HOST = "drone.ci.autonomic.zone";
       DRONE_RUNNER_CAPACITY = maxTests; # MAX_TESTS concurrency cap (see let-binding above)
       DRONE_RUNNER_NAME = "cc-ci-exec";
       # exec runner needs a writable root for build workspaces

nix/modules/drone.nix

@@ -1,5 +1,5 @@
 # Drone CI server = coop-cloud `drone` recipe via abra (swarm, traefik-routed at
-# drone.ci.commoninternet.net, Gitea SSO, wildcard cert / no ACME). The exec *runner* is a
+# drone.ci.autonomic.zone, Gitea SSO, wildcard cert / no ACME). The exec *runner* is a
 # separate host systemd service (modules/drone-runner.nix). See DECISIONS.md "CI engine"/"Drone
 # deployment shape".
 #
@@ -17,7 +17,7 @@ let
     name = "cc-ci-reconcile-drone";
     runtimeInputs = with pkgs; [ abra docker jq gnused gnugrep coreutils git curl ];
     text = ''
-      DRONE_DOMAIN="drone.ci.commoninternet.net"
+      DRONE_DOMAIN="drone.ci.autonomic.zone"
       ENV_FILE="$HOME/.abra/servers/default/$DRONE_DOMAIN.env"
 
       if [ ! -r /run/secrets/drone_rpc_secret ] || [ ! -r /run/secrets/drone_gitea_client_secret ]; then
@@ -52,7 +52,10 @@ let
       set_env DRONE_ENV_VERSION "v1"
       set_env COMPOSE_FILE '"compose.yml:compose.gitea.yml"'
 
-      have_secret() { docker secret ls --format '{{.Name}}' | grep -q "_$1_v1$"; }
+      # Stack-scoped: secret names are prefixed with the app's stack name, so during the
+      # 2026-09 domain rename the OLD stack's *_rpc_secret_v1 must not satisfy this check.
+      DRONE_STACK="drone_ci_autonomic_zone"
+      have_secret() { docker secret ls --format '{{.Name}}' | grep -q "^''${DRONE_STACK}_$1_v1$"; }
       have_secret rpc_secret    || abra app secret insert "$DRONE_DOMAIN" rpc_secret    v1 /run/secrets/drone_rpc_secret          -f -n
       have_secret client_secret || abra app secret insert "$DRONE_DOMAIN" client_secret v1 /run/secrets/drone_gitea_client_secret -f -n
 

nix/modules/reports.nix

@@ -73,7 +73,7 @@ let
           labels:
             - "traefik.enable=true"
             - "traefik.http.services.ccci-reports.loadbalancer.server.port=80"
-            - "traefik.http.routers.ccci-reports.rule=Host(`report.ci.commoninternet.net`)"
+            - "traefik.http.routers.ccci-reports.rule=Host(`report.ci.autonomic.zone`) || Host(`report.ci.commoninternet.net`)"
             - "traefik.http.routers.ccci-reports.entrypoints=web-secure"
             - "traefik.http.routers.ccci-reports.tls=true"
     networks:

runner/harness/generic.py

@@ -117,7 +117,10 @@ def assert_serving(domain: str, meta) -> None:
     # app is routed (Traefik serves the wildcard zone-wide). The serving proof is steps 1–2 above.
     verified, detail = served_cert(domain)
     assert verified, f"{domain}: served wildcard cert is not trusted/valid — {detail}"
-    assert "commoninternet.net" in detail.lower(), f"{domain}: served cert unexpected — {detail}"
+    # Dual-zone cert (2026-09 cutover): the SAN list covers both *.ci zones; a run
+    # domain in either zone must be covered by the one serving wildcard.
+    zone = "autonomic.zone" if domain.endswith(".autonomic.zone") else "commoninternet.net"
+    assert zone in detail.lower(), f"{domain}: served cert unexpected — {detail}"
 
 
 # ---- Op/assertion split (Phase 1e HC3) -------------------------------------------------------

runner/harness/lifecycle.py

@@ -25,7 +25,7 @@ from . import meta as meta_mod
 GATEWAY_IP = "143.244.213.108"  # *.ci.commoninternet.net -> gateway (TLS passthrough to cc-ci)
 # A run app domain is "<recipe[:4]>-<6hex>.ci.commoninternet.net" (see DECISIONS.md). Used by the
 # janitor to recognise orphaned run apps (infra apps like traefik/drone/backups don't match).
-RUN_APP_RE = re.compile(r"^[a-z0-9]{1,4}-[0-9a-f]{6}\.ci\.commoninternet\.net$")
+RUN_APP_RE = re.compile(r"^[a-z0-9]{1,4}-[0-9a-f]{6}\.ci\.(?:autonomic\.zone|commoninternet\.net)$")
 
 
 class TeardownError(RuntimeError):
@@ -1190,7 +1190,7 @@ def janitor() -> None:
     # also catch stacks whose .env was already deleted (abra ls won't list them)
     for svc in _docker_names("service", ""):
         # svc like cust-c95a69_ci_commoninternet_net_app -> reconstruct domain
-        m = re.match(r"^([a-z0-9]{1,4}-[0-9a-f]{6})_ci_commoninternet_net_", svc)
+        m = re.match(r"^([a-z0-9]{1,4}-[0-9a-f]{6})_ci_(?:autonomic_zone|commoninternet_net)_", svc)
         if m:
             seen.add(f"{m.group(1)}.ci.commoninternet.net")
 

runner/harness/naming.py

@@ -1,7 +1,9 @@
 """Shared run-app domain naming (used by the conftest fixtures and the orchestrator).
 
-Domain = "<recipe[:4]>-<6hex(recipe|pr|ref)>.ci.commoninternet.net" — short enough for Docker's
+Domain = "<recipe[:4]>-<6hex(recipe|pr|ref)>.ci.autonomic.zone" — short enough for Docker's
 64-char swarm config/secret name limit, unique per run, collision-safe across recipes (DECISIONS.md).
+(Migrated from *.ci.commoninternet.net 2026-09; the legacy zone remains valid until the bake
+window ends — lifecycle/warm name matching accepts both.)
 """
 
 from __future__ import annotations
@@ -18,4 +20,4 @@ def app_domain(recipe: str, pr: str = "0", ref: str | None = None) -> str:
     ref = ref or ("local" + str(int(time.time())))
     tag = _short(recipe, 4).lower()
     h = hashlib.sha1(f"{recipe}|{pr}|{ref}".encode()).hexdigest()[:6]
-    return f"{tag}-{h}.ci.commoninternet.net"
+    return f"{tag}-{h}.ci.autonomic.zone"

runner/harness/results.py

@@ -27,6 +27,7 @@ from __future__ import annotations
 
 import json
 import os
+import shutil
 import xml.etree.ElementTree as ET
 
 from . import level as level_mod
@@ -35,6 +36,17 @@ from . import level as level_mod
 # The dashboard serves these read-only at /runs/<run_id>/... (U0.4). Overridable for tests.
 RUNS_DIR_DEFAULT = "/var/lib/cc-ci-runs"
 
+# The artifact files/dirs a run OWNS in its run dir (written fresh every run).
+_OWNED_ARTIFACTS = (
+    "results.json",
+    "summary.html",
+    "summary.png",
+    "badge.svg",
+    "lint.txt",
+    "screenshot.png",
+    "junit",
+)
+
 
 def runs_dir() -> str:
     return os.environ.get("CCCI_RUNS_DIR", RUNS_DIR_DEFAULT)
@@ -49,6 +61,31 @@ def run_id() -> str:
     return os.environ.get("CCCI_APP_DOMAIN") or os.environ.get("CCCI_RUN_ID") or "manual"
 
 
+def fresh_artifact_dir(path: str) -> str:
+    """Ensure the run artifact dir holds no stale artifacts from a PREVIOUS run with the same id.
+
+    Drone build numbers restarted when its DB was re-created (2026-09-27) while /var/lib/cc-ci-runs
+    still holds old-era dirs numbered into the thousands — a new build reusing an old number would
+    otherwise mix old artifacts into the new run's card (observed 2026-10-05: !testme gitea build 35
+    collided with a May-31 run 35 and embedded custom-html-tiny's fossil screenshot.png, because
+    screenshot.capture() skips its snap when out_path already exists). Removes ONLY the files/dirs
+    this run owns (see _OWNED_ARTIFACTS); anything else in the dir is left untouched. Best-effort
+    (R7): never raises into the run."""
+    os.makedirs(path, exist_ok=True)
+    for name in _OWNED_ARTIFACTS:
+        p = os.path.join(path, name)
+        if os.path.isdir(p):
+            shutil.rmtree(p, ignore_errors=True)
+        else:
+            try:
+                os.remove(p)
+            except FileNotFoundError:
+                pass
+            except OSError:
+                pass  # R7: a stuck file must never fail the run — the card is best-effort anyway
+    return path
+
+
 def junit_file(junit_dir: str, tier: str, source: str, path: str) -> str:
     """Deterministic per-(tier,source,file) JUnit XML path under junit_dir."""
     base = os.path.splitext(os.path.basename(path))[0]

runner/harness/screenshot.py

@@ -142,12 +142,13 @@ def capture(domain: str, out_path: str, *, recipe_meta: dict | None = None) -> s
                 page = context.new_page()
                 if hook is not None:
                     # Recipe-specific safe view (post-login etc.). The hook owns navigation +
-                    # the no-secret-page guarantee; it should call page.screenshot itself, but if
-                    # it doesn't, we still snap the resulting page below. SCREENSHOT(page, ctx) —
-                    # the uniform ctx convention (rcust P3).
+                    # the no-secret-page guarantee; we ALWAYS snap the page after it returns.
+                    # Never trust a pre-existing out_path: a recycled run artifact dir (drone
+                    # build numbers restarted 2026-09-27 while old-era dirs linger) must not get
+                    # its fossil screenshot embedded (observed 2026-10-05, !testme gitea #10
+                    # build 35). SCREENSHOT(page, ctx) — the uniform ctx convention (rcust P3).
                     hook(page, meta_mod.hook_ctx(domain, recipe_meta))
-                    if not os.path.exists(out_path):
-                        _snap_with_blank_retry(page, out_path)
+                    _snap_with_blank_retry(page, out_path)
                 else:
                     # Default: landing page. Accept any rendered status (200 or an auth redirect to a
                     # login form) — both are credential-free and representative of "the app is up".

runner/harness/warm.py

@@ -25,6 +25,9 @@ import urllib.request
 # Recipes that, when declared as a dep, are served from a shared live-warm instance at a stable
 # domain instead of being co-deployed per run. Maps dep-recipe -> stable domain.
 WARM_DOMAINS = {
+    # Warm stacks stay on the legacy zone through the 2026-09 domain cutover (data-warm
+    # volumes + stack names are tied to the abra app name; renaming re-seeds the CI bases).
+    # They move to *.ci.autonomic.zone in a post-bake phase together with their stacks.
     "keycloak": "warm-keycloak.ci.commoninternet.net",
 }
 
@@ -38,11 +41,14 @@ _CTX.check_hostname = False
 _CTX.verify_mode = ssl.CERT_NONE
 
 # A cold per-run stack name looks like "<tag>-<6hex>_ci_commoninternet_net_<svc>"; extract the hex.
-_STACK_HEX_RE = re.compile(r"^[a-z0-9]{1,4}-([0-9a-f]{6})_ci_commoninternet_net_")
+_STACK_HEX_RE = re.compile(
+    r"^[a-z0-9]{1,4}-([0-9a-f]{6})_ci_(?:autonomic_zone|commoninternet_net)_"
+)
 
 
 def stable_domain(recipe: str) -> str:
     """The stable warm domain for a recipe: `warm-<recipe>.ci.commoninternet.net` — the canonical
+    base's hostname (legacy zone until the post-bake warm-stack migration; see WARM_DOMAINS note).
     scheme for BOTH the live-warm keycloak and the data-warm canonicals (WC2), distinct from cold
     per-run `<recipe[:4]>-<6hex>`. (WARM_DOMAINS['keycloak'] equals stable_domain('keycloak').)"""
     return f"warm-{recipe}.ci.commoninternet.net"

runner/run_recipe_ci.py

@@ -1184,6 +1184,10 @@ def main() -> int:
     # {tier,source,file,rc,junit} record; after the run we assemble results.json (per-stage/per-test +
     # level) into the artifact dir. Best-effort — never changes the verdict (R7).
     run_artifact_dir = os.path.join(results_mod.runs_dir(), results_mod.run_id())
+    # Collision guard (2026-10-05): drone build numbers restarted when its DB was re-created while
+    # old-era run dirs (same numbers, other recipes' artifacts — e.g. a fossil screenshot.png) are
+    # still on disk. Wipe the files THIS run owns so nothing stale survives into the card.
+    results_mod.fresh_artifact_dir(run_artifact_dir)
     junit_dir = os.path.join(run_artifact_dir, "junit")
     records: list[dict] = []
 

scripts/bootstrap-drone-oauth.sh

@@ -13,10 +13,10 @@ set -euo pipefail
 : "${GITEA_USERNAME:?set GITEA_USERNAME}"
 : "${GITEA_PASSWORD:?set GITEA_PASSWORD}"
 GITEA="${GITEA:-https://git.autonomic.zone}"
-DRONE="${DRONE:-https://drone.ci.commoninternet.net}"
+DRONE="${DRONE:-https://drone.ci.autonomic.zone}"
 CLIENT_ID="${CLIENT_ID:-ab4cdb9d-ee96-4867-875f-87384505fc52}"
 REPO="${REPO:-recipe-maintainers/cc-ci}"
-RES=(--resolve "drone.ci.commoninternet.net:443:127.0.0.1")
+RES=(--resolve "drone.ci.autonomic.zone:443:127.0.0.1")
 export PATH=/run/current-system/sw/bin:"$PATH"
 
 cj=$(mktemp)

tests/concurrency/concutil.py

@@ -15,7 +15,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "runner")
 from harness import lifecycle  # noqa: E402
 
 HELPERS = os.path.join(os.path.dirname(__file__), "helpers.py")
-DOMAIN = "test-abc123.ci.commoninternet.net"  # matches RUN_APP_RE
+DOMAIN = "test-abc123.ci.autonomic.zone"  # matches RUN_APP_RE
 
 
 class HelperPool:

tests/gitea/custom/test_lfs_roundtrip.py

@@ -23,6 +23,7 @@ import shutil
 import subprocess
 import sys
 import tempfile
+import time
 import urllib.error
 import urllib.request
 
@@ -45,7 +46,15 @@ def _lfs_available() -> bool:
     return os.path.exists(os.path.join(abra_dir, "recipes", "gitea", _LFS_OVERLAY))
 
 
-def _api(domain, path, method="GET", body=None, user="", password=""):
+API_TIMEOUT = 20
+
+
+def _api(domain, path, method="GET", body=None, user="", password="", timeout=API_TIMEOUT):
+    """One API call → (status, JSON). Never raises: transient errors (connection refused /
+    dropped mid-restart, DNS, socket timeout) return (0, {}) so a caller's bounded poll can
+    simply retry, mirroring lifecycle.http_fetch. Only HTTPError was caught before; a socket
+    timeout on a slow post-restart boot (gitea 28.0.0 migration window, PR #10 run #31) escaped
+    as TimeoutError and aborted the restart poll itself."""
     data = json.dumps(body).encode() if body is not None else None
     auth = base64.b64encode(f"{user}:{password}".encode()).decode()
     headers = {"Authorization": f"Basic {auth}"}
@@ -55,7 +64,7 @@ def _api(domain, path, method="GET", body=None, user="", password=""):
         f"https://{domain}/api/v1{path}", data=data, headers=headers, method=method
     )
     try:
-        with urllib.request.urlopen(req, timeout=20, context=_CTX) as r:
+        with urllib.request.urlopen(req, timeout=timeout, context=_CTX) as r:
             raw = r.read()
             return r.status, (json.loads(raw) if raw else {})
     except urllib.error.HTTPError as e:
@@ -64,6 +73,8 @@ def _api(domain, path, method="GET", body=None, user="", password=""):
             return e.code, json.loads(raw)
         except (ValueError, json.JSONDecodeError):
             return e.code, {}
+    except (urllib.error.URLError, TimeoutError, OSError):  # TimeoutError ⊃ socket.timeout (UP041)
+        return 0, {}
 
 
 def _run_git(args, cwd, env=None):
@@ -164,6 +175,8 @@ def test_lfs_roundtrip(live_app):
         finally:
             shutil.rmtree(fresh_dir, ignore_errors=True)
 
+        import recipe_meta  # noqa: E402 — per-recipe declared timeouts (tests/STYLE.md §5)
+
         # 7. JWT-secret stability: restart gitea + assert LFS_JWT_SECRET unchanged.
         #    Read the current secret from inside the container's rendered app.ini.
         current_jwt = lifecycle.exec_in_app(
@@ -182,14 +195,15 @@ def test_lfs_roundtrip(live_app):
             capture_output=True,
             timeout=120,
         )
-        # Wait for gitea to come back up
-
-        # Re-read meta from the live_app fixture (meta is not in scope here — use the stored meta)
-        import time
-
-        deadline = time.time() + 120
+        # Wait for gitea to come back up. Window + probe are DERIVED from the recipe's declared
+        # readiness (recipe_meta.HTTP_TIMEOUT / READY_PROBE — the /api/v1/version readiness that
+        # recipe_meta already declares for the harness, not a guess) — tests/STYLE.md §5.
+        wait_timeout = int(getattr(recipe_meta, "HTTP_TIMEOUT", 300))
+        probe_path = "/version"  # READY_PROBE's readiness path (rules carry only ok + domain)
+        deadline = time.time() + wait_timeout
+        status2 = 0
         while time.time() < deadline:
-            status2, _ = _api(live_app, "/version", user=user, password=password)
+            status2, _ = _api(live_app, probe_path, user=user, password=password)
             if status2 == 200:
                 break
             time.sleep(5)

tests/gitea/recipe_meta.py

@@ -72,7 +72,8 @@ def UPGRADE_SECRET_PREP(ctx):
     import subprocess
 
     # abra derives STACK_NAME from the domain by replacing dots with underscores
-    # (e.g. gite-e1cb78.ci.commoninternet.net → gite-e1cb78_ci_commoninternet_net).
+    # (e.g. gite-e1cb78.ci.autonomic.zone → gite-e1cb78_ci_autonomic_zone; legacy
+    # *.ci.commoninternet.net run stacks are matched too during the bake window).
     stack_name = ctx.domain.replace(".", "_")
     docker_secret = f"{stack_name}_lfs_jwt_secret_v1"
     value = base64.urlsafe_b64encode(_os.urandom(32)).rstrip(b"=").decode()

tests/unit/test_results.py

@@ -489,3 +489,50 @@ def test_write_results_roundtrip(tmp_path):
     assert path.endswith("/42/results.json")
     with open(path) as f:
         assert json.load(f)["level"] == 3
+
+
+def test_fresh_artifact_dir_removes_owned_stale_artifacts(tmp_path):
+    """Run-dir collision guard (2026-10-05): drone build numbers restarted while old-era run dirs
+    linger in /var/lib/cc-ci-runs — a new build reusing an old number must not mix the old run's
+    artifacts (fossil screenshot.png from ANOTHER recipe) into its card. Only OWNED artifacts go."""
+    d = tmp_path / "35"
+    d.mkdir()
+    (d / "results.json").write_text('{"old": true}')
+    (d / "screenshot.png").write_bytes(b"stale-fossil")
+    (d / "summary.png").write_bytes(b"stale")
+    (d / "badge.svg").write_text("<svg/>")
+    (d / "lint.txt").write_text("old")
+    (d / "summary.html").write_text("<html/>")
+    (d / "junit").mkdir()
+    (d / "junit" / "old.xml").write_text("<x/>")
+    (d / "untracked-thing.bin").write_bytes(b"keep me")  # NOT owned — must survive
+
+    R.fresh_artifact_dir(str(d))
+
+    for name in (
+        "results.json",
+        "screenshot.png",
+        "summary.png",
+        "badge.svg",
+        "lint.txt",
+        "summary.html",
+    ):
+        assert not (d / name).exists(), f"stale owned artifact {name} survived"
+    assert not (d / "junit").exists(), "stale junit dir survived"
+    assert (d / "untracked-thing.bin").read_bytes() == b"keep me", "unowned file was deleted"
+
+
+def test_fresh_artifact_dir_creates_missing_dir(tmp_path):
+    d = tmp_path / "36"
+    out = R.fresh_artifact_dir(str(d))
+    assert out == str(d) and d.is_dir()
+
+
+def test_fresh_artifact_dir_tolerant_of_odd_entries(tmp_path):
+    """R7: never raise into the run — a dir where an owned name is itself a dir must still work."""
+    d = tmp_path / "37"
+    d.mkdir()
+    (d / "screenshot.png").mkdir()  # perverse: a DIRECTORY named screenshot.png
+    (d / "junit").mkdir()
+    R.fresh_artifact_dir(str(d))
+    assert not (d / "screenshot.png").exists() and not (d / "junit").exists()

tests/unit/test_screenshot.py

@@ -184,3 +184,78 @@ def test_screenshot_reachable_through_real_load_path(tmp_path):
     hook = S._load_screenshot_hook(meta)
     assert callable(hook), "SCREENSHOT hook did not survive the orchestrator load path (R2)"
     assert S._load_screenshot_hook(meta_mod.load("no-such", tests_dir=str(tmp_path))) is None
+
+
+# ---- capture() fossil guard (2026-10-05) -----------------------------------------------------
+# Drone build numbers restarted when its DB was re-created while /var/lib/cc-ci-runs still holds
+# old-era dirs numbered into the thousands; run 35 (!testme gitea #10) collided with a May-31 run
+# 35 and embedded custom-html-tiny's fossil screenshot.png because the hook branch SKIPPED the
+# snap when out_path already existed. capture() must always snap fresh.
+
+
+class _FakeLaunchable:
+    def __init__(self, page):
+        self._page = page
+        self.chromium = self
+
+    def launch(self, args=None):
+        return self
+
+    def new_context(self, **kw):
+        return self
+
+    def new_page(self):
+        return self._page
+
+    def close(self):
+        pass
+
+
+class _FakeSyncPlaywright:
+    """sync_playwright() replacement: context-manager factory handing out one fake browser."""
+
+    def __init__(self, page):
+        self._page = page
+
+    def __call__(self):
+        return self
+
+    def __enter__(self):
+        return _FakeLaunchable(self._page)
+
+    def __exit__(self, *exc):
+        return False
+
+
+def _install_fake_playwright(monkeypatch, page):
+    import types
+
+    fake_api = types.ModuleType("playwright.sync_api")
+    fake_api.sync_playwright = _FakeSyncPlaywright(page)
+    fake = types.ModuleType("playwright")
+    fake.sync_api = fake_api
+    monkeypatch.setitem(sys.modules, "playwright", fake)
+    monkeypatch.setitem(sys.modules, "playwright.sync_api", fake_api)
+
+
+def test_capture_overwrites_fossil_screenshot(tmp_path, monkeypatch):
+    """A pre-existing out_path in a recycled run artifact dir must never be embedded: the hook
+    branch snaps fresh regardless (the old exists-guard returned the fossil as 'captured')."""
+    out_path = str(tmp_path / "screenshot.png")
+    with open(out_path, "wb") as f:
+        f.write(b"STALE-FOSSIL-FROM-ANOTHER-RECIPE" * 400)
+
+    fired = {}
+    page = _FakePage([35707])  # one real-sized frame, like a painted page
+
+    def hook(p, ctx):
+        fired["yes"] = True  # navigation only — hooks never save the PNG themselves
+
+    _install_fake_playwright(monkeypatch, page)
+    got = S.capture("gitea.example.org", out_path, recipe_meta={"SCREENSHOT": hook})
+
+    assert got == out_path, "capture must report success after snapping fresh"
+    assert fired.get("yes"), "SCREENSHOT hook must run"
+    assert page.shots == 1, "capture must snap exactly once — the fossil is not a captured frame"
+    with open(out_path, "rb") as f:
+        assert f.read(4) == b"\x89PNG", "out_path still holds the fossil — snap did not overwrite"