didericis
a21f2358c6
tracker-policy-pr / check-pr (pull_request) Successful in 16s
test / integration-docker (pull_request) Successful in 21s
lint / lint (push) Failing after 58s
test / unit (pull_request) Successful in 2m11s
test / integration-firecracker (pull_request) Successful in 3m27s
test / coverage (pull_request) Successful in 16s
test / publish-infra (pull_request) Has been skipped
_common had rotted into a junk drawer. Trim it to what actually
justifies a shared leaf module and rename for legibility:
* REPO_DIR: deleted (dead — nothing imported it).
* read_tty_line: dropped the pointless re-export; cleanup/start/init
now import it straight from bot_bottle.util.
* USER_CWD: deleted. It captured os.getcwd() at import time, but
nothing chdirs and no test patched it, so it was equivalent to a
live os.getcwd() — inlined at the six call sites.
* PROG: kept, now the sole member. It's still a leaf (both the
dispatcher and the commands it imports need it) so it can't move
into __init__ without a circular import.
_common.py -> constants.py. Full unit suite green (2243); CLI dispatch
verified.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
68 lines
2.1 KiB
Python
68 lines
2.1 KiB
Python
"""cleanup: stop and remove all orphaned bot-bottle resources.
|
|
|
|
Walks every registered backend (docker, firecracker, macos-container)
|
|
so a single `./cli.py cleanup` reaps every backend's leftovers — a
|
|
firecracker bottle's VM processes and run dirs 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 non-docker 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 preserved sessions the operator may want to `resume`. Manual
|
|
`rm -rf ~/.bot-bottle/state/<identity>` is the path for those.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import sys
|
|
|
|
from ...backend import get_bottle_backend, has_backend, known_backend_names
|
|
from ...log import info
|
|
from ...util import read_tty_line
|
|
|
|
|
|
def cmd_cleanup(_argv: list[str]) -> int:
|
|
# Order: stable backend iteration so the y/N output is
|
|
# deterministic across runs. Skip backends whose runtime
|
|
# isn't available on this host so e.g. macos-container
|
|
# doesn't error on Linux.
|
|
plans = [
|
|
(name, get_bottle_backend(name))
|
|
for name in known_backend_names()
|
|
if has_backend(name)
|
|
]
|
|
prepared = [(name, b, b.prepare_cleanup()) for name, b in plans]
|
|
|
|
if all(p.empty for _, _, p in prepared):
|
|
info("no bot-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"bot-bottle: {message} [y/N] ")
|
|
sys.stderr.flush()
|
|
reply = read_tty_line()
|
|
return reply in ("y", "Y", "yes", "YES")
|