didericis-claude
5323fc1b53
`./cli.py cleanup` previously called only the env-var-selected backend's `prepare_cleanup` / `cleanup` — so a leftover smolvm machine + bundle container + bundle network from a crashed smolmachines bottle would survive a default `docker`-mode cleanup indefinitely. Smolmachines now has a real `cleanup` module (alongside `enumerate.py` from issue #77) that walks: - smolvm machines named `claude-bottle-*` (via `smolvm machine ls --json`) - bundle containers `claude-bottle-sidecars-*` - bundle networks `claude-bottle-bundle-*` Cleanup runs stop+delete on the machines, force-rm on the containers, network rm on the networks. Each step is best-effort so a failed rm doesn't block the rest. `cli.py cleanup` walks every backend in `known_backend_names()` and runs each backend's `cleanup` after a single y/N prompt that shows a combined plan. State dirs (`~/.claude-bottle/state/<slug>/`) are shared layout with the docker backend, which still owns the orphan-state-dir bucket. It now consults `enumerate_active_bottles()` for the cross-backend live identity set so a running smolmachines bottle's state dir isn't reaped during a cleanup. Tests: smolmachines cleanup (prepare + cleanup ordering + failure handling); cross-backend orphan protection on the docker state-dir check; CLI cmd_cleanup walks both backends, short- circuits on all-empty, aborts on N. 617 unit tests pass. End-to-end verified on this host: $ smolvm machine ls --json | jq '.[].name' "claude-bottle-researcher-m3hxd" $ ./cli.py cleanup --- smolmachines backend --- smolvm machine: claude-bottle-researcher-m3hxd remove all of the above? [y/N] Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
65 lines
2.0 KiB
Python
65 lines
2.0 KiB
Python
"""cleanup: stop and remove all orphaned claude-bottle resources.
|
|
|
|
Walks every registered backend (docker + smolmachines) so a single
|
|
`./cli.py cleanup` reaps both backends' leftovers — orphaned
|
|
smolvm machines won't survive a docker-only cleanup pass (issue
|
|
addressed alongside #77).
|
|
|
|
Each backend's `prepare_cleanup` enumerates its own resources;
|
|
docker's `_list_orphan_state_dirs` consults
|
|
`enumerate_active_agents()` for the union of live identities so
|
|
state dirs of running smolmachines bottles aren't reaped. State
|
|
dirs are shared layout, so docker is the single owner of that
|
|
bucket.
|
|
|
|
State dirs with `.preserve` are intentionally never touched — they
|
|
hold capability-block rebuilds or crash snapshots the operator may
|
|
want to `resume`. Manual `rm -rf ~/.claude-bottle/state/<identity>`
|
|
is the path for those.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import sys
|
|
|
|
from ..backend import get_bottle_backend, known_backend_names
|
|
from ..log import info
|
|
from ._common import read_tty_line
|
|
|
|
|
|
def cmd_cleanup(_argv: list[str]) -> int:
|
|
# Order: stable backend iteration so the y/N output is
|
|
# deterministic across runs.
|
|
plans = [
|
|
(name, get_bottle_backend(name)) for name in known_backend_names()
|
|
]
|
|
prepared = [(name, b, b.prepare_cleanup()) for name, b in plans]
|
|
|
|
if all(p.empty for _, _, p in prepared):
|
|
info("no claude-bottle resources to clean up")
|
|
return 0
|
|
|
|
for name, _, plan in prepared:
|
|
if plan.empty:
|
|
continue
|
|
info(f"--- {name} backend ---")
|
|
plan.print()
|
|
|
|
if not _prompt_yes("remove all of the above?"):
|
|
info("cleanup: skipped")
|
|
return 0
|
|
|
|
for name, backend, plan in prepared:
|
|
if plan.empty:
|
|
continue
|
|
backend.cleanup(plan)
|
|
info("cleanup: done")
|
|
return 0
|
|
|
|
|
|
def _prompt_yes(message: str) -> bool:
|
|
sys.stderr.write(f"claude-bottle: {message} [y/N] ")
|
|
sys.stderr.flush()
|
|
reply = read_tty_line()
|
|
return reply in ("y", "Y", "yes", "YES")
|