didericis
3ed3745982
Final PRD 0020 chunk. `x` on a focused agents-pane row tears
down the selected bottle if the dashboard owns it (started via
the chunk-2 `n` flow): pops `(cm, bottle, identity)` from the
main loop's bottles map, snapshots the transcript best-effort,
calls `cm.__exit__(None, None, None)` to drive the existing
compose-down + network-remove sequence, then `settle_state` to
honor any pre-existing preserve marker.
On a non-owned slug (discovered via `list_active_slugs` but not
in the dashboard's bottles dict — i.e., previous-dashboard or
external `./cli.py start` bottle), `x` is a no-op with a status
hint pointing at `./cli.py cleanup`. Matches the PRD's
cross-dashboard re-attach model: the dashboard can re-attach
either kind, but can only tear down its own.
The PRD's chunk 5 ("quit-cleanup") is satisfied by the existing
no-op behavior of `q` — per the user's resolved-question
answer, quit leaves bottles running unchanged. No code change
needed for that.
Footer surfaces `[x] stop`. 465 unit tests pass (1 new for the
non-owned no-op path; the owned path is integration territory
because it drives a real compose-down).
452 lines
17 KiB
Python
452 lines
17 KiB
Python
"""Unit: dashboard.discover_active_agents (PRD 0019 chunk 1).
|
|
|
|
The full discover function fans out to `docker compose ls`, `docker
|
|
ps`, and per-bottle metadata.json reads — too much for a unit test.
|
|
Tests split into:
|
|
|
|
- Parser tests for `_parse_services_by_project`: pure function, no
|
|
I/O, deterministic on its input string.
|
|
- Integration-shaped tests that monkeypatch the slug list +
|
|
services map and read metadata from a fake home, then assert
|
|
the assembled `ActiveAgent` shape.
|
|
|
|
The actual `docker ps` invocation is exercised by manual probing
|
|
during development and the (real-docker) integration tests; here
|
|
we lock down the shape contract so a regression surfaces in unit CI.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import tempfile
|
|
import unittest
|
|
from pathlib import Path
|
|
|
|
from claude_bottle import supervise
|
|
from claude_bottle.backend.docker import bottle_state
|
|
from claude_bottle.cli import dashboard
|
|
|
|
|
|
class TestParseServicesByProject(unittest.TestCase):
|
|
def test_empty_input(self):
|
|
self.assertEqual({}, dashboard._parse_services_by_project(""))
|
|
|
|
def test_one_container(self):
|
|
out = dashboard._parse_services_by_project(
|
|
"claude-bottle-dev-abc\tegress\n"
|
|
)
|
|
self.assertEqual({"claude-bottle-dev-abc": {"egress"}}, out)
|
|
|
|
def test_multiple_services_per_project(self):
|
|
out = dashboard._parse_services_by_project(
|
|
"claude-bottle-dev-abc\tegress\n"
|
|
"claude-bottle-dev-abc\tpipelock\n"
|
|
"claude-bottle-dev-abc\tsupervise\n"
|
|
)
|
|
self.assertEqual(
|
|
{"claude-bottle-dev-abc": {"egress", "pipelock", "supervise"}},
|
|
out,
|
|
)
|
|
|
|
def test_multiple_projects(self):
|
|
out = dashboard._parse_services_by_project(
|
|
"proj-a\tegress\n"
|
|
"proj-b\tpipelock\n"
|
|
"proj-a\tsupervise\n"
|
|
)
|
|
self.assertEqual(
|
|
{"proj-a": {"egress", "supervise"}, "proj-b": {"pipelock"}},
|
|
out,
|
|
)
|
|
|
|
def test_skips_lines_missing_either_field(self):
|
|
# Defends against unlabeled containers slipping into the
|
|
# output (the filter should prevent it, but be robust).
|
|
out = dashboard._parse_services_by_project(
|
|
"claude-bottle-dev-abc\tegress\n"
|
|
"no-tab-here\n"
|
|
"\tmissing-project\n"
|
|
"missing-service\t\n"
|
|
)
|
|
self.assertEqual({"claude-bottle-dev-abc": {"egress"}}, out)
|
|
|
|
|
|
class _FakeHomeMixin:
|
|
def _setup_fake_home(self) -> None:
|
|
self._tmp = tempfile.TemporaryDirectory(prefix="dashboard-aa-test.")
|
|
original = supervise.claude_bottle_root
|
|
|
|
def fake_root() -> Path:
|
|
return Path(self._tmp.name) / ".claude-bottle"
|
|
|
|
supervise.claude_bottle_root = fake_root # type: ignore[assignment]
|
|
self._restore_home = lambda: setattr(supervise, "claude_bottle_root", original)
|
|
|
|
def _teardown_fake_home(self) -> None:
|
|
self._restore_home()
|
|
self._tmp.cleanup()
|
|
|
|
|
|
class TestDiscoverActiveAgents(_FakeHomeMixin, unittest.TestCase):
|
|
def setUp(self) -> None:
|
|
self._setup_fake_home()
|
|
self._orig_slugs = dashboard.list_active_slugs
|
|
self._orig_services = dashboard._query_services_by_project
|
|
|
|
def tearDown(self) -> None:
|
|
dashboard.list_active_slugs = self._orig_slugs
|
|
dashboard._query_services_by_project = self._orig_services
|
|
self._teardown_fake_home()
|
|
|
|
def _stub(self, slugs: list[str], services_by_project: dict[str, set[str]]) -> None:
|
|
dashboard.list_active_slugs = lambda: slugs
|
|
dashboard._query_services_by_project = lambda: services_by_project
|
|
|
|
def test_no_active_slugs_returns_empty(self):
|
|
self._stub([], {})
|
|
self.assertEqual([], dashboard.discover_active_agents())
|
|
|
|
def test_assembles_from_metadata_and_services(self):
|
|
bottle_state.write_metadata(bottle_state.BottleMetadata(
|
|
identity="dev-abc",
|
|
agent_name="implementer",
|
|
cwd="",
|
|
copy_cwd=False,
|
|
started_at="2026-05-26T03:00:00+00:00",
|
|
compose_project="claude-bottle-dev-abc",
|
|
))
|
|
self._stub(
|
|
["dev-abc"],
|
|
{"claude-bottle-dev-abc": {"pipelock", "egress", "supervise"}},
|
|
)
|
|
agents = dashboard.discover_active_agents()
|
|
self.assertEqual(1, len(agents))
|
|
a = agents[0]
|
|
self.assertEqual("dev-abc", a.slug)
|
|
self.assertEqual("implementer", a.agent_name)
|
|
self.assertEqual("2026-05-26T03:00:00+00:00", a.started_at)
|
|
self.assertEqual(("egress", "pipelock", "supervise"), a.services)
|
|
|
|
def test_missing_metadata_renders_question_mark(self):
|
|
# State dir doesn't exist for this slug — agent_name falls
|
|
# back to "?" rather than dropping the row.
|
|
self._stub(["mystery-zzz"], {"claude-bottle-mystery-zzz": {"pipelock"}})
|
|
agents = dashboard.discover_active_agents()
|
|
self.assertEqual(1, len(agents))
|
|
self.assertEqual("?", agents[0].agent_name)
|
|
self.assertEqual("", agents[0].started_at)
|
|
self.assertEqual(("pipelock",), agents[0].services)
|
|
|
|
def test_no_services_for_project_yields_empty_tuple(self):
|
|
# Race window between `compose up` returning and the actual
|
|
# containers being listed in `docker ps` — render the row
|
|
# but with no services.
|
|
bottle_state.write_metadata(bottle_state.BottleMetadata(
|
|
identity="warming-up",
|
|
agent_name="researcher",
|
|
cwd="",
|
|
copy_cwd=False,
|
|
started_at="2026-05-26T03:05:00+00:00",
|
|
compose_project="claude-bottle-warming-up",
|
|
))
|
|
self._stub(["warming-up"], {})
|
|
agents = dashboard.discover_active_agents()
|
|
self.assertEqual((), agents[0].services)
|
|
|
|
def test_preserves_slug_order(self):
|
|
for slug in ("z-1", "a-1", "m-1"):
|
|
bottle_state.write_metadata(bottle_state.BottleMetadata(
|
|
identity=slug,
|
|
agent_name=slug.split("-")[0],
|
|
cwd="",
|
|
copy_cwd=False,
|
|
started_at="t",
|
|
compose_project=f"claude-bottle-{slug}",
|
|
))
|
|
# list_active_slugs returns sorted; preserve that order in
|
|
# the output.
|
|
self._stub(["a-1", "m-1", "z-1"], {})
|
|
agents = dashboard.discover_active_agents()
|
|
self.assertEqual(
|
|
["a-1", "m-1", "z-1"],
|
|
[a.slug for a in agents],
|
|
)
|
|
|
|
|
|
class TestFormatAgentRow(unittest.TestCase):
|
|
"""One-line row formatting for the agents pane (PRD 0019 chunk 2)."""
|
|
|
|
def _agent(self, **overrides) -> dashboard.ActiveAgent:
|
|
defaults = dict(
|
|
slug="dev-abc12",
|
|
agent_name="implementer",
|
|
started_at="2026-05-26T02:55:01+00:00",
|
|
services=("egress", "git-gate", "pipelock", "supervise"),
|
|
)
|
|
defaults.update(overrides)
|
|
return dashboard.ActiveAgent(**defaults)
|
|
|
|
def test_renders_slug_name_time_services(self):
|
|
s = dashboard._format_agent_row(self._agent(), 200)
|
|
self.assertIn("dev-abc12", s)
|
|
self.assertIn("implementer", s)
|
|
self.assertIn("02:55:01", s)
|
|
self.assertIn("egress,git-gate,pipelock,supervise", s)
|
|
|
|
def test_starting_label_when_no_services(self):
|
|
# Race window: compose project is up but containers haven't
|
|
# been picked up by `docker ps` yet.
|
|
s = dashboard._format_agent_row(self._agent(services=()), 200)
|
|
self.assertIn("(starting)", s)
|
|
|
|
def test_filters_agent_service_from_display(self):
|
|
# The `agent` service is always present for an active bottle;
|
|
# listing it is noise. The row should show only the sidecars.
|
|
s = dashboard._format_agent_row(
|
|
self._agent(services=("agent", "pipelock", "supervise")), 200,
|
|
)
|
|
self.assertIn("[pipelock,supervise]", s)
|
|
self.assertNotIn("agent,", s)
|
|
self.assertNotIn(",agent", s)
|
|
|
|
def test_only_agent_service_shows_starting(self):
|
|
# A bottle whose only running service is `agent` (sidecars
|
|
# still warming up) renders as `(starting)`.
|
|
s = dashboard._format_agent_row(self._agent(services=("agent",)), 200)
|
|
self.assertIn("(starting)", s)
|
|
|
|
def test_question_mark_when_no_started_at(self):
|
|
s = dashboard._format_agent_row(self._agent(started_at=""), 200)
|
|
self.assertIn("started ?", s)
|
|
|
|
def test_truncates_to_maxw(self):
|
|
s = dashboard._format_agent_row(self._agent(), 30)
|
|
self.assertLessEqual(len(s), 30)
|
|
self.assertTrue(s.endswith("…"))
|
|
|
|
|
|
class TestSelectionStatus(unittest.TestCase):
|
|
"""Idle-state status-line text for the agents-pane focus
|
|
(PRD 0019 chunk 3). Empty when the proposals pane is focused;
|
|
surfaces the selected agent (or a clear placeholder) when the
|
|
agents pane is focused."""
|
|
|
|
def _agent(self, slug: str) -> dashboard.ActiveAgent:
|
|
return dashboard.ActiveAgent(
|
|
slug=slug, agent_name="x", started_at="", services=(),
|
|
)
|
|
|
|
def test_empty_when_proposals_focused(self):
|
|
s = dashboard._selection_status(
|
|
dashboard.PANE_PROPOSALS, [self._agent("a-1")], 0,
|
|
)
|
|
self.assertEqual("", s)
|
|
|
|
def test_no_agents_message_when_agents_pane_empty(self):
|
|
s = dashboard._selection_status(dashboard.PANE_AGENTS, [], 0)
|
|
self.assertEqual("[no active agents]", s)
|
|
|
|
def test_shows_selected_slug(self):
|
|
agents = [self._agent("a-1"), self._agent("b-2"), self._agent("c-3")]
|
|
s = dashboard._selection_status(dashboard.PANE_AGENTS, agents, 1)
|
|
self.assertEqual("[selected: b-2]", s)
|
|
|
|
def test_out_of_bounds_falls_back_to_no_selection(self):
|
|
agents = [self._agent("only")]
|
|
s = dashboard._selection_status(dashboard.PANE_AGENTS, agents, 99)
|
|
self.assertEqual("[no agent selected]", s)
|
|
|
|
|
|
class TestFilterAgents(unittest.TestCase):
|
|
"""Pure-function picker filter (PRD 0020 chunk 2). Curses-free
|
|
so we can exercise the substring + case-insensitivity rules
|
|
directly."""
|
|
|
|
NAMES = ["implementer", "researcher", "triage-bot", "ImplDeluxe"]
|
|
|
|
def test_empty_query_returns_all(self):
|
|
self.assertEqual(self.NAMES, dashboard._filter_agents("", self.NAMES))
|
|
|
|
def test_substring_match(self):
|
|
self.assertEqual(
|
|
["implementer", "ImplDeluxe"],
|
|
dashboard._filter_agents("impl", self.NAMES),
|
|
)
|
|
|
|
def test_case_insensitive(self):
|
|
self.assertEqual(
|
|
["implementer", "ImplDeluxe"],
|
|
dashboard._filter_agents("IMPL", self.NAMES),
|
|
)
|
|
|
|
def test_no_match_returns_empty(self):
|
|
self.assertEqual([], dashboard._filter_agents("zzz", self.NAMES))
|
|
|
|
def test_preserves_input_order(self):
|
|
# Filtering should never re-sort; the picker draws in the
|
|
# order the manifest exposed.
|
|
out = dashboard._filter_agents("e", ["beta", "alpha", "echo"])
|
|
self.assertEqual(["beta", "echo"], out)
|
|
|
|
|
|
class TestRunningCounts(unittest.TestCase):
|
|
"""Per-agent running-count surfaced in the picker so the
|
|
operator sees `(N running)` before picking. Counts come from
|
|
the dashboard's current `discover_active_agents` snapshot."""
|
|
|
|
def _agent(self, agent_name: str) -> dashboard.ActiveAgent:
|
|
return dashboard.ActiveAgent(
|
|
slug=f"{agent_name}-abc",
|
|
agent_name=agent_name,
|
|
started_at="",
|
|
services=(),
|
|
)
|
|
|
|
def test_empty_when_no_active_agents(self):
|
|
self.assertEqual({}, dashboard._running_counts({}, []))
|
|
|
|
def test_one_per_unique_agent_name(self):
|
|
agents = [self._agent("a"), self._agent("b"), self._agent("c")]
|
|
self.assertEqual(
|
|
{"a": 1, "b": 1, "c": 1},
|
|
dashboard._running_counts({}, agents),
|
|
)
|
|
|
|
def test_counts_collisions(self):
|
|
agents = [
|
|
self._agent("implementer"),
|
|
self._agent("implementer"),
|
|
self._agent("researcher"),
|
|
]
|
|
self.assertEqual(
|
|
{"implementer": 2, "researcher": 1},
|
|
dashboard._running_counts({}, agents),
|
|
)
|
|
|
|
|
|
class TestSelectedAgent(unittest.TestCase):
|
|
"""`_selected_agent` is what chunk 4's e/p key handlers use to
|
|
decide whether to fire and which agent to target."""
|
|
|
|
def _agent(self, slug: str, services: tuple[str, ...] = ()) -> dashboard.ActiveAgent:
|
|
return dashboard.ActiveAgent(
|
|
slug=slug, agent_name="x", started_at="", services=services,
|
|
)
|
|
|
|
def test_none_when_proposals_focused(self):
|
|
agents = [self._agent("a-1")]
|
|
self.assertIsNone(
|
|
dashboard._selected_agent(dashboard.PANE_PROPOSALS, agents, 0),
|
|
)
|
|
|
|
def test_none_when_no_agents(self):
|
|
self.assertIsNone(
|
|
dashboard._selected_agent(dashboard.PANE_AGENTS, [], 0),
|
|
)
|
|
|
|
def test_returns_indexed_agent_when_in_range(self):
|
|
agents = [self._agent("a-1"), self._agent("b-2")]
|
|
result = dashboard._selected_agent(dashboard.PANE_AGENTS, agents, 1)
|
|
self.assertIsNotNone(result)
|
|
assert result is not None # for type checker
|
|
self.assertEqual("b-2", result.slug)
|
|
|
|
def test_none_when_index_out_of_range(self):
|
|
agents = [self._agent("only")]
|
|
self.assertIsNone(
|
|
dashboard._selected_agent(dashboard.PANE_AGENTS, agents, 99),
|
|
)
|
|
|
|
|
|
class TestBottleForSlug(unittest.TestCase):
|
|
"""Re-attach target resolution (PRD 0020 chunk 3). Dashboard-
|
|
owned bottles return the stored handle as-is; non-owned bottles
|
|
get a synthesized DockerBottle backed by the slug-derived
|
|
container name."""
|
|
|
|
def test_owned_bottle_returns_held_handle(self):
|
|
sentinel = object()
|
|
bottles = {"dev-abc": (None, sentinel, "dev-abc")}
|
|
bottle, _ = dashboard._bottle_for_slug("dev-abc", bottles, None)
|
|
self.assertIs(sentinel, bottle)
|
|
|
|
def test_unowned_synthesizes_docker_bottle(self):
|
|
bottle, _ = dashboard._bottle_for_slug("dev-xyz", {}, None)
|
|
# The synth wraps the slug-derived container name.
|
|
self.assertEqual("claude-bottle-dev-xyz", bottle.name)
|
|
|
|
def test_unowned_without_manifest_omits_prompt_path(self):
|
|
bottle, hint = dashboard._bottle_for_slug("dev-xyz", {}, None)
|
|
self.assertEqual("", hint)
|
|
|
|
|
|
class TestStopBottleFlow(unittest.TestCase):
|
|
"""Explicit per-bottle stop (PRD 0020 chunk 4). The non-owned
|
|
path is the one safe to test without curses + docker — the
|
|
owned path drives `cm.__exit__` against a real launch context
|
|
and belongs in integration tests."""
|
|
|
|
def test_non_owned_returns_cleanup_hint(self):
|
|
# stdscr is None here on purpose — the non-owned branch
|
|
# returns before any curses call.
|
|
msg = dashboard._stop_bottle_flow(
|
|
stdscr=None, # type: ignore[arg-type]
|
|
bottles={},
|
|
slug="ghost-zzz",
|
|
)
|
|
self.assertIn("not dashboard-owned", msg)
|
|
self.assertIn("./cli.py cleanup", msg)
|
|
|
|
|
|
class TestOperatorEditFlowGuards(_FakeHomeMixin, unittest.TestCase):
|
|
"""Chunk-4 contract: the edit flow refuses when the selected
|
|
agent doesn't have the required sidecar running. The discover-
|
|
and-prompt scaffolding is gone, so the gating happens here
|
|
instead of in the key handler."""
|
|
|
|
def setUp(self) -> None:
|
|
self._setup_fake_home()
|
|
|
|
def tearDown(self) -> None:
|
|
self._teardown_fake_home()
|
|
|
|
def _agent(self, services: tuple[str, ...]) -> dashboard.ActiveAgent:
|
|
return dashboard.ActiveAgent(
|
|
slug="dev-abc12",
|
|
agent_name="impl",
|
|
started_at="",
|
|
services=services,
|
|
)
|
|
|
|
def test_routes_edit_refuses_without_egress(self):
|
|
# Bottle without bottle.egress.routes → no egress sidecar.
|
|
msg = dashboard._operator_edit_flow(
|
|
stdscr=None, # type: ignore[arg-type]
|
|
agent=self._agent(("pipelock", "supervise")),
|
|
required_service="egress",
|
|
label="routes",
|
|
fetch=lambda _: "x",
|
|
apply=lambda _slug, _content: None,
|
|
suffix=".yaml",
|
|
)
|
|
self.assertIn("no running egress sidecar", msg)
|
|
self.assertIn("dev-abc12", msg)
|
|
|
|
def test_pipelock_edit_refuses_when_pipelock_missing(self):
|
|
# Belt-and-braces — pipelock should always be there, but
|
|
# the race window between `compose up` and `docker ps`
|
|
# update is real.
|
|
msg = dashboard._operator_edit_flow(
|
|
stdscr=None, # type: ignore[arg-type]
|
|
agent=self._agent(()),
|
|
required_service="pipelock",
|
|
label="pipelock",
|
|
fetch=lambda _: "x",
|
|
apply=lambda _slug, _content: None,
|
|
suffix=".txt",
|
|
)
|
|
self.assertIn("no running pipelock sidecar", msg)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|