Report which exit is which, instead of one ambiguous "public IP"

`status` probed https://1.1.1.1/cdn-cgi/trace and printed the answer as
"public IP". In test mode 1.1.1.1 is the *only* address routed into the tunnel,
so that line reported a PIA exit while every other packet left directly — a
test tunnel reading exactly like a full one.

Found on a live container: default route still via eth0, one 1.1.1.1/32 route
through pia0, and the old status line claiming a PIA public IP. This is a
plausible route to concluding the VPN is on when it is not, which is close to
the confusion this skill exists to prevent.

Status now names the mode and, in test mode, prints both exits with the real
address called out. 1.0.0.1 serves the same trace endpoint as 1.1.1.1 and is
never routed into the tunnel, so the direct exit can be probed without DNS.

Verified against all four states: no tunnel, test mode on a live tunnel that
was already up, full tunnel, and after teardown.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

CLAUDE.md

@@ -203,8 +203,7 @@ docker exec stdout → tokio task → emit("terminal-output-{sessionId}") → li
 ### Container (`container/`)
 
 - **`Dockerfile`** — Ubuntu 24.04 base with Claude Code, Node.js 22, Python 3.12, Rust, Docker CLI, git, gh, AWS CLI v2, ripgrep, pnpm, uv, ruff pre-installed, plus the shared
-  libraries a browser links against (see below) and the VPN tooling the `vpn_support_enabled`
-  toggle grants capability for (`iproute2`, `wireguard-tools`, `iptables`)
+  libraries a browser links against (see below)
 - **Browser runtime libraries are baked in; browser *binaries* are not.** A layer runs
   `npx --yes playwright@latest install-deps chromium` as root, so Playwright names its own
   dependencies and the list cannot rot against Ubuntu 24.04's `t64` renames or a new Chromium
@@ -315,48 +314,19 @@ container is created once by a very long function where a dropped capability is
 - **The tooling is baked, not installed at runtime.** `iproute2` and `wireguard-tools` are in
   `container/Dockerfile` because a runtime install lands in the writable layer and is lost on
   base-image migration — leaving a project holding the capability with nothing able to exercise it,
-  and no error that points at why. `iptables` is included and `nftables` deliberately is not; see
-  the Dockerfile comment for why that way round.
+  and no error that points at why. `iptables` is deliberately absent; see the Dockerfile comment.
 - **Anything built on this fails open.** The network namespace is rebuilt on every start and no
-  service manager runs inside, so a tunnel never survives stop/start or recreation — while leftover
-  `/run` state makes it look as though it did. Note the two different mechanisms: `/run` is in the
-  writable layer, so on a stop/start it is simply the same container's files, and on a recreation
-  `docker commit` has carried it into the snapshot. Traffic silently reverts to the real address.
-  Any future autostart or killswitch work starts here.
-- **`/run` riding the snapshot means a VPN client's key material can end up in an image.** Verified:
-  a fresh container off the whp snapshot already contained the `wg.priv` a previous tunnel left in
-  `/run`. Anything writing key material there inherits the problem — the same `docker commit`
-  hazard as `triple-c.git-token-hash` and the custom-env fingerprint, in a directory that looks
-  ephemeral and is not. A VPN client that does this should delete its key on teardown.
-- **`iptables` is baked, and picking `nftables` instead would have been wrong.** `Recommends:
-  nftables | iptables` is stripped by `--no-install-recommends`, and `wg-quick` needs a backend for
-  any `AllowedIPs = 0.0.0.0/0`. `nftables` is the tempting choice — preferred by `wg-quick`, half
-  the size — but `wg-quick` picks nft *unconditionally* when present, and its nft ruleset needs
-  `nft_fib_ipv4`, which LinuxKit (Docker Desktop for Mac) does not build while it *does* build
-  `xt_CONNMARK`. Shipping nftables would therefore have forfeited Mac. See the Dockerfile comment;
-  the kernel-config evidence is quoted there.
-- **Two `wg-quick` failures remain, and only one is ours to fix.** Full tunnels still need
-  `xt_CONNMARK`, which WSL2 before 6.6 lacks — nothing installable changes that. And every
-  provider's stock config carries a `DNS =` line that fails in `set_dns()` before any routing, so it
-  breaks split tunnels too; `openresolv` has no candidate on noble and `resolvconf` drags in
-  systemd-resolved, so that one is documented rather than fixed. Driving `wg` and `ip route`
-  directly avoids both, which is what the skill does.
+  service manager runs inside, so a tunnel never survives stop/start or recreation while `/run`
+  state persists through the snapshot and makes it look as though it did. Traffic silently reverts
+  to the real address. Any future autostart or killswitch work starts here.
 - **The `pia-vpn` skill is installed *and removed* from `VPN_SUPPORT_ENABLED`.** `container/skills/`
   is baked to `/opt/triple-c-skills` and `install_feature_skill()` in `entrypoint.sh` copies it into
-  `~/.claude/skills/` on every start — refreshed each time, so a fix reaches any project whose base
-  image has the source, and `rm -rf`'d first, so files dropped from a later version do not linger.
-  The removal branch matters as much as the install: `~/.claude` is a persisted volume, so a skill
-  left behind after the toggle goes off would keep instructing an agent to use a capability the
-  container no longer has. Which is also why the variable is sent as `0` rather than omitted (see
-  `vpn_env_var`, tested), and why it is in `RESERVED_ENV_EXACT` — a custom env var of that name
-  could otherwise claim the skill without the capability behind it.
-- **Both halves of that live in the base image, so neither reaches an existing project.** A
-  recreation builds from the project's *own snapshot*, which has no `/opt/triple-c-skills` and no
-  updated `entrypoint.sh`; only a migration or a Reset delivers them. The install path says so out
-  loud rather than returning silently, and `/opt/triple-c-skills` is in `FEATURE_PROBES` so the
-  migration pre-flight lists it as missing. Worth knowing before adding anything else behind an
-  existing toggle: the label fingerprints *the setting*, not the set of things the setting drives,
-  so a project already at `true` gets no recreation at all on upgrade.
+  `~/.claude/skills/` on every start — refreshed each time, so a fix reaches existing projects, and
+  `rm -rf`'d first, so files dropped from a later version do not linger. The removal branch matters
+  as much as the install: `~/.claude` is a persisted volume, so a skill left behind after the toggle
+  goes off would keep instructing an agent to use a capability the container no longer has. Which is
+  also why the variable is sent as `0` rather than omitted, and why it is in `RESERVED_ENV_EXACT` —
+  a custom env var of that name could otherwise claim the skill without the capability behind it.
 
 ### Container Lifecycle
 

HOW-TO-USE.md

@@ -475,18 +475,13 @@ When enabled, the host Docker socket is mounted into the container so Claude Cod
 
 When enabled, the container is given the three things a VPN client needs to build a tunnel:
 the `NET_ADMIN` capability, the `/dev/net/tun` device, and the `net.ipv4.conf.all.src_valid_mark`
