diff --git a/AGENTS.md b/AGENTS.md
index a427128..12c7742 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -35,6 +35,7 @@ backend remains available with `BOT_BOTTLE_BACKEND=docker` or
 - `.bot-bottle/` — per-repo agent and bottle manifests (YAML markdown format).
 - `examples/` — example bottles and agents showing the manifest format.
 - `docs/README.md` — docs overview; when to write which document.
+- `docs/glossary.md` — canonical term definitions (Agent Provider, Bottle, Sealed Bottle, etc.).
 - `docs/prds/` — product requirement docs (see `docs/prds/README.md` for format).
 - `docs/research/` — research notes (see `docs/research/README.md`).
 - `docs/decisions/` — decision records (ADR-lite).
diff --git a/bot_bottle/backend/base.py b/bot_bottle/backend/base.py
index a58ad4f..14d5ecf 100644
--- a/bot_bottle/backend/base.py
+++ b/bot_bottle/backend/base.py
@@ -177,7 +177,7 @@ class ExecResult:
 
 @dataclass(frozen=True)
 class ActiveAgent:
-    """One currently-running agent, as the CLI `list active` and
+    """One currently-running agent, as the CLI `active` and
     dashboard agents pane render it. ("Agent" is the project's
     consistent name for the thing running inside a bottle — the
     bottle is the container, the agent is what runs in it.)
@@ -570,7 +570,7 @@ class BottleBackend(ABC, Generic[PlanT, CleanupT]):
         Linux + KVM. Used by the cross-backend
         `enumerate_active_agents` / `cmd_cleanup` to skip backends
         the operator hasn't installed, so a docker-only host
-        doesn't fail when `cli.py list active` walks past
+        doesn't fail when `cli.py active` walks past
         firecracker."""
 
     @classmethod
diff --git a/bot_bottle/backend/docker/enumerate.py b/bot_bottle/backend/docker/enumerate.py
index 0337d5a..8bfd91c 100644
--- a/bot_bottle/backend/docker/enumerate.py
+++ b/bot_bottle/backend/docker/enumerate.py
@@ -1,6 +1,6 @@
 """Active-agent enumeration for the docker backend.
 
-Returns `ActiveAgent` records the CLI `list active` command and the
+Returns `ActiveAgent` records the CLI `active` command and the
 dashboard agents pane consume. Empty when docker isn't reachable
 — gated by `has_backend('docker')` at the cross-backend caller
 so this module trusts that docker is available when called.
