cd9f023f3d
prd-number-check / require-numbered-prds (pull_request) Successful in 11s
tracker-policy-pr / check-pr (pull_request) Successful in 14s
test / unit (pull_request) Successful in 59s
test / integration-docker (pull_request) Successful in 1m6s
test / coverage (push) Successful in 21s
test / image-input-builds (push) Successful in 44s
test / image-input-builds (pull_request) Successful in 1m15s
test / unit (push) Successful in 57s
test / coverage (pull_request) Successful in 20s
lint / lint (push) Successful in 1m3s
Update Quality Badges / update-badges (push) Successful in 1m12s
test / integration-docker (push) Successful in 1m0s
`doctor` told users to run `./cli.py backend setup`. cli.py is a four-line wrapper at the repo root that calls bot_bottle.cli:main, and it does not ship — [tool.setuptools.packages.find] includes only bot_bottle*, so anyone who installed rather than cloned has no such file. Confirmed against a real install: the user's tree contains exactly one executable, `bot-bottle`, and no cli.py anywhere, while doctor recommended `./cli.py` three times. Invisible in development, where ./cli.py works fine from a checkout, which is why only a clean-install test surfaced it. The two entry points are the same code, so the fix is to name the one that always exists. 141 replacements across 45 files: the runtime messages that caused this, plus README, docs, PRDs, research notes and test prose, so nothing teaches the invocation a user cannot run. scripts/demo.sh is deliberately untouched — it *executes* ./cli.py from a checkout, where that is the correct and available path. Verified end to end: a sandbox install now reports "Run: bot-bottle backend setup --backend=firecracker", and bot-bottle is on that user's PATH. Unit suite unchanged against the pre-existing baseline. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01WEfZZhakx13bxTfXcZCoS5
79 lines
2.6 KiB
Python
79 lines
2.6 KiB
Python
"""cleanup: stop and remove all orphaned bot-bottle resources.
|
|
|
|
Walks every registered backend (docker, firecracker, macos-container)
|
|
so a single `bot-bottle 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 ...backend.cleanup_control import CleanupError
|
|
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
|
|
|
|
# Confirmation authorizes a fresh authoritative snapshot, not blind use of
|
|
# identities that may have changed while the operator reviewed the preview.
|
|
failures: list[str] = []
|
|
for name, backend, displayed in prepared:
|
|
current = backend.prepare_cleanup()
|
|
approved = displayed.intersect(current)
|
|
if approved.empty:
|
|
continue
|
|
try:
|
|
backend.cleanup(approved)
|
|
except CleanupError as exc:
|
|
failures.append(f"{name}: {exc}")
|
|
if failures:
|
|
raise CleanupError("cleanup incomplete: " + "; ".join(failures))
|
|
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")
|