feat(macos): replace rootless Docker spike with rootless podman

Podman avoids the CAP_SYS_ADMIN requirement that makes rootless Docker
impossible here: with no subordinate UID range configured it falls back
to a single-UID self-mapping, which an unprivileged process may write
itself, so newuidmap is never invoked. The image build therefore strips
/etc/subuid and /etc/subgid entries rather than adding them.

The agent-facing surface is unchanged — docker and docker compose talk
to podman's Docker-compatible API socket.

Two device nodes need relaxing as root inside the bottle (0666 on
/dev/fuse and /dev/net/tun); both already exist and neither needs a
capability the bottle lacks, unlike CAP_SYS_ADMIN.

Verified live on macOS 26 / Apple Container 1.0.0: service starts with
zero added capabilities, compose pulls and serves from the workspace on
a published port, and a nested container cannot reach the network
outside the egress path.

Known limitation, not yet addressed: the agent base image is Debian
bookworm, whose podman 4.3.1 swallows container exit codes through the
compat API (docker run returns 0 regardless). podman 5.4.2 on trixie
fixes it; the base bump is a separate PR. The acceptance test asserts
on an in-band marker rather than an exit code so it cannot false-pass
in the meantime.

Nested containers give no isolation from the agent itself — root inside
one is the agent user outside it. They are a build/test convenience;
the bottle remains the security boundary.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GnMp8SUGH57hZX7192Rv2F

tests/integration/test_macos_rootless_docker_spike.py

@@ -1,103 +0,0 @@
-"""Live-Mac acceptance spike for guest-local rootless Docker (issue #392).
-
-Run explicitly on an Apple Silicon/macOS 26 host:
-
-    BOT_BOTTLE_ROOTLESS_DOCKER_SPIKE=1 \
-      python3 -m unittest tests.integration.test_macos_rootless_docker_spike -v
-
-The opt-in is deliberate: ordinary Linux CI cannot execute Apple Container.
-"""
-
-from __future__ import annotations
-
-import os
-import platform
-import shutil
-import tempfile
-import unittest
-from pathlib import Path
-
-from bot_bottle.backend import BottleSpec, get_bottle_backend
-from bot_bottle.manifest import ManifestIndex
-
-
-@unittest.skipUnless(
-    platform.system() == "Darwin"
-    and os.environ.get("BOT_BOTTLE_ROOTLESS_DOCKER_SPIKE") == "1",
-    "requires an explicit live-Mac rootless-Docker spike run",
-)
-class TestMacosRootlessDockerSpike(unittest.TestCase):
-    def test_compose_stays_inside_registered_bottle(self) -> None:
-        workspace = Path(tempfile.mkdtemp(prefix="rootless-docker-spike."))
-        stage = Path(tempfile.mkdtemp(prefix="rootless-docker-stage."))
-        try:
-            (workspace / "index.html").write_text("bottle-compose-ok\n")
-            (workspace / "compose.yaml").write_text(
-                "services:\n"
-                "  web:\n"
-                "    image: python:3.12-alpine\n"
-                "    working_dir: /workspace\n"
-                "    command: python -m http.server 8000\n"
-                "    volumes: ['.:/workspace']\n"
-                "    ports: ['18080:8000']\n",
-                encoding="utf-8",
-            )
-            manifest = ManifestIndex.from_json_obj({
-                "bottles": {"dev": {
-                    "docker_access": True,
-                    "egress": {"routes": [
-                        {"host": "auth.docker.io"},
-                        {"host": "registry-1.docker.io"},
-                        {"host": "production.cloudflare.docker.com"},
-                    ]},
-                }},
-                "agents": {"spike": {
-                    "bottle": "dev", "skills": [], "prompt": "",
-                }},
-            })
-            spec = BottleSpec(
-                manifest=manifest,
-                agent_name="spike",
-                copy_cwd=True,
-                user_cwd=str(workspace),
-            )
-            backend = get_bottle_backend("macos-container")
-            plan = backend.prepare(spec, stage_dir=stage)
-            with backend.launch(plan) as bottle:
-                workdir = plan.workspace_plan.workdir
-                checks = (
-                    "docker info >/dev/null && docker compose version && "
-                    f"cd {workdir} && docker compose up -d --wait && "
-                    "curl --fail --silent http://127.0.0.1:18080/ | "
-                    "grep -q bottle-compose-ok"
-                )
-                result = bottle.exec(checks)
-                self.assertEqual(
-                    0, result.returncode,
-                    f"stdout={result.stdout!r}\nstderr={result.stderr!r}",
-                )
-                inspect = bottle.exec(
-                    "docker info --format '{{json .SecurityOptions}}'"
-                )
-                self.assertIn("rootless", inspect.stdout.lower())
-                self.assertNotEqual(
-                    0,
-                    bottle.exec("test -S /var/run/docker.sock").returncode,
-                    "spike must never expose a host/rootful Docker socket",
-                )
-                direct = bottle.exec(
-                    "docker run --rm --env HTTP_PROXY= --env HTTPS_PROXY= "
-                    "--env http_proxy= --env https_proxy= python:3.12-alpine "
-                    "wget -T 4 -qO- https://evil.example.com/"
-                )
-                self.assertNotEqual(
-                    0, direct.returncode,
-                    "an inner container obtained direct, unproxied egress",
-                )
-        finally:
-            shutil.rmtree(workspace, ignore_errors=True)
-            shutil.rmtree(stage, ignore_errors=True)
-
-
-if __name__ == "__main__":
-    unittest.main()