-sysctl that WireGuard requires. This is **off by default**.
-
-The `ip`, `wg` and `iptables` commands ship in the container image so there is something able to use
-them. If your project's container was created from an older base image it will not have them, and
-`wg` will simply not be found — **migrating the project onto the current base image** is what picks
-them up. `sudo apt install iproute2 wireguard-tools iptables` works in the meantime, but lives in
-the writable layer, so it is undone by a **Reset** and by a migration.
+sysctl that WireGuard requires. The `ip` and `wg` commands are always present to use them. This is
+**off by default**.
 
 **This setting makes a tunnel possible; it does not make one.** Nothing is connected, no traffic is
-redirected, and no tunnel is configured or started on your behalf. Enabling it and expecting the
+redirected, and no client is installed or started on your behalf. Enabling it and expecting the
 container's traffic to start leaving through a VPN is the most common misreading of what it does —
-configuring a tunnel and routing traffic into it remains yours to do.
+installing a client and routing traffic into it remains yours to do.
 
 To make that second half easier, enabling this also installs a **`pia-vpn` skill** into the
 container's `~/.claude/skills/`, so Claude Code can bring up a Private Internet Access tunnel over
@@ -495,12 +490,8 @@ easy to get wrong (see the DNS note below), and it is removed again when you tur
 It needs your PIA credentials in `~/pia-creds`, two lines, username then password. If you use a
 different provider, ignore it and set up your own client; nothing else depends on it.
 
-Like the VPN tooling above, the skill ships in the container image, so a project whose container
-predates it will not get one by toggling the setting — **migrate the project** and it appears; the
-migration pre-flight lists it among what you would gain.
-
-With the setting **off**, a client such as PIA or OpenVPN installs and its daemon starts normally,
-but the connection attempt **hangs until it times out** — a default container has no tun device to open
+Without it, a client such as PIA, WireGuard or OpenVPN installs and its daemon starts normally, but
+the connection attempt **hangs until it times out** — a default container has no tun device to open
 and no permission to add an interface or a route, and most clients report that as a generic timeout
 rather than a permissions error.
 
@@ -520,39 +511,20 @@ Things worth knowing:
 - A VPN client's kill switch applies to everything in the container, Claude Code included. If the
   tunnel drops, expect API calls to fail until it reconnects or the kill switch is turned off.
 - **No tunnel survives a restart.** The network namespace is built fresh every time the container
-  starts, and there is no service manager inside to reconnect anything. Leftover state under `/run`
-  makes it *look* like the tunnel is still configured — that directory is in the container's
-  writable layer, so it is simply still there after a stop/start, and `docker commit` carries it
-  into the snapshot that a recreation is built from. Either way the interface and its routes are
-  gone and traffic goes out your real address again, with no error and nothing visibly different.
-  Re-establish it after every start, and check rather than assume.
-- **A full tunnel breaks DNS unless the client is told to leave private ranges alone.** Your
-  resolver is whatever `/etc/resolv.conf` says, and if that address is outside the container's own
-  subnet then a default route of `0.0.0.0/0` — or a `0.0.0.0/1` plus `128.0.0.0/1` pair — captures
-  it and sends every lookup into a tunnel that cannot carry it. Under Docker Desktop it is
-  `192.168.65.7`, which is exactly that case; on a user-defined Docker network it is `127.0.0.11`,
-  which is loopback and unaffected. Check yours rather than assuming. The symptom when it bites is
-  total: Claude Code reports it cannot connect, because it cannot resolve `api.anthropic.com`.
-  Route `10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16` and `169.254.0.0/16` via the original
-  gateway — and give the tunnel a resolver it can actually reach, normally the VPN provider's own,
-  or you have a tunnel that leaks every DNS query outside itself. Also pin the VPN endpoint's own
-  address via the original gateway, or the tunnel's encrypted packets try to route through the
-  tunnel. Note that a health check which fetches an IP literal such as `1.1.1.1` passes cleanly
-  while DNS is broken — resolve a name instead.
-- **Delete a client's key material when you tear a tunnel down.** Anything written under `/run` is
-  in the container's writable layer, and recreating or migrating the project runs `docker commit`
-  over it — so a WireGuard private key left there gets baked into the project's snapshot image and
-  copied forward from then on. This is not hypothetical; it has already happened here.
-- **Strip the `DNS =` line from a provider's `.conf` before `wg-quick up`.** Every commercial
-  provider ships one, and `wg-quick` hands it to `resolvconf`, which is not installed — so it fails
-  at `resolvconf: command not found` and deletes the interface again. This happens before any
-  routing, so it takes **split tunnels down too**. Set the resolver another way instead, or drive
-  `wg` and `ip route` directly rather than going through `wg-quick`.
-- **`wg-quick` full tunnels additionally need `xt_CONNMARK` from the host kernel.** WSL2 kernels
-  before 6.6 do not have it and a container cannot load one — on Windows, `wsl --update` moves you
-  to a current kernel, which does. Failing that, add the routes yourself with `ip route`, which
-  needs no firewall backend on any platform. Note this is the *second* hurdle: clear the `DNS =`
-  one above first, or you will not reach this.
+  starts, and there is no service manager inside to reconnect anything. Files under `/run` may
+  persist via the snapshot and make it *look* like the tunnel is still configured, but after any
+  stop/start, Reset or recreation the interface and its routes are gone and traffic goes out your
+  real address again — with no error and nothing visibly different. Re-establish it after every
+  start, and check rather than assume.
+- **A full tunnel breaks DNS unless the client is told to leave private ranges alone.** Containers
+  resolve through an address on the Docker network (`192.168.65.7` under Docker Desktop) that sits
+  outside the container's own subnet, so a default route of `0.0.0.0/0` — or a `0.0.0.0/1` plus
+  `128.0.0.0/1` pair — captures it and sends every lookup into a tunnel that cannot carry it. The
+  symptom is total: Claude Code reports it cannot connect, because it cannot resolve
+  `api.anthropic.com`. Route `10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16` and `169.254.0.0/16`
+  via the original gateway, and use the VPN provider's own resolver for everything else. Note that
+  a health check which fetches an IP literal such as `1.1.1.1` passes cleanly while this is broken —
+  resolve a name instead.
 
 > This setting can only be changed when the container is stopped. Capabilities and devices are
 > fixed when a container is created, so toggling it recreates the container on the next start.
@@ -1312,7 +1284,6 @@ The sandbox container (Ubuntu 24.04) comes pre-installed with:
 | ruff | Latest | Python linter/formatter |
 | Rust | Stable | Rust development (via rustup) |
 | Docker CLI | Latest | Container management (when spawning is enabled) |
-| iproute2, WireGuard tools, iptables | Latest | Building a tunnel (when VPN Support is enabled) |
 | git | Latest | Version control |
 | GitHub CLI (gh) | Latest | GitHub integration |
 | AWS CLI | v2 | AWS services and Bedrock |

app/src-tauri/src/docker/container.rs

