refactor: remove leftovers from the orchestrator/gateway consolidation

Sweep for vestiges of the old combined-plane model and the pre-split shared
rootfs. Two are load-bearing, the rest are stale docs/comments:

- Bug: macOS `enumerate_active` only excluded the gateway container from the
  agent list, so after the split the orchestrator container
  (`bot-bottle-mac-orchestrator`, also `bot-bottle-`-prefixed) was enumerated as
  a phantom agent. Exclude both infra containers; test covers it.
- Dead code: the gateway `bootstrap.py` still carried an `orchestrator` daemon
  spec + `_OPT_IN_DAEMONS` + a signing-key/JWT env branch, all for the old
  combined container where the gateway process could also run the control plane.
  No backend ever requests it now — removed; the key-stripping stays as
  defense-in-depth.

Stale-comment reframes: "the/single infra container" -> the orchestrator +
gateway pair (or the specific plane); "shared rootfs / bb_role init / one
published rootfs" -> the per-plane rootfs + `role_init`; the deleted
Dockerfile.infra references in Dockerfile.orchestrator/.gateway; and the macOS
"one infra container ... same address" docstring + its now-false
share-one-address test (the planes are distinct containers with distinct
addresses).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

bot_bottle/backend/docker/__init__.py

@@ -11,7 +11,7 @@ The bulk of the implementation lives in sibling modules:
   - launch:               bring-up + teardown context manager
   - cleanup:              orphan enumeration, removal, active listing
   - backend:              DockerBottleBackend façade wiring the above
-  - infra:                DockerInfraService (the per-host infra container)
+  - infra:                DockerInfraService (the per-host orchestrator + gateway pair)
 
 Thin by design: the public names are re-exported lazily via `__getattr__`, so
 importing a leaf like `backend.docker.util` doesn't drag `DockerBottleBackend`

bot_bottle/backend/docker/consolidated_launch.py

@@ -2,7 +2,7 @@
 
 Composes the orchestrator primitives into the register/teardown sequence:
 
-  1. ensure the single infra container (control plane + gateway) is up;
+  1. ensure the per-host pair (orchestrator + gateway containers) is up;
   2. allocate the bottle a pinned source IP on the gateway network;
   3. register it and provision its git-gate repos/creds into the gateway.
 
@@ -62,7 +62,7 @@ def _network_cidr(network: str) -> str:
 
 def _network_container_ips(network: str) -> list[str]:
     """Every address currently assigned on the gateway network — the ground
-    truth for "in use": the infra container and every live agent. Read from
+    truth for "in use": the gateway container and every live agent. Read from
     the network so a new bottle can't collide with anything actually attached."""
     proc = run_docker([
         "docker", "network", "inspect", "--format",
@@ -80,7 +80,7 @@ def _reprovision_running_bottles(
     infra_name: str = INFRA_NAME,
 ) -> None:
     """Re-inject egress tokens for any registered bottles that lost their
-    in-memory tokens (e.g., after an infra container restart).
+    in-memory tokens (e.g., after an orchestrator restart).
 
     For each registered bottle whose source IP maps to a live container on the
     gateway network, reads ENV_VAR_SECRET via ``docker exec … printenv`` and
@@ -89,7 +89,7 @@ def _reprovision_running_bottles(
     container exec failure never blocks a new bottle launch."""
     client = OrchestratorClient(orchestrator_url)
     # Build {source_ip: container_name} from live containers on the gateway
-    # network, excluding the infra container itself.
+    # network, excluding the gateway container itself.
     try:
         proc = run_docker([
             "docker", "network", "inspect",
@@ -133,11 +133,11 @@ def launch_consolidated(
     infra_name: str = INFRA_NAME,
     network: str = GATEWAY_NETWORK,
 ) -> LaunchContext:
-    """Ensure the infra container is up, allocate + register the bottle, and
+    """Ensure the orchestrator + gateway pair is up, allocate + register the bottle, and
     provision its git-gate state. Returns the agent's attach context.
 
     Also reprovisiones egress tokens for any already-running bottles that lost
-    their in-memory credentials (e.g. after an infra container restart), so
+    their in-memory credentials (e.g. after an orchestrator restart), so
     they regain egress access before the new bottle is registered."""
     service = service or DockerInfraService()
     url = service.ensure_running()