tests/integration/test_macos_rootless_podman_spike.py

@@ -0,0 +1,154 @@
+"""Live-Mac acceptance spike for guest-local rootless podman (issue #392).
+
+Run explicitly on an Apple Silicon/macOS 26 host:
+
+    BOT_BOTTLE_ROOTLESS_PODMAN_SPIKE=1 \
+      python3 -m unittest tests.integration.test_macos_rootless_podman_spike -v
+
+The opt-in is deliberate: ordinary Linux CI cannot execute Apple Container.
+
+Podman rather than Docker because Apple Container's capability bounding set
+omits CAP_SYS_ADMIN; see
+docs/research/rootless-docker-in-apple-container-spike.md.  The agent-facing
+surface is still `docker` and `docker compose`, which talk to podman's
+Docker-compatible API socket.
+"""
+
+from __future__ import annotations
+
+import os
+import platform
+import shutil
+import tempfile
+import unittest
+from pathlib import Path
+
+from bot_bottle.backend import BottleSpec, get_bottle_backend
+from bot_bottle.manifest import ManifestIndex
+
+
+@unittest.skipUnless(
+    platform.system() == "Darwin"
+    and os.environ.get("BOT_BOTTLE_ROOTLESS_PODMAN_SPIKE") == "1",
+    "requires an explicit live-Mac rootless-podman spike run",
+)
+class TestMacosRootlessPodmanSpike(unittest.TestCase):
+    def test_compose_stays_inside_registered_bottle(self) -> None:
+        workspace = Path(tempfile.mkdtemp(prefix="rootless-podman-spike."))
+        stage = Path(tempfile.mkdtemp(prefix="rootless-podman-stage."))
+        try:
+            (workspace / "index.html").write_text("bottle-compose-ok\n")
+            (workspace / "compose.yaml").write_text(
+                "services:\n"
+                "  web:\n"
+                "    image: quay.io/prometheus/busybox\n"
+                "    working_dir: /workspace\n"
+                "    command: httpd -f -p 8000 -h /workspace\n"
+                "    volumes: ['.:/workspace']\n"
+                "    ports: ['18080:8000']\n",
+                encoding="utf-8",
+            )
+            manifest = ManifestIndex.from_json_obj({
+                "bottles": {"dev": {
+                    "docker_access": True,
+                    # A deliberately tiny image. Pulling a ~165MB one
+                    # OOM-kills the shared egress proxy, which buffers whole
+                    # response bodies to scan them — a real defect, but a
+                    # separate one from what this test covers. See the
+                    # research note.
+                    #
+                    # quay.io deliberately, not Docker Hub: the egress proxy
+                    # strips agent-set Authorization (so an agent cannot
+                    # smuggle a credential out in a header), and Docker Hub
+                    # requires a client-fetched, per-scope bearer token that
+                    # the strip therefore removes. quay serves manifests with
+                    # no Authorization at all, so a plain route is enough.
+                    #
+                    # token_patterns is still scoped off: registry traffic
+                    # carries bearer JWTs by protocol and trips the generic
+                    # rule. known_secrets stays on — it matches the bottle's
+                    # own credentials, which is the detector that catches
+                    # real exfil.
+                    "egress": {"routes": [
+                        {"host": "quay.io", "dlp": {
+                            "outbound_detectors": ["known_secrets"],
+                        }},
+                        {"host": "cdn01.quay.io", "dlp": {
+                            "outbound_detectors": ["known_secrets"],
+                        }},
+                    ]},
+                }},
+                "agents": {"spike": {
+                    "bottle": "dev", "skills": [], "prompt": "",
+                }},
+            })
+            spec = BottleSpec(
+                manifest=manifest,
+                agent_name="spike",
+                copy_cwd=True,
+                user_cwd=str(workspace),
+            )
+            backend = get_bottle_backend("macos-container")
+            plan = backend.prepare(spec, stage_dir=stage)
+            with backend.launch(plan) as bottle:
+                workdir = plan.workspace_plan.workdir
+                checks = (
+                    "docker info >/dev/null && docker compose version && "
+                    f"cd {workdir} && docker compose up -d --wait && "
+                    "curl --fail --silent http://127.0.0.1:18080/ | "
+                    "grep -q bottle-compose-ok"
+                )
+                result = bottle.exec(checks)
+                self.assertEqual(
+                    0, result.returncode,
+                    f"stdout={result.stdout!r}\nstderr={result.stderr!r}",
+                )
+                # podman's compat API reports rootlessness through its own
+                # native endpoint; the Docker-shaped SecurityOptions field does
+                # not carry it.
+                inspect = bottle.exec(
+                    "podman info --format '{{.Host.Security.Rootless}}'"
+                )
+                self.assertIn("true", inspect.stdout.lower())
+                self.assertEqual(
+                    0,
+                    bottle.exec(
+                        "test \"$(id -u)\" -ne 0"
+                    ).returncode,
+                    "the podman service must not be running as bottle root",
+                )
+                self.assertNotEqual(
+                    0,
+                    bottle.exec("test -S /var/run/docker.sock").returncode,
+                    "spike must never expose a host/rootful Docker socket",
+                )
+                # Asserted on an in-band marker, not on `docker run`'s exit
+                # code: podman 4.3.1's Docker-compat API swallows the
+                # container's status and returns 0 for everything, so an
+                # exit-code assertion here passes whether egress was blocked
+                # or wide open. That silent false pass is worse than no check
+                # at all, and it is exactly this check — the one proving a
+                # nested container cannot escape the egress path.
+                #
+                # busybox ships wget, so a failure here means egress was
+                # refused rather than the binary being absent.
+                direct = bottle.exec(
+                    "docker run --rm --env HTTP_PROXY= --env HTTPS_PROXY= "
+                    "--env http_proxy= --env https_proxy= "
+                    "quay.io/prometheus/busybox sh -c "
+                    "'wget -T 4 -qO- https://evil.example.com/ "
+                    "&& echo ESCAPED || echo CONTAINED'"
+                )
+                self.assertIn(
+                    "CONTAINED", direct.stdout,
+                    "an inner container obtained direct, unproxied egress: "
+                    f"stdout={direct.stdout!r} stderr={direct.stderr!r}",
+                )
+                self.assertNotIn("ESCAPED", direct.stdout)
+        finally:
+            shutil.rmtree(workspace, ignore_errors=True)
+            shutil.rmtree(stage, ignore_errors=True)
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/unit/test_macos_container_launch_wiring.py

