From 730d7da54ee47af1c759ccb31aae32f488171712 Mon Sep 17 00:00:00 2001
From: claude-hdb <claude-hdb@users.noreply.github.com>
Date: Tue, 14 Jul 2026 12:09:44 +0000
Subject: [PATCH] =?UTF-8?q?fix(drill):=20stop=20demanding=20an=20empty=20h?=
 =?UTF-8?q?ost=20=E2=80=94=20assert=20OUR=20boxes,=20not=20NO=20boxes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Run 11: 45 passed, 2 failed — and both failures were the same non-fact.
The host had two operator boxes (t1, t2) minted before the run, so
'claudebox list' could not say 'no boxes yet' at either end of the drill.

The empty-host message is only testable on an actually-empty host: skip
it (with a note) when tenants pre-exist, instead of failing it.

The teardown check contradicted its own rm loop: the loop deliberately
removes only the names the drill minted — the multi-tenant discipline —
and then the assertion demanded a globally empty host, flagging that
very restraint as a failure. Assert the drill's own names are gone;
name the survivor when one is.
---
 drill/drill.sh | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/drill/drill.sh b/drill/drill.sh
index 4c5e07f..6b1f000 100755
--- a/drill/drill.sh
+++ b/drill/drill.sh
@@ -348,8 +348,17 @@ expected="$(cat "$HOME/.local/share/claudebox/VERSION" 2>/dev/null || echo '?')"
 v="$(claudebox --version 2>&1)"
 case "$v" in *"$expected"*) ok "claudebox --version → $v" ;; *) no "version mismatch: CLI says '$v', VERSION file says '$expected'" ;; esac
 
-claudebox list >/dev/null 2>&1 && claudebox list 2>&1 | grep -q 'no boxes yet' \
-  && ok "empty host: 'no boxes yet', exit 0" || no "empty-host message wrong"
+# The drill must not require an empty host: operator boxes tagged
+# user.claudebox=1 are legitimate tenants, and the teardown below deliberately
+# refuses to touch them. The empty-host message is only TESTABLE when the host
+# is actually empty — on a shared host, skip it instead of failing it.
+tenants="$(incus list user.claudebox=1 --format csv --columns n 2>/dev/null | tr '\n' ' ')"
+if [ -n "${tenants% }" ]; then
+  inf "host already has claudebox boxes (${tenants% }) — the empty-host message cannot be tested this run"
+else
+  claudebox list >/dev/null 2>&1 && claudebox list 2>&1 | grep -q 'no boxes yet' \
+    && ok "empty host: 'no boxes yet', exit 0" || no "empty-host message wrong"
+fi
 
 printf '\n  minting a box (cold, ~10 min)…\n'
 t0=$SECONDS
@@ -603,7 +612,12 @@ if [ "$KEEP" = 1 ]; then
 else
   # every name the drill can have left, whatever branch a partial run took
   for n in drill clone archive peer; do claudebox rm "$n" --force >/dev/null 2>&1; done
-  claudebox list 2>&1 | grep -q 'no boxes yet' && ok "teardown: no boxes left" || no "a box survived teardown"
+  # Assert OUR boxes are gone — not that the host is empty. The rm loop above
+  # already embodies the discipline (only names the drill minted); demanding
+  # 'no boxes yet' here would flag any pre-existing operator box as a failure.
+  leftover="$(claudebox list 2>/dev/null | grep -E '^(drill|clone|archive|peer)([[:space:]]|$)' || true)"
+  [ -z "$leftover" ] && ok "teardown: every box the drill minted is gone" \
+                     || no "a drill box survived teardown: $(printf '%s' "$leftover" | awk '{print $1}' | tr '\n' ' ')"
 fi
 
 phase "Summary"