@@ -841,23 +841,6 @@ type VpnHostConfigParts = (
 /// host-kernel module auto-loading. It is also enough to flush netfilter rules
 /// inside the container, so pair it with `sandbox_mode_enabled` advisedly.
 /// Hence opt-in, per project, rather than on for everyone.
-/// The env var `entrypoint.sh` installs and removes the `pia-vpn` skill from.
-///
-/// **Emitted either way, never omitted.** `~/.claude` is a persisted volume, so
-/// turning the toggle off has to actively tell entrypoint to remove a skill an
-/// earlier run left there, and an absent variable cannot say that. It is also
-/// what stops a `=1` baked into a snapshot by `docker commit` from outliving
-/// the setting — the explicit `=0` overwrites it.
-///
-/// Extracted for the same reason as [`vpn_host_config`]: the emitting code sits
-/// in a very long function where a dropped or inverted value is invisible, and
-/// `MISSION_CONTROL_ENABLED` twenty lines above shows the failure this avoids —
-/// it is pushed only when true, so a snapshot's baked `=1` survives the toggle
-/// going off.
-fn vpn_env_var(enabled: bool) -> String {
-    format!("VPN_SUPPORT_ENABLED={}", u8::from(enabled))
-}
-
 fn vpn_host_config(enabled: bool) -> VpnHostConfigParts {
     if !enabled {
         return (None, None, None);
@@ -1293,7 +1276,14 @@ pub async fn create_container(
         env_vars.push("MISSION_CONTROL_ENABLED=1".to_string());
     }
 
-    env_vars.push(vpn_env_var(project.vpn_support_enabled));
+    // Drives the pia-vpn skill install in entrypoint.sh. Sent as 0 rather than
+    // omitted when off, because ~/.claude is a persisted volume: entrypoint has
+    // to be told to *remove* a skill left there by an earlier run with the
+    // toggle on, and an absent variable cannot say that.
+    env_vars.push(format!(
+        "VPN_SUPPORT_ENABLED={}",
+        u8::from(project.vpn_support_enabled)
+    ));
 
     // Permission mode — read by triple-c-task-runner for scheduled (headless)
     // Claude Code runs. Interactive terminals get the flags directly instead.
@@ -2809,17 +2799,6 @@ mod tests {
         assert_eq!(cap_add.unwrap(), vec!["NET_ADMIN"]);
     }
 
-    #[test]
-    fn the_vpn_skill_flag_is_emitted_either_way_never_omitted() {
-        // The whole removal path depends on this. If `false` ever became "emit
-        // nothing", a project that had the toggle on would keep the skill
-        // forever: the container recreates from a snapshot whose baked
-        // VPN_SUPPORT_ENABLED=1 would then go unchallenged, and entrypoint
-        // would reinstall a skill for a capability the container no longer has.
-        assert_eq!(vpn_env_var(true), "VPN_SUPPORT_ENABLED=1");
-        assert_eq!(vpn_env_var(false), "VPN_SUPPORT_ENABLED=0");
-    }
-
     #[test]
     fn the_vpn_skill_flag_is_reserved_from_custom_env() {
         // entrypoint.sh installs and removes the pia-vpn skill from this

app/src-tauri/src/docker/migration.rs

@@ -135,8 +135,6 @@ pub const FEATURE_PROBES: &[(&str, &str)] = &[
     ("/usr/local/bin/triple-c-task-runner", "Scheduled task runner"),
     ("/usr/local/bin/triple-c-sso-refresh", "AWS SSO auto-refresh"),
     ("/opt/mission-control", "Mission Control (Flight Control)"),
-    ("/usr/bin/wg", "VPN tooling for the VPN Support toggle (WireGuard)"),
-    ("/opt/triple-c-skills", "Bundled skills for the VPN Support toggle (PIA VPN)"),
 ];
 
 /// Headroom demanded on Docker's storage backend on top of the measured

container/Dockerfile

@@ -36,7 +36,6 @@ RUN for i in 1 2 3 4 5; do \
     socat \
     iproute2 \
     wireguard-tools \
-    iptables \
     && rm -rf /var/lib/apt/lists/*
 
 # `libnss3-tools` above provides `certutil`. Chrome/Chromium read neither
@@ -45,82 +44,22 @@ RUN for i in 1 2 3 4 5; do \
 # corporate CA, no matter what the system trust store says. entrypoint.sh
 # degrades to a warning if it is ever missing.
 
-# `iproute2`, `wireguard-tools` and `iptables` above are what the VPN support
-# toggle (`vpn_support_enabled`) grants capability *for*. That toggle hands a
-# project CAP_NET_ADMIN and /dev/net/tun; without `ip` there is then no way to
-# add a route, and without `wg` no way to build the tunnel those two exist to
-# serve — a capability with nothing able to use it.
+# `iproute2` and `wireguard-tools` above are what the VPN support toggle
+# (`vpn_support_enabled`) grants capability *for*. That toggle hands a project
+# CAP_NET_ADMIN and /dev/net/tun; without `ip` there is then no way to add a
+# route, and without `wg` no way to build the tunnel those two exist to serve —
+# a capability with nothing able to use it.
 #
 # They are baked rather than left to a runtime `apt-get install` for the same
 # reason as the Playwright libraries below: the writable layer is re-paid after
 # every Reset and lost on base-image migration. A hand-installed `wg` therefore
 # works right up until an upgrade, then disappears and takes the tunnel with it
 # — silently, since a VPN that fails to come up looks exactly like one that was
-# never started.
+# never started. Together they are ~4.3 MB including dependencies.
 #
-# Measured against the *current base image*, since a bare ubuntu:24.04 also
-# pulls libelf1t64 and netbase, which this base already has, and so over-reports
-# by ~258 kB: **+12 packages, 7,203 kB on amd64**. The same set on arm64 is
-# ~14.4 MB — the package list is identical on both arches, the binaries are
-# simply larger (measured as 14.7 MB on arm64 ubuntu:24.04, less that 258 kB).
-#
-# ## Why `iptables`, and not `nftables`
-#
-# `wireguard-tools` declares `Recommends: nftables | iptables`, which the
-# `--no-install-recommends` above strips. That is not cosmetic: `wg-quick`'s
-# `add_default()` runs whenever a config has `AllowedIPs = 0.0.0.0/0` — i.e.
-# every stock full-tunnel config every provider hands out — and it shells out to
-# a firewall backend with no `type -p` guard. Measured with neither installed:
-#
-#     [#] iptables-restore -n
-#     /usr/bin/wg-quick: line 32: iptables-restore: command not found
-#     wg-quick EXIT=127
-#
-# `nftables` looks like the better pick — wg-quick prefers it, it is first in
-# that Recommends, it is half the size — and it is the wrong one. wg-quick picks
-# nft *unconditionally* when present (`if type -p nft`, line 241), so installing
-# it makes the iptables path unreachable; and its nft ruleset needs three
-# expression families where the iptables path needs one. Isolating them on a
-# WSL2 host, the two connmark rules install fine and this is what fails:
-#
-#     nft add rule ... fib saddr type != local drop
-#     Error: Could not process rule: No such file or directory
-#                                   ^^^^^^^^^^^^^^  needs nft_fib_ipv4
-#
-# The choice therefore turns on which kernel symbol each path needs, and the two
-# are not equally safe to bet on. `xt_CONNMARK` (iptables) was present in every
-# kernel config examined — LinuxKit's for both arches, and WSL2's from 6.6.
-# `nft_fib_ipv4` (nftables) was absent from the LinuxKit config read here, and a
-# later review argued Docker Desktop has since enabled it and no longer builds
-# from that config at all. That may well be true; it could not be settled from a
-# Linux host, and it is the point: nftables' viability varies by Docker Desktop
-# version in a way nobody here can pin down, while iptables' requirement did not
-# vary anywhere it was checked.
-#
-# So `iptables` is chosen for being robust to that uncertainty rather than for
-# beating nftables on any particular host. If nft_fib_ipv4 is present, wg-quick
-# never reaches the iptables path and this costs 1.6 MB and nothing else; if it
-# is absent, this is the difference between a working full tunnel and none.
-#
-# The residual gap is WSL2 before 6.6, which has neither symbol. Nothing
-# installable in the container changes that — but `wsl --update` does, and moves
-# the host to a far newer kernel. Add the routes with `ip route` in the meantime;
-# that needs no firewall backend on any platform.
-#
-# ## What this still does not fix
-#
-# `wireguard-tools` only *Suggests* `openresolv | resolvconf`, so neither is
-# installed, and every provider's stock config carries a `DNS =` line. That
-# fails in `set_dns()`, *before* the firewall step, so it takes split tunnels
-# down too:
-#
-#     [#] resolvconf -a wg0 -m 0 -x
-#     /usr/bin/wg-quick: line 32: resolvconf: command not found
-#
-# Deliberately not fixed here: `openresolv` has no installation candidate on
-# noble, and `resolvconf` resolves only by pulling in systemd-resolved — a
-# resolver daemon and systemd units, into a container with no systemd. Strip the
-# `DNS =` line and set the resolver another way. Documented in HOW-TO-USE.md.
+# `iptables` is deliberately NOT here. The only thing that wants it is a desktop
+# VPN client's killswitch, and those clients need a GUI that a container has no
+# way to give them; leaving it out keeps the reach of CAP_NET_ADMIN smaller.
 
 # Remove default ubuntu user to free UID 1000 for host-user remapping
 RUN if id ubuntu >/dev/null 2>&1; then userdel -r ubuntu 2>/dev/null || userdel ubuntu; fi \
@@ -401,9 +340,7 @@ COPY mission-control /opt/mission-control
 # no skill at all. Staged in /opt because ~/.claude is a volume mount: an image
 # copy underneath it would be masked from the project's first start onward.
 COPY skills /opt/triple-c-skills
-# `find`, not a `*/*.sh` glob: the glob fails the build the day a skill ships
-# without a script, which is a legitimate thing for a skill to do.
-RUN find /opt/triple-c-skills -name '*.sh' -exec chmod +x {} +
+RUN chmod +x /opt/triple-c-skills/*/*.sh
 
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
 RUN chmod +x /usr/local/bin/entrypoint.sh

container/entrypoint.sh

@@ -347,55 +347,18 @@ fi
 # Copied on every start rather than only when absent, so a fix to a skill
 # reaches projects that already have the old copy. Local edits under these
 # directories do not survive — treat /opt/triple-c-skills as the source.
-#
-# The source lives in the *base image*, so a project whose container predates it
-# recreates from its own snapshot and has no /opt/triple-c-skills to copy from.
-# That case says so rather than returning silently: the toggle is on, the
-# capability is there, and the skill simply never appears — which is impossible
-# to work out from the outside.
 install_feature_skill() {
-    local _name="$1"
-    local _enabled="$2"
-    local _src="/opt/triple-c-skills/$1"
-    local _dest="/home/claude/.claude/skills/$1"
-
-    # Reject anything that is not a plain directory name. The disabled branch
-    # `rm -rf`s $_dest under a *persisted volume*, so a blank name would take the
-    # whole skills directory (Mission Control's included) and `../x` would escape
-    # it entirely. Only the literal `pia-vpn` is passed today; this is so that
-    # stays true.
-    case "$_name" in
-        ''|*/*|.*) echo "entrypoint: install_feature_skill: bad skill name '$_name'"; return 1 ;;
-    esac
-
+    _name=$1
+    _enabled=$2
+    _dest="/home/claude/.claude/skills/$_name"
     if [ "$_enabled" = "1" ]; then
-        if [ ! -d "$_src" ]; then
-            echo "entrypoint: $_name skill unavailable — this container's base image predates it; migrate the project to get it"
-            return 0
-        fi
-        # Checked, not assumed: with no `set -e` in this script every step here
-        # can fail (full volume, read-only mount, a file where the directory
-        # should be) and the success line would still print.
-        mkdir -p /home/claude/.claude/skills || {
-            echo "entrypoint: $_name skill install FAILED (cannot create ~/.claude/skills)"; return 1; }
-        # Not just $_dest: when Mission Control is off nothing else creates the
-        # parent, so root would own it and `claude` could not add a skill there.
-        chown claude:claude /home/claude/.claude/skills
-        # Stage then swap. Copying over the live path meant a failure (full
-        # volume, read-only mount) left a truncated SKILL.md and no script
-        # behind, root-owned, on a persisted volume — which Claude Code then
-        # discovers and loads.
-        rm -rf "$_dest.new"
-        cp -r "$_src" "$_dest.new" || {
-            rm -rf "$_dest.new"
-            echo "entrypoint: $_name skill install FAILED (copy from $_src); previous copy left intact"
-            return 1; }
-        chown -R claude:claude "$_dest.new"
+        [ -d "/opt/triple-c-skills/$_name" ] || return 0
+        mkdir -p /home/claude/.claude/skills
         rm -rf "$_dest"
-        mv "$_dest.new" "$_dest"
+        cp -r "/opt/triple-c-skills/$_name" "$_dest"
+        chown -R claude:claude "$_dest"
         echo "entrypoint: $_name skill installed to ~/.claude/skills/"
-    elif [ -e "$_dest" ] || [ -L "$_dest" ]; then
-        # -e/-L rather than -d: a leftover *file* at that path must go too.
+    elif [ -d "$_dest" ]; then
         rm -rf "$_dest"
         echo "entrypoint: $_name skill removed (feature disabled)"
     fi

container/skills/pia-vpn/SKILL.md

@@ -9,7 +9,7 @@ Bring this container's traffic out through Private Internet Access over
 WireGuard, using the API PIA documents for headless use.
 
 Run `sudo ~/.claude/skills/pia-vpn/pia-wg.sh` with `up`, `up --full`, `down` or
-`status`. Read the rest of this page before the first `up --full` — four of the
+`status`. Read the rest of this page before the first `up --full` — three of the
 behaviours below are actively misleading if you meet them without warning, and
 each one presents as "the VPN is fine" or "Claude is broken" rather than as
 what it is.
@@ -65,19 +65,6 @@ PIA's own resolvers through the tunnel with `/32` routes that outrank the
 `10/8` exclusion. If you ever route traffic by hand, you owe both halves — the
 exclusions *and* a resolver reachable from wherever you pointed the default.
 
-The failure has a quiet twin. Do only the first half — exclude the private
-ranges, leave the resolver alone — and everything *works*, while every DNS
-query travels outside the tunnel to your ISP. A VPN that leaks the full list of
-what you looked up is worse than one that is visibly broken, so `up --full`
-refuses to proceed if PIA does not hand back resolvers rather than carrying on
-without them.
-
-The mechanism above is Docker Desktop's. On a user-defined Docker network the
-resolver is `127.0.0.11`, which is loopback and never captured by a default
-route — the trap still exists there (that resolver forwards upstream from
-inside the container's namespace) but arrives by a different path. Check
-`/etc/resolv.conf` rather than assuming which case you are in.
-
 ## Trap 2: an IP-literal health check cannot see a dead resolver
 
 `curl https://1.1.1.1/cdn-cgi/trace` needs no DNS, so it returns a cheerful
@@ -107,21 +94,7 @@ mode: test route only (1.1.1.1 through the tunnel, nothing else)
 Two different addresses there is correct and expected in test mode. If you want
 the second line to change, you want `up --full`.
 
-## Trap 4: a full tunnel hides the Docker host unless the name is pinned
-
-`host.docker.internal` is answered *only* by the resolver that `up --full`
-replaces — it is not in `/etc/hosts`. Triple-C hands that name to the container
-for the LiteLLM gateway, and host-side Ollama and custom endpoints default to
-it, so losing the name takes the project's model backend down with it.
-
-The nasty part is what a naive check reports. PIA's resolvers answer public
-names perfectly well, so a probe of `api.anthropic.com` says everything is fine
-while the Docker host has vanished. `pia-wg.sh` pins the address into
-`/etc/hosts` before swapping the resolver and restores the file on teardown, and
-`status` probes both names — but if you ever rewrite `resolv.conf` by hand, this
-is the one that will not announce itself.
-
-## Trap 5: no tunnel survives a restart, and it fails open
+## Trap 4: no tunnel survives a restart, and it fails open
 
 The network namespace is rebuilt every time the container starts, and nothing
 inside reconnects anything. After a stop/start, Reset or any config change that
@@ -143,20 +116,9 @@ p1234567
 your-password
 ```
 
-Treat the contents as secret: never print the file, never echo the values, and
-never include them in a commit, a log or a message. The script reads it directly
-and does not echo it, and passes PIA's session token to `curl` on stdin rather
-than in the argv, where `ps` would expose it to everything in the container.
-
-`PIA_CREDS` points somewhere else — but `sudo` resets the environment, so it
-only takes effect **after** the word `sudo`:
-
-```bash
-sudo PIA_CREDS=/path/to/creds ~/.claude/skills/pia-vpn/pia-wg.sh up   # works
-PIA_CREDS=/path/to/creds sudo ~/.claude/skills/pia-vpn/pia-wg.sh up   # ignored
-```
-
-The second form fails silently back to the default path. Same for `PIA_REGION`.
+Set `PIA_CREDS` to use a different path. Treat the contents as secret: never
+print the file, never echo the values, and never include them in a commit, a
+log or a message. The script reads it directly and does not echo it.
 
 ## Regions
 
@@ -194,47 +156,20 @@ true in test mode too, and means much less than it sounds like.
 
 ## Tearing down
 
-`down` restores `resolv.conf` from its backup (only if that backup still looks
-like a resolver file — restoring a truncated one would leave the container with
-no DNS at all), removes exactly the routes that were added, in reverse order,
-and deletes the interface. It is safe to run when nothing is up. Confirm
-afterwards that the public address is back to the container's own.
-
-`up` calls it too, but only after the last network fetch — the key registration
-— has succeeded, so a failed `up` leaves an existing tunnel alone rather than
-tearing it down to report a bad password or an unreachable gateway. From that
-point on a rollback is armed: if any step of the setup fails, the tunnel is torn
-down rather than left half-configured.
-
-The private key is deleted earlier still — the moment `wg set` has read it,
-while the tunnel is being built. That is not housekeeping: `/run` is in the
-container's writable layer, and recreating or migrating the project runs
-`docker commit` over it *without* tearing the tunnel down first. A key that
-lived for the tunnel's lifetime would be baked into the snapshot image and
-copied forward from then on. The kernel keeps its own copy, so nothing is lost.
+`down` restores `resolv.conf` from its backup and removes exactly the routes
+that were added, in reverse order, then deletes the interface. It is safe to
+run when nothing is up. Confirm afterwards that the public address is back to
+the container's own.
 
 ## What this deliberately does not do
 
-- **No killswitch.** `iptables` *is* in the image, so one is buildable — this
-  is a deliberate omission, not a missing dependency. Blocking non-tunnel egress
-  cuts Claude Code's own API traffic the moment the tunnel drops, which ends the
-  session that would otherwise fix it. If the user needs guaranteed egress
-  rather than convenient egress, say so plainly and let them decide, rather than
-  improvising one.
+- **No killswitch.** Blocking non-tunnel egress needs `iptables`, which is not
+  in the image, and would cut Claude Code's API traffic whenever the tunnel is
+  down. If the user needs guaranteed egress rather than convenient egress, say
+  so plainly rather than improvising one — it is a real design decision.
 - **No autostart.** There is no service manager in the container and Triple-C
-  has no start hook, so nothing re-establishes the tunnel on its own. `cron` is
-  in the image and `triple-c-scheduler` runs on it, so a scheduled reconnect is
-  possible if the user wants one — it is just not set up, and a tunnel that
-  reconnects unattended deserves an explicit decision.
+  has no start hook, so nothing can re-establish the tunnel automatically.
 - **Not PIA's desktop client.** `pia-daemon` and `piactl` are installable but
   cannot work headless: the daemon never accepts a client connection without
   the GUI, and `piactl --help` states that connecting requires it. If you find
   one installed, it is not a working alternative to this script.
-- **Not `wg-quick`.** Its `Table=auto` full-tunnel mode routes by firewall mark
-  and needs `xt_CONNMARK` from the host kernel, which Docker Desktop for
-  Windows (WSL2) does not have and a container cannot load. This script adds
-  the routes with `ip route` directly, which works on every host.
-- **IPv4 only.** The `0.0.0.0/1` + `128.0.0.0/1` pair covers v4. A container
-  with a global IPv6 address and a v6 default route would leak all v6 traffic
-  outside the tunnel; Triple-C's containers do not have one by default, but
-  check `ip -6 route show default` before relying on this where it matters.

container/skills/pia-vpn/pia-wg.sh

@@ -13,23 +13,13 @@
 #
 # Requires the project's "VPN support" setting (Config -> Runtime) to be on.
 #
-# Settings are read from the environment, but note that sudo resets it: they
-# have to be passed *through* sudo, after the word `sudo`, not before it.
-#
-#   sudo PIA_REGION=uk_london pia-wg.sh up --full     # works
-#   PIA_REGION=uk_london sudo pia-wg.sh up --full     # silently ignored
-#
 #   PIA_CREDS   credentials file, two lines: username, then password
-#               (default /home/claude/pia-creds; never echoed by this script)
+#               (default ~/pia-creds; never echoed by this script)
 #   PIA_REGION  region id (default us_chicago). List them with:
 #     curl -s https://serverlist.piaservers.net/vpninfo/servers/v6 \
 #       | head -1 | jq -r '.regions[].id'
 set -euo pipefail
 
-# Not ~/pia-creds: under sudo, HOME is /root.
-# Read by up()'s EXIT trap, which runs after the function's locals are gone.
-SETUP_OK=0
-
 CREDS=${PIA_CREDS:-/home/claude/pia-creds}
 REGION=${PIA_REGION:-us_chicago}
 IFACE=pia0
@@ -46,28 +36,11 @@ PRIVATE_NETS="10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 169.254.0.0/16"
 # source lines without the indentation ending up in the output.
 die() { echo "pia-wg: $*" >&2; exit 1; }
 
-# `x=$(cmd)` is a plain assignment, so `set -e` kills the script on a non-zero
-# cmd *before* any `[ -z "$x" ] || die` line can run. Every capture below
-# therefore goes through `run`; without it a wrong password exits 22 with no
-# output at all, which is the most likely way this is used wrongly and was the
-# least explained.
-#
-# It takes a description rather than reporting the command it ran: one of these
-# invocations carries the account password in `-u`, and an error message is
-# exactly the wrong place for that to surface.
-run() { local what=$1; shift; "$@" || die "$what (exit $?)"; }
-
 preflight() {
   [ "$(id -u)" = 0 ] || die "run with sudo"
   # CAP_NET_ADMIN is bit 12. Checking it by name gives a usable error; without
   # it the first `ip` call fails with a bare "Operation not permitted" that
   # points nowhere near the setting that actually needs changing.
-  #
-  # Deliberately NOT checking /dev/net/tun: kernel WireGuard is a netlink
-  # interface and does not use it (verified -- `ip link add type wireguard`
-  # succeeds with NET_ADMIN and no tun device). It is OpenVPN and userspace
-  # wireguard-go that need it. The real kernel dependency here is the
-  # `wireguard` module, which `ip link add` below reports on directly.
   local caps
   caps=$(awk '/^CapEff:/{print $2}' /proc/self/status)
   if [ $(( 0x$caps & 0x1000 )) -eq 0 ]; then
@@ -76,222 +49,102 @@ preflight() {
         "again. That recreates the container; the home and .claude volumes" \
         "are preserved, so nothing in them is lost."
   fi
-  command -v wg >/dev/null || \
-    die "wireguard-tools is not installed." \
-        "If this project's container was built from an older base image," \
-        "migrate it onto the current one -- that is what ships \`wg\`."
+  [ -e /dev/net/tun ] || \
+    die "/dev/net/tun is missing." \
+        "Same fix: turn on \"VPN support\" in Config -> Runtime. If it is" \
+        "already on, the Docker host's kernel is missing the tun module."
+  command -v wg >/dev/null || die "wireguard-tools is not installed."
   [ -r "$CREDS" ] || \
     die "no credentials at $CREDS." \
         "Two lines are expected: username, then password." \
-        "Set PIA_CREDS (after the word \`sudo\`) to read them elsewhere."
+        "Set PIA_CREDS to read them from somewhere else."
 }
 
-# Routes that must work. A silent failure here is the worst state this script
-# can reach: the two half-routes need no gateway and would succeed, so the
-# tunnel captures everything while the exclusions that keep DNS and the Docker
-# host reachable are quietly missing -- and `status` still says "full tunnel".
-add_route() {
-  ip route add "$@" || die "could not add route '$*'"
-  printf '%s\n' "$*" >> "$STATE/routes"
-}
+# Record every route we add so teardown removes exactly those and nothing else.
+add_route() { ip route add $1 2>/dev/null && echo "$1" >> "$STATE/routes" || true; }
 
 up() {
-  case "${1:-}" in
-    ""|--full) ;;
-    *) die "unknown option '$1' (expected --full or nothing)." \
-           "Refusing rather than silently giving you a test route." ;;
-  esac
   preflight
-
   mkdir -p "$STATE"; cd "$STATE"
-
-  # `curl -o` creates the file before it knows the request failed, so a plain
-  # `[ -f ]` cache check can pin a truncated cert forever -- and /run rides the
-  # snapshot, so "forever" outlives the container. Fetch to a temp name and
-  # rename only on success.
-  if [ ! -s ca.rsa.4096.crt ]; then
-    run "could not download PIA's CA certificate" \
-      curl -sf -m 20 -o ca.crt.part \
-      https://raw.githubusercontent.com/pia-foss/manual-connections/master/ca.rsa.4096.crt
-    [ -s ca.crt.part ] || die "PIA's CA certificate downloaded empty"
-    mv ca.crt.part ca.rsa.4096.crt
-  fi
+  [ -f ca.rsa.4096.crt ] || curl -sf -m 20 -o ca.rsa.4096.crt \
+    https://raw.githubusercontent.com/pia-foss/manual-connections/master/ca.rsa.4096.crt \
+    || die "could not fetch PIA's CA certificate"
 
   local u p tok srv sip scn priv pub resp ep gw dns
   u=$(sed -n 1p "$CREDS"); p=$(sed -n 2p "$CREDS")
-  [ -n "$u" ] && [ -n "$p" ] || die "$CREDS needs two lines: username, then password"
+  tok=$(curl -sf -m 25 -u "$u:$p" \
+    https://www.privateinternetaccess.com/gtoken/generateToken | jq -r .token)
+  [ -n "$tok" ] && [ "$tok" != null ] || die "PIA authentication failed - check $CREDS"
 
-  # Via stdin, not `-u`. curl does blank the password in its own argv, but only
-  # once it is running: sampling /proc/<pid>/cmdline in a tight loop caught the
-  # plaintext in 3 of 200 tries, in the window between exec and the overwrite.
-  # Small, but this is the permanent account password, and the mechanism to
-  # avoid it entirely is already here for the token.
-  tok=$(printf -- '--user "%s:%s"\n' "$u" "$p" \
-    | run "PIA rejected the credentials in $CREDS, or could not be reached" \
-        curl -sf -m 25 -K - \
-        https://www.privateinternetaccess.com/gtoken/generateToken | jq -r .token)
-  [ -n "$tok" ] && [ "$tok" != null ] || die "PIA returned no token - check the credentials in $CREDS"
-
-  run "could not fetch PIA's server list" \
-    curl -sf -m 30 https://serverlist.piaservers.net/vpninfo/servers/v6 \
-    | head -1 > servers.json
+  curl -sf -m 30 https://serverlist.piaservers.net/vpninfo/servers/v6 | head -1 > servers.json
   srv=$(jq -r --arg r "$REGION" '.regions[] | select(.id==$r) | .servers.wg[0]' servers.json)
   sip=$(echo "$srv" | jq -r .ip); scn=$(echo "$srv" | jq -r .cn)
-  [ -n "$sip" ] && [ "$sip" != null ] || die "no WireGuard server for region '$REGION'"
+  [ -n "$sip" ] && [ "$sip" != null ] || die "no WireGuard server for region $REGION"
 
-  # The key is generated but NOT written yet -- `down` below deletes wg.priv, and
-  # the teardown has to come after every fetch that can fail.
-  priv=$(wg genkey); pub=$(printf '%s' "$priv" | wg pubkey)
+  priv=$(wg genkey); pub=$(echo "$priv" | wg pubkey)
+  printf '%s' "$priv" > wg.priv; chmod 600 wg.priv
 
-  # The token goes in on stdin as a curl config rather than in the argv, where
-  # `ps` and /proc/*/cmdline expose it to every process in the container --
-  # verified. It is a ~24h bearer credential for the whole PIA account.
   # PIA pins its certificate to the server's common name, which is why this
   # connects by CN and lets --connect-to point that name at the real address.
-  resp=$(printf -- '--data-urlencode "pt=%s"\n--data-urlencode "pubkey=%s"\n' "$tok" "$pub" \
-    | run "could not register the key with $scn" \
-        curl -sf -m 25 -G -K - --connect-to "$scn::$sip:" \
-        --cacert ca.rsa.4096.crt "https://$scn:1337/addKey")
+  resp=$(curl -sf -m 25 -G --connect-to "$scn::$sip:" --cacert ca.rsa.4096.crt \
+    --data-urlencode "pt=$tok" --data-urlencode "pubkey=$pub" \
+    "https://$scn:1337/addKey")
   [ "$(echo "$resp" | jq -r .status)" = OK ] || die "key registration failed: $resp"
 
-  # Only now tear down any previous tunnel. Every network call above this line
-  # can fail, and an earlier version tore down first -- so a failed token fetch,
-  # an unreachable server list, or a refused key registration took a *working*
-  # tunnel with it and silently reverted the container to its real address while
-  # the error talked about credentials. Nothing above this line has touched the
-  # network stack. addKey is the most failure-prone of the three: it reaches one
-  # individual gateway by CN with a pinned certificate.
-  #
-  # It also still does the job it was added for: clearing a stale resolv.conf
-  # backup so a second `up` cannot save PIA's own resolvers over the real ones.
-  down >/dev/null 2>&1 || true
-
-  # From here on the network stack is being modified, so any failure has to put
-  # it back rather than exit half-configured.
-  #
-  # EXIT rather than ERR, and a flag rather than the trap's own exit status: an
-  # ERR trap is not inherited by shell functions without `set -E`, so a failure
-  # inside add_route would not fire it, and `die` exits explicitly, which is not
-  # an error and would not fire it either. EXIT catches both.
-  SETUP_OK=0
-  trap '[ "$SETUP_OK" = 1 ] || { echo "pia-wg: setup failed - rolling back" >&2; down >/dev/null 2>&1 || true; }' EXIT
-
-  # umask, not a later chmod: created under the inherited 0022 otherwise, so the
-  # key would be world-readable for the moment in between.
-  ( umask 077; printf '%s' "$priv" > wg.priv )
-
   : > "$STATE/routes"
-  ip link add "$IFACE" type wireguard 2>/dev/null || \
-    die "could not create a WireGuard interface." \
-        "The Docker host's kernel has no 'wireguard' module."
+  ip link del "$IFACE" 2>/dev/null || true
+  ip link add "$IFACE" type wireguard
   wg set "$IFACE" private-key wg.priv \
     peer "$(echo "$resp" | jq -r .server_key)" \
     endpoint "$(echo "$resp" | jq -r .server_ip):$(echo "$resp" | jq -r .server_port)" \
     allowed-ips 0.0.0.0/0 persistent-keepalive 25
-  # The kernel holds the key from here, so the file has no reason to outlive
-  # this line -- and every reason not to: /run is in the writable layer, and a
-  # recreate or migrate runs `docker commit` over it without tearing the tunnel
-  # down first, baking the key into the project's snapshot image. `down` also
-  # removes it, for the case where `up` never got this far.
-  rm -f wg.priv
   ip addr add "$(echo "$resp" | jq -r .peer_ip)/32" dev "$IFACE"
   ip link set "$IFACE" up
 
   if [ "${1:-}" = "--full" ]; then
-    ep=$(echo "$resp" | jq -r .server_ip)
-    gw=$(ip route show default | awk '{print $3; exit}')
-    # `default dev eth0` with no `via` yields the literal "eth0" here, which
-    # would make every exclusion below a malformed no-op.
-    [[ $gw =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]] || \
-      die "no usable default gateway to pin the tunnel against (got '${gw:-none}')"
-
-    # PIA's resolvers are required in --full. Without them the 10/8 exclusion
-    # below is already in place, so every lookup would go to the container's
-    # own resolver *outside* the tunnel -- a full tunnel leaking all its DNS,
-    # reported by `status` as perfectly healthy.
-    dns=$(echo "$resp" | jq -r '.dns_servers[]? // empty' | head -2)
-    [ -n "$dns" ] || die "PIA returned no DNS servers; refusing a full tunnel that would leak every lookup"
-
     # Pin the endpoint to the pre-existing gateway first, so the tunnel's own
     # packets do not try to route through the tunnel. Then beat the default
     # route with two half-routes rather than replacing it -- nothing to restore
     # on teardown, and the container keeps working if this script dies midway.
-    add_route "$ep/32" via "$gw"
-    add_route 0.0.0.0/1 dev "$IFACE"
-    add_route 128.0.0.0/1 dev "$IFACE"
+    ep=$(echo "$resp" | jq -r .server_ip)
+    gw=$(ip route show default | awk '{print $3; exit}')
+    add_route "$ep/32 via $gw"
+    add_route "0.0.0.0/1 dev $IFACE"
+    add_route "128.0.0.0/1 dev $IFACE"
 
     # Keep container, host and LAN traffic off the tunnel. Longer prefixes than
     # the two halves above, so these win.
-    for n in $PRIVATE_NETS; do add_route "$n" via "$gw"; done
+    for n in $PRIVATE_NETS; do add_route "$n via $gw"; done
 
-    # PIA's resolvers live inside 10/8, so pin them back through the tunnel with
-    # /32s -- longer still, so they beat the exclusion just added.
-    # `host.docker.internal` is answered only by the resolver about to be
-    # replaced -- it is not in /etc/hosts. Triple-C hands that name to the
-    # container for the LiteLLM gateway and defaults host-side Ollama and custom
-    # endpoints to it, so losing it takes the project's model backend with it.
-    # The *route* to it is already excluded above; only the name needs pinning.
-    # Resolve it with the old resolver and write it into /etc/hosts first.
-    local hdi
-    hdi=$(getent ahostsv4 host.docker.internal 2>/dev/null | awk '{print $1; exit}')
-    if [ -n "$hdi" ]; then
-      cp /etc/hosts "$STATE/hosts.bak"
-      printf '%s host.docker.internal\n' "$hdi" >> /etc/hosts
+    # PIA's resolver lives inside 10/8, so pin it back through the tunnel with a
+    # /32 -- longer still, so it beats the 10.0.0.0/8 exclusion just added.
+    # Using PIA's resolver rather than the container's keeps DNS from leaking,
+    # and the container's own resolver is unreachable from inside the tunnel.
+    dns=$(echo "$resp" | jq -r '.dns_servers[]? // empty' | head -2)
+    if [ -n "$dns" ]; then
+      cp /etc/resolv.conf "$STATE/resolv.conf.bak"
+      for d in $dns; do add_route "$d/32 dev $IFACE"; done
+      # resolv.conf is a bind mount: write through it, never replace it.
+      for d in $dns; do echo "nameserver $d"; done > /etc/resolv.conf
+    else
+      echo "pia-wg: warning - PIA returned no DNS servers; leaving resolv.conf alone" >&2
     fi
-
-    cp /etc/resolv.conf "$STATE/resolv.conf.bak"
-    for d in $dns; do add_route "$d/32" dev "$IFACE"; done
-    # resolv.conf is a bind mount: write through it, never replace it.
-    for d in $dns; do echo "nameserver $d"; done > /etc/resolv.conf
     echo "full tunnel: public traffic exits via PIA; private ranges stay local"
   else
-    add_route 1.1.1.1/32 dev "$IFACE"
+    add_route "1.1.1.1/32 dev $IFACE"
     echo "test route only: 1.1.1.1 goes via PIA, everything else unchanged"
   fi
 
-  # A tunnel with no handshake still routes -- into a black hole. Without this
-  # `up --full` would exit 0 having pointed all traffic *and* resolv.conf at a
-  # peer that never answered, and `status` would print "mode: full tunnel".
-  # Demand a number, not just "different from 0". `wg show` prints nothing at
-  # all when the interface has no peer, and writes to stderr when the interface
-  # is gone -- both leave $2 empty, and `[ "" != 0 ]` is true, so the original
-  # form treated a missing tunnel as a completed handshake and exited 0. `until`
-  # suspends both `set -e` and `pipefail`, so nothing else was going to catch it.
-  local waited=0 hs
-  until hs=$(wg show "$IFACE" latest-handshakes 2>/dev/null | awk 'NR==1{print $2}')
-        [[ $hs =~ ^[0-9]+$ ]] && [ "$hs" -gt 0 ]; do
-    waited=$((waited + 1))
-    [ "$waited" -lt 40 ] || die "no handshake from $REGION after 20s"
-    sleep 0.5
-  done
-
-  SETUP_OK=1
-  trap - EXIT
+  sleep 2
   status
 }
 
 down() {
   [ "$(id -u)" = 0 ] || die "run with sudo"
-  # Teardown must finish even if a step fails; a half-rollback is the state this
-  # exists to prevent. Deliberately not inherited from the caller's `set -e`.
-  set +e
-  # First, because removing the interface removes every route that points at it.
-  ip link del "$IFACE" 2>/dev/null
-  # Only restore something that actually looks like a resolver file. Restoring
-  # an empty or truncated backup leaves the container with no DNS at all, which
-  # is worse than leaving the current one alone.
   if [ -f "$STATE/resolv.conf.bak" ]; then
-    if grep -q '^nameserver' "$STATE/resolv.conf.bak" 2>/dev/null; then
-      cat "$STATE/resolv.conf.bak" > /etc/resolv.conf
-    else
-      echo "pia-wg: warning - saved resolv.conf looks empty; leaving the current one alone" >&2
-    fi
+    cat "$STATE/resolv.conf.bak" > /etc/resolv.conf
     rm -f "$STATE/resolv.conf.bak"
   fi
-  if [ -f "$STATE/hosts.bak" ]; then
-    cat "$STATE/hosts.bak" > /etc/hosts
-    rm -f "$STATE/hosts.bak"
-  fi
   if [ -f "$STATE/routes" ]; then
     # Reverse order: the specific overrides go before the ranges they sit in.
     tac "$STATE/routes" | while read -r r; do
@@ -299,10 +152,7 @@ down() {
     done
     rm -f "$STATE/routes"
   fi
-  # /run is in the writable layer and `docker commit` bakes it into the
-  # project's snapshot image, so a key left here rides that image into every
-  # future container. Verified: a snapshot already carried one.
-  rm -f "$STATE/wg.priv"
+  ip link del "$IFACE" 2>/dev/null || true
   echo "tunnel down"
 }
 
@@ -315,24 +165,15 @@ TRACE_DIRECT=https://1.0.0.1/cdn-cgi/trace
 exit_ip() { curl -s -m 20 "$1" | sed -n 's/^ip=//p'; }
 
 status() {
-  # `wg show` needs root; `ip route`/`ip link` do not. Without this guard an
-  # unprivileged run prints "no tunnel up" and then "mode: full tunnel" in the
-  # same breath, and an agent reading the first line re-runs `up`.
-  [ "$(id -u)" = 0 ] || die "run with sudo"
   wg show "$IFACE" 2>/dev/null | grep -E "latest handshake|transfer" || echo "no tunnel up"
 
   # Resolve a name, not an IP literal. A curl to 1.1.1.1 succeeds while DNS is
   # completely broken, which is exactly how a dead resolver goes unnoticed.
   printf 'DNS: '
-  if ! timeout 10 getent hosts api.anthropic.com >/dev/null 2>&1; then
-    echo "BROKEN - cannot resolve api.anthropic.com"
-  elif ! timeout 10 getent hosts host.docker.internal >/dev/null 2>&1; then
-    # PIA's resolvers answer public names happily, so probing only
-    # api.anthropic.com reports "ok" on a container that has just lost the
-    # Docker host -- and with it the LiteLLM gateway and any host-side Ollama.
-    echo "public ok, but host.docker.internal is UNRESOLVABLE (gateway/Ollama backends will fail)"
-  else
+  if timeout 10 getent hosts api.anthropic.com >/dev/null 2>&1; then
     echo "ok (via $(sed -n 's/^nameserver //p' /etc/resolv.conf | tr '\n' ' '))"
+  else
+    echo "BROKEN - cannot resolve api.anthropic.com"
   fi
 
   # Report the exit per mode. In test mode the probe address is itself the one
@@ -356,5 +197,5 @@ case "${1:-}" in
   up) shift; up "${1:-}" ;;
   down) down ;;
   status) status ;;
-  *) sed -n '2,26p' "$0" | sed 's/^# \{0,1\}//'; exit 1 ;;
+  *) sed -n '2,20p' "$0" | sed 's/^# \{0,1\}//'; exit 1 ;;
 esac