@@ -22,7 +22,7 @@ from bot_bottle.backend.macos_container.launch import (
     _agent_run_argv,
     _identity_proxy_env,
 )
-from bot_bottle.backend.macos_container.rootless_docker import guest_env
+from bot_bottle.backend.macos_container.rootless_podman import guest_env
 from bot_bottle.manifest import ManifestIndex
 
 _BOTTLE = "bot_bottle.backend.macos_container.bottle"
@@ -180,14 +180,14 @@ class TestIdentityTokenDelivery(unittest.TestCase):
         self.assertNotIn("--env", argv)
 
 
-class TestRootlessDockerEnvironment(unittest.TestCase):
+class TestRootlessPodmanEnvironment(unittest.TestCase):
     def test_disabled_bottle_gets_no_docker_environment(self) -> None:
         self.assertEqual({}, guest_env(False))
 
     def test_enabled_bottle_uses_only_guest_local_socket(self) -> None:
         env = guest_env(True)
         self.assertEqual(
-            "unix:///tmp/bot-bottle-docker-run/docker.sock", env["DOCKER_HOST"],
+            "unix:///tmp/bot-bottle-podman-run/podman.sock", env["DOCKER_HOST"],
         )
         self.assertNotIn("/var/run/docker.sock", " ".join(env.values()))
 

