didericis-claude
adff1263d8
CLI and dashboard now share one cross-backend abstraction for listing + launching bottles, so adding a backend (docker / smolmachines) lights up in both places without separate wiring. Backend abstraction: - New `ActiveBottle` dataclass (`backend_name`, `slug`, `agent_name`, `started_at`, `services`) replaces the docker-specific `ActiveAgent`. Same field surface for the existing dashboard consumers; `ActiveAgent` becomes a typed alias for source-compat. - New `BottleBackend.enumerate_active() -> Sequence[ActiveBottle]` replaces the old `list_active() -> None` (which printed and returned nothing). Docker implements it via the existing compose query; smolmachines implements it via `smolvm machine ls --json` cross-referenced with each bundle container's `CLAUDE_BOTTLE_SIDECAR_DAEMONS` env (`backend/smolmachines/ enumerate.py`). - New `enumerate_active_bottles()` and `known_backend_names()` module-level helpers fold every backend into one call. - `get_bottle_backend(name=None)` takes an optional explicit name (precedence: arg > $CLAUDE_BOTTLE_BACKEND > "docker"). CLI: - `./cli.py list active` enumerates every backend, prints tab-separated `<backend>\t<slug>\t<agent>\t<services>`. The smolmachines bottle the user was looking for now shows up. - `./cli.py start` grows `--backend=<docker|smolmachines>` (choices pulled live from `known_backend_names()`). Threaded through `prepare_with_preflight(backend_name=...)` so the resume path picks up the flag too. Dashboard: - Active agents pane lists both backends (the row formatter now prefixes `[docker]` / `[smolmachines]`). - New-agent flow inserts a backend picker modal between agent pick and preflight (`_backend_picker_modal`). Short-circuits when only one backend is registered. - `discover_active_agents()` collapses to `enumerate_active_bottles()`; `_parse_services_by_project` and `_query_services_by_project` move to `backend/docker/cleanup.py` where the docker enumerator owns them. Tests: parser + enumerate-active tests relocated to `test_docker_enumerate_active.py`. New `test_backend_selection.py` covers `get_bottle_backend`, `known_backend_names`, `enumerate_active_bottles`. New `test_cli_start_backend_flag.py` covers `--backend`'s argparse shape + the explicit-over-env precedence. 605 unit tests pass. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
62 lines
2.2 KiB
Python
62 lines
2.2 KiB
Python
"""Unit: `cli.py start --backend=<name>` flag (issue #77).
|
|
|
|
Asserts that the flag wins over the env var, that the env var is
|
|
the fallback, and that the choices are pulled from the backend
|
|
registry (so adding a backend lights up in argparse without code
|
|
edits)."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import argparse
|
|
import os
|
|
import unittest
|
|
from unittest.mock import patch
|
|
|
|
|
|
from claude_bottle.backend import known_backend_names
|
|
|
|
|
|
class TestStartBackendFlag(unittest.TestCase):
|
|
"""The flag is wired by `cmd_start`'s argparse and threaded
|
|
through `prepare_with_preflight(backend_name=...)`. Rather than
|
|
drive the whole start flow (which builds containers), we test
|
|
the argparse shape and the resolution function separately."""
|
|
|
|
def _build_parser(self):
|
|
# Mirror the parser definition from `cmd_start` so this
|
|
# test doesn't have to invoke the full command.
|
|
parser = argparse.ArgumentParser(prog="cb start")
|
|
parser.add_argument(
|
|
"--backend",
|
|
choices=known_backend_names(),
|
|
default=None,
|
|
)
|
|
parser.add_argument("name")
|
|
return parser
|
|
|
|
def test_flag_recognized(self):
|
|
args = self._build_parser().parse_args(["--backend=smolmachines", "researcher"])
|
|
self.assertEqual("smolmachines", args.backend)
|
|
self.assertEqual("researcher", args.name)
|
|
|
|
def test_flag_default_none_means_env_or_docker(self):
|
|
args = self._build_parser().parse_args(["researcher"])
|
|
self.assertIsNone(args.backend)
|
|
|
|
def test_invalid_backend_rejected_by_argparse(self):
|
|
parser = self._build_parser()
|
|
with self.assertRaises(SystemExit):
|
|
parser.parse_args(["--backend=garbage", "researcher"])
|
|
|
|
def test_resolution_priority_explicit_over_env(self):
|
|
# Independent assertion that get_bottle_backend (where
|
|
# `--backend` ultimately threads to) prefers the explicit
|
|
# name over CLAUDE_BOTTLE_BACKEND.
|
|
from claude_bottle.backend import get_bottle_backend
|
|
with patch.dict(os.environ, {"CLAUDE_BOTTLE_BACKEND": "smolmachines"}):
|
|
self.assertEqual("docker", get_bottle_backend("docker").name)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|