@@ -60,7 +60,7 @@ def _parse_services_by_project(stdout: str) -> dict[str, set[str]]:
 
 def _query_services_by_project() -> dict[str, set[str]]:
     """One `docker ps` call → `{project: {service, ...}}`. Used
-    by the CLI's `list active` and the dashboard's agents pane —
+    by the CLI's `active` and the dashboard's agents pane —
     one subprocess per refresh tick, not one per bottle."""
     try:
         r = subprocess.run(
diff --git a/bot_bottle/backend/selection.py b/bot_bottle/backend/selection.py
index 60e2fa5..85ffb6b 100644
--- a/bot_bottle/backend/selection.py
+++ b/bot_bottle/backend/selection.py
@@ -168,7 +168,7 @@ def has_backend(name: str) -> bool:
 
 def enumerate_active_agents() -> list[ActiveAgent]:
     """All currently-running agents, across every available
-    backend. Used by CLI `list active` and the dashboard's agents
+    backend. Used by CLI `active` and the dashboard's agents
     pane so neither has to know which backends exist. Skips
     backends whose `is_available()` reports False.
 
diff --git a/bot_bottle/cli/commands/__init__.py b/bot_bottle/cli/commands/__init__.py
index 813524f..de42a33 100644
--- a/bot_bottle/cli/commands/__init__.py
+++ b/bot_bottle/cli/commands/__init__.py
@@ -17,12 +17,12 @@ from typing import Callable
 # command name -> "<submodule>:<handler attr>". Kept as strings so building
 # the registry imports nothing; the module loads only when dispatched.
 _HANDLERS: dict[str, str] = {
+    "active": "active:cmd_active",
     "backend": "backend:cmd_backend",
     "cleanup": "cleanup:cmd_cleanup",
     "commit": "commit:cmd_commit",
     "edit": "edit:cmd_edit",
     "help": "help:cmd_help",
-    "info": "info:cmd_info",
     "init": "init:cmd_init",
     "list": "list:cmd_list",
     "login": "login:cmd_login",
diff --git a/bot_bottle/cli/commands/active.py b/bot_bottle/cli/commands/active.py
new file mode 100644
index 0000000..3c32122
--- /dev/null
+++ b/bot_bottle/cli/commands/active.py
@@ -0,0 +1,53 @@
+"""active: list currently-running bot-bottle bottles."""
+
+from __future__ import annotations
+
+import os
+import sys
+
+from ...backend import enumerate_active_agents
+from ..constants import PROG
+
+_ANSI_COLOR_CODES: dict[str, str] = {
+    "red": "\033[91m",
+    "green": "\033[92m",
+    "yellow": "\033[93m",
+    "blue": "\033[94m",
+    "magenta": "\033[95m",
+}
+_ANSI_RESET = "\033[0m"
+
+
+def _ansi_label(text: str, color: str) -> str:
+    if not color:
+        return text
+    if not sys.stdout.isatty():
+        return text
+    term = os.environ.get("TERM", "")
+    if term in ("dumb", ""):
+        return text
+    code = _ANSI_COLOR_CODES.get(color)
+    if not code:
+        return text
+    return f"{code}{text}{_ANSI_RESET}"
+
+
+def cmd_active(argv: list[str]) -> int:
+    if argv and argv[0] in ("-h", "--help"):
+        sys.stderr.write(f"usage: {PROG} active\n")
+        sys.stderr.write("\nList all currently-running bot-bottle bottles.\n")
+        sys.stderr.write("Output: <backend>\\t<slug>\\t<label>\\t<services>\n")
+        return 0
+
+    active = enumerate_active_agents()
+    if not active:
+        print("no active bot-bottle bottles", file=sys.stderr)
+        return 0
+    # One line per bottle: `<backend>\t<slug>\t<label>\t<services>`.
+    # Tab-separated keeps the format stable for shell pipelines.
+    for b in active:
+        services = ",".join(b.services) if b.services else "-"
+        display_name = f"{b.label} ({b.agent_name})" if b.label else b.agent_name
+        colored_name = _ansi_label(display_name, b.color)
+        print(f"{b.backend_name}\t{b.slug}\t{colored_name}\t{services}")
+    return 0
diff --git a/bot_bottle/cli/commands/commit.py b/bot_bottle/cli/commands/commit.py
index fcf454d..2e653b6 100644
--- a/bot_bottle/cli/commands/commit.py
+++ b/bot_bottle/cli/commands/commit.py
@@ -27,7 +27,7 @@ def cmd_commit(argv: list[str]) -> int:
         nargs="?",
         default=None,
         help=(
-            "bottle slug from `cli.py list active` "
+            "bottle slug from `cli.py active` "
             "(omit to pick interactively)"
         ),
     )
diff --git a/bot_bottle/cli/commands/help.py b/bot_bottle/cli/commands/help.py
index d7ee633..9e16372 100644
--- a/bot_bottle/cli/commands/help.py
+++ b/bot_bottle/cli/commands/help.py
@@ -21,14 +21,14 @@ def cmd_help(argv: list[str] | None = None) -> int:
     w = sys.stderr.write
     w(f"usage: {PROG} <command> [args...]\n\n")
     w("Commands:\n")
+    w("  active    list currently-running bot-bottle bottles\n")
     w("  backend   set up / check / undo a backend's host prerequisites (setup|status|teardown)\n")
     w("  cleanup   stop and remove all active bot-bottle containers\n")
     w("  commit    snapshot a running bottle's container state to a Docker image\n")
     w("  edit      open an agent in vim for editing\n")
     w("  help      show this command list\n")
-    w("  info      print env, skills, and prompt details for a named agent\n")
     w("  init      interactively create a new agent and add it to bot-bottle.json\n")
-    w("  list      list available agents or active containers\n")
+    w("  list      list available agents from bot-bottle.json\n")
     w("  login     register this host with a bot-bottle console\n")
     w("  resume    re-launch a bottle by its identity (continues state from PRD 0016)\n")
     w("  start     boot a container for a named agent and attach an interactive session\n")
diff --git a/bot_bottle/cli/commands/info.py b/bot_bottle/cli/commands/info.py
deleted file mode 100644
index 7850a2d..0000000
--- a/bot_bottle/cli/commands/info.py
+++ /dev/null
@@ -1,50 +0,0 @@
-"""info: print env, skills, and prompt details for a named agent."""
-
-from __future__ import annotations
-
-import argparse
-import os
-
-from ...log import info
-from ...manifest import ManifestIndex
-from ..constants import PROG
-
-
-def cmd_info(argv: list[str]) -> int:
-    parser = argparse.ArgumentParser(prog=f"{PROG} info", add_help=True)
-    parser.add_argument("name", help="agent name defined in bot-bottle.json")
-    args = parser.parse_args(argv)
-
-    names = ManifestIndex.resolve(os.getcwd())
-    names.require_agent(args.name)
-    manifest = names.load_for_agent(args.name)
-
-    agent = manifest.agent
-    bottle = manifest.bottle
-    env_names = list(bottle.env.keys())
-    prompt_first_line = agent.prompt.splitlines()[0] if agent.prompt else ""
-
-    print()
-    info(f"agent           : {args.name}")
-    info(f"env (names only): {', '.join(env_names) if env_names else '(none)'}")
-    info(f"skills          : {' '.join(agent.skills) if agent.skills else '(none)'}")
-    info(
-        f"prompt          : {len(agent.prompt)} chars; "
-        f"first line: {prompt_first_line or '(empty)'}"
-    )
-    info(f"bottle             : {agent.bottle}")
-    identity = manifest.git_identity_summary()
-    if identity:
-        info(f"  git identity  : {identity}")
-    if bottle.git:
-        for e in bottle.git:
-            info(
-                f"  git remote    : {e.Name} -> {e.Upstream} "
-                f"(IdentityFile={e.IdentityFile})"
-            )
-            if e.KnownHostKey:
-                info(f"    KnownHostKey: {e.KnownHostKey}")
-    else:
-        info("  git remotes   : (none)")
-    print()
-    return 0
diff --git a/bot_bottle/cli/commands/list.py b/bot_bottle/cli/commands/list.py
index 6b83c4e..c67df2f 100644
--- a/bot_bottle/cli/commands/list.py
+++ b/bot_bottle/cli/commands/list.py
@@ -1,62 +1,21 @@
-"""list: list available agents or active bottles."""
+"""list: list available agents."""
 
 from __future__ import annotations
 
-import argparse
 import os
 import sys
 
-from ...backend import enumerate_active_agents
 from ...manifest import ManifestIndex
 from ..constants import PROG
 
-_ANSI_COLOR_CODES: dict[str, str] = {
-    "red": "\033[91m",
-    "green": "\033[92m",
-    "yellow": "\033[93m",
-    "blue": "\033[94m",
-    "magenta": "\033[95m",
-}
-_ANSI_RESET = "\033[0m"
-
-
-def _ansi_label(text: str, color: str) -> str:
-    if not color:
-        return text
-    if not sys.stdout.isatty():
-        return text
-    term = os.environ.get("TERM", "")
-    if term in ("dumb", ""):
-        return text
-    code = _ANSI_COLOR_CODES.get(color)
-    if not code:
-        return text
-    return f"{code}{text}{_ANSI_RESET}"
-
 
 def cmd_list(argv: list[str]) -> int:
-    parser = argparse.ArgumentParser(prog=f"{PROG} list", add_help=True)
-    parser.add_argument("scope", choices=["available", "active"])
-    args = parser.parse_args(argv)
-
-    if args.scope == "available":
-        manifest = ManifestIndex.resolve(os.getcwd())
-        for name in manifest.all_agent_names:
-            print(name)
+    if argv and argv[0] in ("-h", "--help"):
+        sys.stderr.write(f"usage: {PROG} list\n")
+        sys.stderr.write("\nList all available agents from bot-bottle.json.\n")
         return 0
 
-    # `active` enumerates every backend (docker, firecracker,
-    # macos-container) so non-docker bottles aren't hidden behind
-    # the env var.
-    active = enumerate_active_agents()
-    if not active:
-        print("no active bot-bottle bottles", file=sys.stderr)
-        return 0
-    # One line per bottle: `<backend>\t<slug>\t<label>\t<services>`.
-    # Tab-separated keeps the format stable for shell pipelines.
-    for b in active:
-        services = ",".join(b.services) if b.services else "-"
-        display_name = f"{b.label} ({b.agent_name})" if b.label else b.agent_name
-        colored_name = _ansi_label(display_name, b.color)
-        print(f"{b.backend_name}\t{b.slug}\t{colored_name}\t{services}")
+    manifest = ManifestIndex.resolve(os.getcwd())
+    for name in manifest.all_agent_names:
+        print(name)
     return 0
diff --git a/docs/README.md b/docs/README.md
index 62d6cfa..3e4cd0e 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -7,6 +7,7 @@ picking the right document for what you're capturing.
 
 | Artifact | For |
 |---|---|
+| **Glossary** (`docs/glossary.md`) | Canonical term definitions — what words mean in this project. |
 | **PRD** (`docs/prds/`) | A feature: what to build, scope, success criteria. |
 | **Research note** (`docs/research/`) | A landscape/tradeoff investigation. |
 | **Decision record** (`docs/decisions/`) | A decision that isn't itself a feature — a policy, a convention, a "we will / won't do this," or a load-bearing choice made inside a larger PRD that deserves to be discoverable on its own. |
diff --git a/docs/glossary.md b/docs/glossary.md
new file mode 100644
index 0000000..52ee4be
--- /dev/null
+++ b/docs/glossary.md
@@ -0,0 +1,57 @@
+# Glossary
+
+Canonical terminology for bot-bottle. Prefer these names in docs, comments, and UI.
+
+---
+
+## Agent Provider
+
+The component that connects to an external model provider and sets up the model
+harness inside the agent runtime. Configured in a bottle manifest under
+`agent_provider:`; built-in templates are `claude` and `codex`. Responsible for
+provider-specific auth, startup args, and egress routes.
+
+## Agent Runtime
+
+The OCI image (and the container or VM it runs in) that houses the model
+harness. On the macOS-container backend this is an Apple Container; on
+Firecracker it is a microVM; on the legacy Docker backend it is a Docker
+container. The agent runtime is built from the agent provider's Dockerfile
+(built-in or custom).
+
+## Agent / Agent Definition
+
+A Markdown file with YAML frontmatter that declares the system prompt and
+identity of the model harness. Lives under `~/.bot-bottle/agents/` or a repo's
+`.bot-bottle/agents/`. Specifies which bottle to run under (`bottle:`) and
+which skills to load. Agent definitions are safe to commit; they contain no
+secrets or egress policy.
+
+## Bottle / Bottle Definition
+
+A Markdown file with YAML frontmatter that declares the security and runtime
+boundaries for one agent runtime: egress allowlist, git remotes, env vars,
+nested-container flag, and agent provider config. Lives under
+`~/.bot-bottle/bottles/`. Bottles are scoped to `$HOME` so a cloned repo
+cannot override host egress policy.
+
+## Sealed Bottle
+
+The fully-resolved bottle after all `extends:` inheritance is applied and every
+field has been validated. The sealed bottle is the immutable boundary spec that
+the launcher enforces — no further overrides are possible once it is sealed.
+
+## Bottled Agent
+
+The combination of an Agent Definition and a Sealed Bottle, representing a
+single deployable agent with a fixed identity and fixed boundaries. A bottled
+agent has two observable states:
+
+- **Active** — the agent runtime is running and the agent is executing.
+- **Frozen** — the agent runtime has been snapshotted (Firecracker committed
+  image); the agent is not running but can be resumed from the snapshot.
+
+## Active Bottle
+
+Shorthand for an active (running) Bottled Agent. Used in the supervisor TUI
+and discovery layer to mean "a bottle whose agent runtime is currently up."