tests/unit/test_macos_rootless_podman.py

@@ -1,4 +1,4 @@
-"""Unit coverage for the fail-closed macOS rootless-Docker spike."""
+"""Unit coverage for the fail-closed macOS rootless-podman spike."""
 
 from __future__ import annotations
 
@@ -9,7 +9,7 @@ from types import SimpleNamespace
 from typing import cast
 from unittest.mock import patch
 
-from bot_bottle.backend.macos_container import rootless_docker
+from bot_bottle.backend.macos_container import rootless_podman
 from bot_bottle.backend.macos_container import launch as launch_mod
 from bot_bottle.backend.macos_container.bottle_plan import MacosContainerBottlePlan
 
@@ -42,36 +42,48 @@ class _Plan:
     agent_provision: _AgentProvision
 
 
-class TestRootlessDockerStart(unittest.TestCase):
-    def test_bootstraps_then_waits_for_guest_local_daemon(self) -> None:
+class TestRootlessPodmanStart(unittest.TestCase):
+    def test_bootstraps_then_waits_for_guest_local_service(self) -> None:
         bottle = _Bottle([_result(0), _result(1), _result(0)])
-        with patch.object(rootless_docker.time, "sleep"):
-            rootless_docker.start(bottle)
-        self.assertIn("rootless-docker-init", bottle.commands[0])
+        with patch.object(rootless_podman.time, "sleep"):
+            rootless_podman.start(bottle)
+        self.assertIn("rootless-podman-init", bottle.commands[0])
         self.assertEqual(2, bottle.commands.count("docker info >/dev/null 2>&1"))
 
     def test_bootstrap_failure_is_fatal_without_privilege_fallback(self) -> None:
-        bottle = _Bottle([_result(1, stderr="newuidmap missing")])
-        with patch.object(rootless_docker, "die", side_effect=RuntimeError) as die:
+        bottle = _Bottle([_result(1, stderr="slirp4netns missing")])
+        with patch.object(rootless_podman, "die", side_effect=RuntimeError) as die:
             with self.assertRaises(RuntimeError):
-                rootless_docker.start(bottle)
-        self.assertIn("newuidmap missing", die.call_args.args[0])
+                rootless_podman.start(bottle)
+        self.assertIn("slirp4netns missing", die.call_args.args[0])
         self.assertEqual(1, len(bottle.commands))
 
     def test_timeout_reports_guest_log(self) -> None:
         bottle = _Bottle(
             [_result(0)]
-            + [_result(1) for _ in range(rootless_docker.READY_RETRIES)]
+            + [_result(1) for _ in range(rootless_podman.READY_RETRIES)]
             + [_result(0, stdout="operation not permitted")]
         )
-        with patch.object(rootless_docker.time, "sleep"), \
-             patch.object(rootless_docker, "die", side_effect=RuntimeError) as die:
+        with patch.object(rootless_podman.time, "sleep"), \
+             patch.object(rootless_podman, "die", side_effect=RuntimeError) as die:
             with self.assertRaises(RuntimeError):
-                rootless_docker.start(bottle)
+                rootless_podman.start(bottle)
         self.assertIn("operation not permitted", die.call_args.args[0])
 
 
-class TestRootlessDockerImage(unittest.TestCase):
+class TestRootlessPodmanDevices(unittest.TestCase):
+    def test_relaxes_only_the_two_blocked_device_nodes_as_root(self) -> None:
+        calls: list[tuple[str, list[str]]] = []
+        rootless_podman.prepare_guest_devices(
+            "bottle-1", lambda name, argv: calls.append((name, argv)),
+        )
+        self.assertEqual(1, len(calls))
+        name, argv = calls[0]
+        self.assertEqual("bottle-1", name)
+        self.assertIn("chmod 0666 /dev/fuse /dev/net/tun", argv[-1])
+
+
+class TestRootlessPodmanImage(unittest.TestCase):
     def test_layers_tooling_without_changing_base_image(self) -> None:
         calls: list[tuple[str, str, str]] = []
 
@@ -79,16 +91,32 @@ class TestRootlessDockerImage(unittest.TestCase):
             calls.append((image, context, dockerfile))
             text = Path(dockerfile).read_text(encoding="utf-8")
             self.assertIn("FROM agent:base", text)
-            self.assertIn("docker.io uidmap rootlesskit slirp4netns", text)
-            self.assertIn("sed -i '/^node:/d' /etc/subuid /etc/subgid", text)
-            self.assertEqual(1, text.count("node:100000:65536\\n' >> /etc/subuid"))
-            self.assertEqual(1, text.count("node:100000:65536\\n' >> /etc/subgid"))
+            self.assertIn("podman fuse-overlayfs slirp4netns uidmap", text)
             self.assertIn("USER node", text)
-            self.assertTrue((Path(context) / "rootless-docker-init.sh").is_file())
+            self.assertTrue((Path(context) / "rootless-podman-init.sh").is_file())
 
-        image = rootless_docker.build_image("agent:base", build)
-        self.assertEqual("agent:base-rootless-docker", image)
-        self.assertEqual("agent:base-rootless-docker", calls[0][0])
+        image = rootless_podman.build_image("agent:base", build)
+        self.assertEqual("agent:base-rootless-podman", image)
+        self.assertEqual("agent:base-rootless-podman", calls[0][0])
+
+    def test_strips_subordinate_ranges_so_podman_avoids_newuidmap(self) -> None:
+        """The single-UID fallback is the entire reason podman works here.
+
+        A subordinate range would send podman down the newuidmap path, which
+        cannot write a multi-range uid_map without CAP_SYS_ADMIN in an Apple
+        Container guest — the failure that killed the rootless-Docker spike.
+        """
+        seen: list[str] = []
+
+        def build(image: str, context: str, *, dockerfile: str) -> None:
+            seen.append(Path(dockerfile).read_text(encoding="utf-8"))
+
+        rootless_podman.build_image("agent:base", build)
+        text = seen[0]
+        self.assertIn("sed -i '/^node:/d' /etc/subuid /etc/subgid", text)
+        self.assertNotIn("subuid", text.replace(
+            "sed -i '/^node:/d' /etc/subuid /etc/subgid", "",
+        ))
 
     def test_launch_builds_base_then_rootless_variant(self) -> None:
         plan = cast(MacosContainerBottlePlan, cast(object, _Plan(
@@ -101,9 +129,9 @@ class TestRootlessDockerImage(unittest.TestCase):
         with patch.object(launch_mod, "read_committed_image", return_value=None), \
              patch.object(launch_mod.container_mod, "build_image") as build, \
              patch.object(
-                 launch_mod.rootless_docker,
+                 launch_mod.rootless_podman,
                  "build_image",
-                 return_value="agent:base-rootless-docker",
+                 return_value="agent:base-rootless-podman",
              ) as build_rootless:
             result = launch_mod._build_images(plan)  # pylint: disable=protected-access
 
@@ -112,7 +140,7 @@ class TestRootlessDockerImage(unittest.TestCase):
             dockerfile="/repo/Dockerfile",
         )
         build_rootless.assert_called_once_with("agent:base", build)
-        self.assertEqual("agent:base-rootless-docker", result.agent_provision.image)
+        self.assertEqual("agent:base-rootless-podman", result.agent_provision.image)
 
 
 if __name__ == "__main__":