Merge branch 'main' into feat/10-browse-dialog

Browse catalog dialog (issue #10 phase 2)
Adds the user-facing half of the server catalog: a searchable, signed catalog browser wired to the existing paste/import path. bcc_core.py (pure, GUI-free, per the design comment on #10): - CATALOG_CATEGORY_GROUPS / catalog_category_group(): collapses the raw taxonomy to the 7 UI chips (unknown categories fall back to Other, never drop an entry). - catalog_entry_matches_query() / filter_catalog_entries() / catalog_entries_in_group(): search-as-you-type + category chip filtering over catalog entries. - format_freshness_hint(): last_release ISO date -> "Last updated N months/years ago", '' when missing/unparseable/future. - first_unfilled_focus_target(): finds the first <PLACEHOLDER> arg or blank env_required key so the GUI can focus it after Add. - load_bundled_catalog_entries(): reads+verifies+validates the bundled catalog.json/.sig pair, returns servers or an EMPTY list on ANY failure -- the load-bearing guarantee behind the dialog's empty state. - Bug fix: catalog_entry_to_paste_json() only copied config.env, ignoring env_required -- the field where 9 of the 19 seed entries (postgres, github, notion, obsidian, brave-search, tavily, home-assistant, n8n, grafana) actually declare their secret var names. Add would have silently added these servers with no env field for the user to fill in. Now env_required keys are seeded as empty-string placeholders unless config.env already sets them. bcc.py: - BrowseCatalogDialog: search box, category chips, list, detail pane (description/notes/homepage/freshness hint/verbatim command preview), per-tier action (Add for basic, Open setup docs for link-only). Every catalog-derived string goes through plain_label() (Qt.PlainText + html.escape, matching catalog_console.py's approach) or an inherently-plain QPlainTextEdit for the command preview -- catalog.json takes community PRs, so every field is attacker-influenceable. - "Browse catalog…" button next to Paste JSON. - ServerEditor.focus_target(): selects the first unfilled arg line or opens the env-table cell editor for the first blank env row. - Save-time placeholder guard: warns (Yes/No, defaults No) when any server still has an unfilled <PLACEHOLDER>; never blocks a deliberate save, never saves one unnoticed. bcc.spec: bundle data/catalog.json.sig alongside catalog.json -- the signature file was missing from datas, so a frozen build would have had a catalog.json with no matching .sig for resolve_catalog() to verify against. tests/test_core.py: +82 tests covering category-group mapping, catalog search/filter, freshness-hint formatting (including the month/year rounding boundary), first_unfilled_focus_target, the catalog_entry_to_paste_json env_required fix (incl. a regression against the real shipped postgres entry), and load_bundled_catalog_entries under valid/tampered/wrong-key/missing- file/invalid-but-signed conditions plus an end-to-end check against the real data/catalog.json + .sig (19 entries). GUI code (BrowseCatalogDialog, ServerEditor.focus_target, MainWindow.browse_catalog) is unavoidably untested here -- PySide6 cannot import in this sandbox (missing libEGL/system GL libs) -- but all the logic it depends on is pushed into bcc_core.py and covered above.
2026-07-12 21:30:19 -04:00 · 2026-07-12 19:00:54 -04:00
4 changed files with 956 additions and 652 deletions
@@ -10,6 +10,7 @@ Run:  python mcp_manager.py

 from __future__ import annotations

+import html
 import sys
 import time
 from pathlib import Path
@@ -18,7 +19,6 @@ from typing import ClassVar
 from PySide6.QtCore import QRect, QSettings, QSize, Qt, QThread, QTimer, QUrl, Signal
 from PySide6.QtGui import (
    QAction,
-    QActionGroup,
    QColor,
    QCursor,
    QDesktopServices,
@@ -26,12 +26,13 @@ from PySide6.QtGui import (
    QIcon,
    QKeySequence,
    QPainter,
-    QPalette,
    QPixmap,
+    QTextCursor,
 )
 from PySide6.QtWidgets import (
    QAbstractItemView,
    QApplication,
+    QButtonGroup,
    QCheckBox,
    QComboBox,
    QDialog,
@@ -67,118 +68,105 @@ import bcc_core as core
 # thread during drag-and-drop import, so skip anything larger than this.
 MAX_DROP_IMPORT_BYTES = 5 * 1024 * 1024  # 5 MB

-# --- Theming (issue #75) -------------------------------------------------- #
-# The palette lives in bcc_core (testable without a Qt app); these module-level
-# names are rebound by `apply_palette()` whenever the theme changes.
-#
-# Why globals rather than passing a palette around: ~20 inline
-# `setStyleSheet(f"color: {MUTED}")` calls are scattered through this file, and
-# an f-string resolves its names when it runs, not when it's compiled. Rebinding
-# the globals means every one of those call sites picks up the new colour on its
-# next render, with no change to the call sites themselves.
-PALETTE = core.DARK_PALETTE
-ACCENT = ACCENT_DIM = BG = PANEL = PANEL_2 = TEXT = MUTED = BORDER = ""
-GOOD = BAD = WARN = REMOTE = ON_ACCENT = DISABLED_BG = MONO_BG = SEL_TEXT = ""
-STATUS_COLORS: dict[str, str] = {}
-HEALTH_COLORS: dict[str, str] = {}

-STATUS_GLYPH = {
-    "ok": "\u25cf",
-    "missing": "\u25cf",
-    "warn": "\u25b2",
-    "remote": "\u25c6",
-    "unknown": "\u25cb",
-}
+def plain_label(text: object) -> QLabel:
+    """A QLabel guaranteed to render `text` as plain text, never HTML.
+
+    Qt's QLabel auto-interprets HTML by default (Qt.AutoText). Every catalog
+    entry field (description, notes, display name, urls -- and especially
+    args) is attacker-influenceable: catalog.json accepts community PRs, and
+    only a valid Ed25519 signature stands between a PR and what a user sees
+    here. A `<b>` or `<img onerror=...>` in a description must render as
+    visible text, not markup -- exactly the same reasoning catalog_console.py
+    documents for its own plain_label(). Every catalog-derived string shown
+    by the Browse dialog MUST go through this helper (or an inherently
+    plain-text widget like QPlainTextEdit) rather than a bare QLabel(...).
+    """
+    label = QLabel(html.escape(str(text)))
+    label.setTextFormat(Qt.TextFormat.PlainText)
+    label.setWordWrap(True)
+    return label
+
+
+# --- One-line rebrand: change this to recolor the whole app --------------- #
+ACCENT = "#f97316"  # warm orange
+ACCENT_DIM = "#c2570b"
+BG = "#1b1d23"
+PANEL = "#23262e"
+PANEL_2 = "#2b2f39"
+TEXT = "#e7e9ee"
+MUTED = "#9aa0ad"
+BORDER = "#3a3f4b"
+GOOD = "#4ade80"
+BAD = "#f87171"
+WARN = "#fbbf24"
+
+STATUS_COLORS = {"ok": GOOD, "missing": BAD, "warn": WARN, "remote": "#60a5fa", "unknown": WARN}
+STATUS_GLYPH = {"ok": "●", "missing": "●", "warn": "▲", "remote": "◆", "unknown": "○"}

 # Health dot (spawn-test outcome, see core.HealthStatus) shown per row in the
 # server tables' "Health" column -- distinct from the PATH-dependency Status
 # column above.
-HEALTH_GLYPH = {"ok": "\u25cf", "failed": "\u25cf", "untested": "\u25cb"}
+HEALTH_COLORS = {"ok": GOOD, "failed": BAD, "untested": MUTED}
+HEALTH_GLYPH = {"ok": "●", "failed": "●", "untested": "○"}

-
-def build_stylesheet(p: core.Palette) -> str:
-    """Render the global QSS for a palette."""
-    return f"""
+STYLESHEET = f"""
 /* No font-family here on purpose: Qt already uses the native system UI font
   on every platform (San Francisco / Segoe UI / desktop default). Naming
   web-CSS aliases like -apple-system forces a costly font-alias scan. */
-* {{ font-size: 13px; color: {p.text}; }}
-QMainWindow, QDialog {{ background: {p.bg}; }}
+* {{ font-size: 13px; color: {TEXT}; }}
+QMainWindow, QDialog {{ background: {BG}; }}
 QLabel#h1 {{ font-size: 15px; font-weight: 600; }}
-QLabel#muted {{ color: {p.muted}; }}
-QFrame#card {{ background: {p.panel}; border: 1px solid {p.border}; border-radius: 10px; }}
+QLabel#muted {{ color: {MUTED}; }}
+QFrame#card {{ background: {PANEL}; border: 1px solid {BORDER}; border-radius: 10px; }}
 QLineEdit, QPlainTextEdit, QComboBox {{
-    background: {p.panel_2}; border: 1px solid {p.border}; border-radius: 7px;
-    padding: 6px 8px; selection-background-color: {p.accent}; selection-color: {p.on_accent};
+    background: {PANEL_2}; border: 1px solid {BORDER}; border-radius: 7px;
+    padding: 6px 8px; selection-background-color: {ACCENT}; selection-color: #1a1205;
 }}
-QLineEdit:focus, QPlainTextEdit:focus, QComboBox:focus {{ border: 1px solid {p.accent}; }}
+QLineEdit:focus, QPlainTextEdit:focus, QComboBox:focus {{ border: 1px solid {ACCENT}; }}
 QComboBox::drop-down {{ border: none; width: 22px; }}
-QComboBox QAbstractItemView {{ background: {p.panel_2}; border: 1px solid {p.border};
-    selection-background-color: {p.accent}; outline: none; }}
-QPushButton {{ background: {p.panel_2}; border: 1px solid {p.border}; border-radius: 7px;
+QComboBox QAbstractItemView {{ background: {PANEL_2}; border: 1px solid {BORDER};
+    selection-background-color: {ACCENT}; outline: none; }}
+QPushButton {{ background: {PANEL_2}; border: 1px solid {BORDER}; border-radius: 7px;
    padding: 7px 13px; }}
-QPushButton:hover {{ border: 1px solid {p.accent}; }}
-QPushButton:disabled {{ color: {p.muted}; background: {p.panel}; }}
-QPushButton#primary {{ background: {p.accent}; border: 1px solid {p.accent}; color: {p.on_accent}; font-weight: 600; }}
-QPushButton#primary:hover {{ background: {p.accent_dim}; }}
-QPushButton#primary:disabled {{ background: {p.panel}; color: {p.muted}; border: 1px solid {p.border}; }}
-QPushButton#danger:hover {{ border: 1px solid {p.bad}; color: {p.bad}; }}
-QTableWidget {{ background: {p.panel}; border: 1px solid {p.border}; border-radius: 10px;
+QPushButton:hover {{ border: 1px solid {ACCENT}; }}
+QPushButton:disabled {{ color: {MUTED}; background: {PANEL}; }}
+QPushButton#primary {{ background: {ACCENT}; border: 1px solid {ACCENT}; color: #1a1205; font-weight: 600; }}
+QPushButton#primary:hover {{ background: {ACCENT_DIM}; }}
+QPushButton#primary:disabled {{ background: {PANEL}; color: {MUTED}; border: 1px solid {BORDER}; }}
+QPushButton#danger:hover {{ border: 1px solid {BAD}; color: {BAD}; }}
+QTableWidget {{ background: {PANEL}; border: 1px solid {BORDER}; border-radius: 10px;
    gridline-color: transparent; outline: none; }}
 QTableWidget::item {{ padding: 6px 8px; border: none; }}
-QTableWidget::item:selected {{ background: {p.accent}; color: {p.on_accent}; }}
+QTableWidget::item:selected {{ background: {ACCENT}; color: #1a1205; }}
 /* Inline cell editors: the global QLineEdit padding/radius clips the text
   inside a table row, so give editors a compact, flat style instead. */
 QTableWidget QLineEdit {{
-    background: {p.panel_2}; color: {p.text}; border: 1px solid {p.accent};
+    background: {PANEL_2}; color: {TEXT}; border: 1px solid {ACCENT};
    border-radius: 3px; padding: 0px 4px; margin: 0px;
-    selection-background-color: {p.accent_dim}; selection-color: {p.selection_text};
+    selection-background-color: {ACCENT_DIM}; selection-color: #ffffff;
 }}
-QHeaderView::section {{ background: {p.panel}; color: {p.muted}; border: none;
-    border-bottom: 1px solid {p.border}; padding: 8px; font-weight: 600; }}
+QHeaderView::section {{ background: {PANEL}; color: {MUTED}; border: none;
+    border-bottom: 1px solid {BORDER}; padding: 8px; font-weight: 600; }}
 QScrollBar:vertical {{ background: transparent; width: 10px; margin: 2px; }}
-QScrollBar::handle:vertical {{ background: {p.border}; border-radius: 5px; min-height: 24px; }}
+QScrollBar::handle:vertical {{ background: {BORDER}; border-radius: 5px; min-height: 24px; }}
 QScrollBar::add-line, QScrollBar::sub-line {{ height: 0; }}
-QLabel#statusbar {{ color: {p.muted}; padding: 4px 2px; }}
-QLabel#warnBanner {{ color: {p.on_accent}; background: {p.warn}; border-radius: 8px; padding: 8px 10px; font-weight: 600; }}
-QLabel#section {{ color: {p.muted}; font-weight: 600; font-size: 12px; padding: 2px 2px; }}
-QLabel#sectionDisabled {{ color: {p.muted}; font-weight: 600; font-size: 12px; padding: 2px 2px; }}
-QLabel#placeholder {{ color: {p.muted}; padding: 12px; background: {p.panel_2}; border: 1px dashed {p.border}; border-radius: 8px; }}
-QTableWidget#disabledTable {{ background: {p.disabled_bg}; }}
-QTableWidget#disabledTable::item:selected {{ background: {p.accent}; color: {p.on_accent}; }}
+QLabel#statusbar {{ color: {MUTED}; padding: 4px 2px; }}
+QLabel#warnBanner {{ color: #1a1205; background: {WARN}; border-radius: 8px; padding: 8px 10px; font-weight: 600; }}
+QLabel#section {{ color: {MUTED}; font-weight: 600; font-size: 12px; padding: 2px 2px; }}
+QLabel#sectionDisabled {{ color: {MUTED}; font-weight: 600; font-size: 12px; padding: 2px 2px; }}
+QLabel#placeholder {{ color: {MUTED}; padding: 12px; background: {PANEL_2}; border: 1px dashed {BORDER}; border-radius: 8px; }}
+QTableWidget#disabledTable {{ background: #202229; }}
+QTableWidget#disabledTable::item:selected {{ background: {ACCENT}; color: #1a1205; }}
 QPlainTextEdit#diag {{ font-family: "Menlo", "Cascadia Code", "Consolas", "DejaVu Sans Mono", monospace;
-    font-size: 12px; background: {p.mono_bg}; border: 1px solid {p.border}; border-radius: 8px; }}
+    font-size: 12px; background: #16181d; border: 1px solid {BORDER}; border-radius: 8px; }}
 QFrame#diagCard {{ background: transparent; border: none; }}
 QSplitter::handle {{ background: transparent; }}
-QSplitter::handle:hover {{ background: {p.border}; border-radius: 4px; }}
-QSplitter::handle:pressed {{ background: {p.accent}; border-radius: 4px; }}
+QSplitter::handle:hover {{ background: {BORDER}; border-radius: 4px; }}
+QSplitter::handle:pressed {{ background: {ACCENT}; border-radius: 4px; }}
 """


-def apply_palette(p: core.Palette) -> str:
-    """Rebind the module-level colour names to `p` and return its stylesheet."""
-    global PALETTE, ACCENT, ACCENT_DIM, BG, PANEL, PANEL_2, TEXT, MUTED, BORDER
-    global GOOD, BAD, WARN, REMOTE, ON_ACCENT, DISABLED_BG, MONO_BG, SEL_TEXT
-    global STATUS_COLORS, HEALTH_COLORS
-    PALETTE = p
-    ACCENT, ACCENT_DIM = p.accent, p.accent_dim
-    BG, PANEL, PANEL_2 = p.bg, p.panel, p.panel_2
-    TEXT, MUTED, BORDER = p.text, p.muted, p.border
-    GOOD, BAD, WARN, REMOTE = p.good, p.bad, p.warn, p.remote
-    ON_ACCENT, DISABLED_BG, MONO_BG, SEL_TEXT = (
-        p.on_accent,
-        p.disabled_bg,
-        p.mono_bg,
-        p.selection_text,
-    )
-    STATUS_COLORS = {"ok": GOOD, "missing": BAD, "warn": WARN, "remote": REMOTE, "unknown": WARN}
-    HEALTH_COLORS = {"ok": GOOD, "failed": BAD, "untested": MUTED}
-    return build_stylesheet(p)
-
-
-STYLESHEET = apply_palette(core.DARK_PALETTE)
-
-
 # --------------------------------------------------------------------------- #
 # Background reachability tester (keeps the UI responsive during the request)
 # --------------------------------------------------------------------------- #
@@ -711,6 +699,39 @@ class ServerEditor(QFrame):
    def current_name(self) -> str:
        return self.name.text().strip()

+    def focus_target(self, target: tuple[str, int | str] | None):
+        """
+        Focus the field a catalog Add left unfilled -- `target` is whatever
+        core.first_unfilled_focus_target() returned: ("args", line_index),
+        ("env", var_name), or None (nothing to fill, so do nothing).
+
+        Only meaningful on the stdio page, which is the only page a catalog
+        entry ever populates (link-only entries never reach dump_data()).
+        """
+        if not target or self.type.currentIndex() != 0:
+            return
+        kind, value = target
+        if kind == "args":
+            self.args.setFocus()
+            cursor = self.args.textCursor()
+            cursor.movePosition(QTextCursor.MoveOperation.Start)
+            cursor.movePosition(
+                QTextCursor.MoveOperation.Down, QTextCursor.MoveMode.MoveAnchor, int(value)
+            )
+            cursor.movePosition(
+                QTextCursor.MoveOperation.EndOfLine, QTextCursor.MoveMode.KeepAnchor
+            )
+            self.args.setTextCursor(cursor)
+        elif kind == "env":
+            for r in range(self.env.table.rowCount()):
+                key_item = self.env.table.item(r, 0)
+                if key_item and key_item.text() == value:
+                    self.env.table.setCurrentCell(r, 1)
+                    val_item = self.env.table.item(r, 1)
+                    if val_item:
+                        self.env.table.editItem(val_item)
+                    break
+
    def _type_switched(self):
        self.stack.setCurrentIndex(self.type.currentIndex())
        self._emit()
@@ -1239,6 +1260,262 @@ class PasteDialog(QDialog):
            self.err.setText(str(e))


+# --------------------------------------------------------------------------- #
+# Browse catalog dialog (issue #10 phase 2): search/filter the signed,
+# bundled server catalog and add a "basic" entry through the existing
+# paste/import path, or send a "link-only" entry to its setup docs.
+#
+# Every widget here that shows catalog-derived text uses plain_label() or an
+# inherently-plain widget (QPlainTextEdit) -- see plain_label()'s docstring.
+# The dialog itself does no signature/schema work: MainWindow hands it an
+# already-verified `entries` list (bcc_core.load_bundled_catalog_entries()),
+# and an empty list here means "show the empty state", never "fall back to
+# something less trusted".
+# --------------------------------------------------------------------------- #
+class BrowseCatalogDialog(QDialog):
+    def __init__(self, parent, entries: list[dict]):
+        super().__init__(parent)
+        self.setWindowTitle("Browse catalog")
+        self.resize(880, 560)
+        self.entries = entries or []
+        self.result_entry: dict | None = None
+        self._current_entry: dict | None = None
+        self._current_homepage: str | None = None
+        self._current_docs_url: str | None = None
+        self._current_group = "All"
+
+        outer = QVBoxLayout(self)
+
+        if not self.entries:
+            # Signature verification failed, or nothing was bundled -- never
+            # show a half-trusted list, and never explain WHY beyond this;
+            # a stale/tampered catalog isn't the user's problem to diagnose.
+            msg = plain_label("Catalog unavailable.")
+            msg.setObjectName("placeholder")
+            msg.setAlignment(Qt.AlignmentFlag.AlignCenter)
+            outer.addWidget(msg, 1)
+            btns = QDialogButtonBox(QDialogButtonBox.StandardButton.Close)
+            btns.rejected.connect(self.reject)
+            outer.addWidget(btns)
+            return
+
+        search_row = QHBoxLayout()
+        self.search_box = QLineEdit()
+        self.search_box.setPlaceholderText("Search by name, description, or category…")
+        self.search_box.setClearButtonEnabled(True)
+        self.search_box.textChanged.connect(self._refresh_list)
+        search_row.addWidget(self.search_box, 1)
+        outer.addLayout(search_row)
+
+        chip_row = QHBoxLayout()
+        self._chip_group = QButtonGroup(self)
+        self._chip_group.setExclusive(True)
+        for label in core.CATALOG_CATEGORY_CHIPS:
+            btn = QPushButton(label)
+            btn.setCheckable(True)
+            btn.setChecked(label == "All")
+            btn.clicked.connect(lambda _checked=False, g=label: self._set_group(g))
+            self._chip_group.addButton(btn)
+            chip_row.addWidget(btn)
+        chip_row.addStretch()
+        outer.addLayout(chip_row)
+
+        splitter = QSplitter(Qt.Orientation.Horizontal)
+
+        left = QWidget()
+        lv = QVBoxLayout(left)
+        lv.setContentsMargins(0, 0, 0, 0)
+        self.list = QListWidget()
+        self.list.currentItemChanged.connect(self._on_selected)
+        lv.addWidget(self.list, 1)
+        splitter.addWidget(left)
+
+        right = QFrame()
+        right.setObjectName("card")
+        rv = QVBoxLayout(right)
+        self.detail_title = plain_label("")
+        self.detail_title.setObjectName("h1")
+        rv.addWidget(self.detail_title)
+        self.detail_meta = plain_label("")
+        self.detail_meta.setObjectName("muted")
+        rv.addWidget(self.detail_meta)
+        self.detail_freshness = plain_label("")
+        self.detail_freshness.setObjectName("muted")
+        rv.addWidget(self.detail_freshness)
+        self.detail_desc = plain_label("")
+        rv.addWidget(self.detail_desc)
+        self.detail_notes = plain_label("")
+        self.detail_notes.setObjectName("muted")
+        rv.addWidget(self.detail_notes)
+        self.detail_homepage_btn = QPushButton("Open homepage")
+        self.detail_homepage_btn.clicked.connect(self._open_homepage)
+        rv.addWidget(self.detail_homepage_btn)
+        rv.addWidget(plain_label("Exact command this will add:"))
+        self.detail_command_preview = QPlainTextEdit()
+        self.detail_command_preview.setObjectName("diag")
+        self.detail_command_preview.setReadOnly(True)
+        # Read-only QPlainTextEdit never interprets HTML, regardless of what
+        # a compromised/careless catalog entry's command/args contain -- this
+        # is the field that renders "the exact bytes that will be written".
+        rv.addWidget(self.detail_command_preview, 1)
+        self.detail_action_btn = QPushButton("")
+        self.detail_action_btn.setObjectName("primary")
+        self.detail_action_btn.clicked.connect(self._on_action)
+        rv.addWidget(self.detail_action_btn)
+        splitter.addWidget(right)
+
+        splitter.setSizes([360, 480])
+        outer.addWidget(splitter, 1)
+
+        btns = QDialogButtonBox(QDialogButtonBox.StandardButton.Close)
+        btns.rejected.connect(self.reject)
+        outer.addWidget(btns)
+
+        self._refresh_list()
+
+    # --- list / filtering -------------------------------------------------- #
+    def _set_group(self, group: str):
+        self._current_group = group
+        self._refresh_list()
+
+    def _visible_entries(self) -> list[dict]:
+        filtered = core.filter_catalog_entries(self.entries, self.search_box.text())
+        return core.catalog_entries_in_group(filtered, self._current_group)
+
+    def _format_row(self, entry: dict) -> str:
+        display = str(entry.get("display") or entry.get("id") or "")
+        official = "✓ " if entry.get("official") else ""
+        stars = entry.get("stars")
+        star_txt = f"   ★ {stars:,}" if isinstance(stars, int) else ""
+        group = core.catalog_category_group(entry.get("category", ""))
+        desc = str(entry.get("description") or "")
+        if len(desc) > 88:
+            desc = desc[:87] + "…"
+        # QListWidgetItem text is always rendered literally by Qt (no HTML
+        # interpretation), so no escaping is needed here -- unlike QLabel.
+        return f"{official}{display}{star_txt}\n{desc}   ·   {group}"
+
+    def _refresh_list(self):
+        self.list.blockSignals(True)
+        self.list.clear()
+        for entry in self._visible_entries():
+            item = QListWidgetItem(self._format_row(entry))
+            item.setData(Qt.ItemDataRole.UserRole, entry)
+            # Tooltips DO auto-detect rich text in Qt, so escape defensively
+            # even though descriptions are already shown, unescaped-but-safe,
+            # in the QListWidgetItem text above.
+            item.setToolTip(html.escape(str(entry.get("description", ""))))
+            self.list.addItem(item)
+        self.list.blockSignals(False)
+        if self.list.count():
+            self.list.setCurrentRow(0)
+        else:
+            self._on_selected(None, None)
+
+    # --- detail pane -------------------------------------------------------- #
+    def _on_selected(self, current, _previous=None):
+        if current is None:
+            self._current_entry = None
+            self._current_homepage = None
+            self._current_docs_url = None
+            self.detail_title.setText("")
+            self.detail_meta.setText("")
+            self.detail_freshness.setText("")
+            self.detail_desc.setText("No matching servers." if self.entries else "")
+            self.detail_notes.setText("")
+            self.detail_homepage_btn.setVisible(False)
+            self.detail_command_preview.setPlainText("")
+            self.detail_action_btn.setEnabled(False)
+            self.detail_action_btn.setText("Add")
+            return
+
+        entry = current.data(Qt.ItemDataRole.UserRole)
+        self._current_entry = entry
+        self.detail_title.setText(str(entry.get("display") or entry.get("id") or ""))
+
+        official = "✓ Official" if entry.get("official") else ""
+        stars = entry.get("stars")
+        star_txt = f"★ {stars:,}" if isinstance(stars, int) else ""
+        group = core.catalog_category_group(entry.get("category", ""))
+        meta_bits = [b for b in (official, star_txt, group) if b]
+        self.detail_meta.setText("  ·  ".join(meta_bits))
+
+        freshness = core.format_freshness_hint(entry.get("last_release"))
+        self.detail_freshness.setText(freshness)
+        self.detail_freshness.setVisible(bool(freshness))
+
+        self.detail_desc.setText(str(entry.get("description") or ""))
+
+        notes = entry.get("notes") or ""
+        self.detail_notes.setText(notes)
+        self.detail_notes.setVisible(bool(notes))
+
+        homepage = entry.get("homepage")
+        self._current_homepage = homepage if isinstance(homepage, str) else None
+        self.detail_homepage_btn.setVisible(bool(self._current_homepage))
+
+        self._current_docs_url = (
+            entry.get("docs_url") if isinstance(entry.get("docs_url"), str) else None
+        )
+
+        self.detail_command_preview.setPlainText(self._render_command_preview(entry))
+
+        if entry.get("setup") == "basic":
+            self.detail_action_btn.setText("Add")
+            self.detail_action_btn.setEnabled(True)
+        else:
+            self.detail_action_btn.setText("Open setup docs")
+            self.detail_action_btn.setEnabled(bool(self._current_docs_url))
+
+    def _render_command_preview(self, entry: dict) -> str:
+        """
+        The exact command that will be written, rendered verbatim. Every
+        value here comes straight from the (signature-verified) catalog
+        entry with no interpretation beyond str() -- this must never be the
+        place a markup-laced description sneaks back in as "helpful"
+        formatting.
+        """
+        if entry.get("setup") != "basic":
+            docs = entry.get("docs_url") or "(none provided)"
+            return (
+                "This is a hosted/managed integration -- there is no local "
+                "command to add.\n\nSetup docs:\n  " + str(docs)
+            )
+
+        config = entry.get("config") or {}
+        lines = [f"command: {config.get('command', '')}"]
+        args = config.get("args") or []
+        if args:
+            lines.append("args:")
+            lines.extend(f"  {a}" for a in args)
+        env = config.get("env") or {}
+        env_required = entry.get("env_required") or {}
+        env_keys = list(env.keys()) + [k for k in env_required if k not in env]
+        if env_keys:
+            lines.append("env (names only -- you provide the values):")
+            lines.extend(f"  {k}" for k in env_keys)
+        return "\n".join(lines)
+
+    def _open_homepage(self):
+        url = self._current_homepage
+        if url and url.startswith("https://"):
+            QDesktopServices.openUrl(QUrl(url))
+
+    def _on_action(self):
+        entry = self._current_entry
+        if not entry:
+            return
+        if entry.get("setup") == "basic":
+            self.result_entry = entry
+            self.accept()
+        else:
+            url = self._current_docs_url
+            if url and url.startswith("https://"):
+                QDesktopServices.openUrl(QUrl(url))
+            # link-only never auto-adds and never closes the dialog -- the
+            # user can keep browsing after opening the docs in their browser.
+
+
 # --------------------------------------------------------------------------- #
 # Log viewer dialog (issue #6): a read-only, auto-tailing view of a single
 # server's MCP log file. Polls on a QTimer instead of watching the filesystem
@@ -1620,47 +1897,11 @@ class MainWindow(QMainWindow):

    # --- menu bar ---------------------------------------------------------- #
    def _build_menu_bar(self):
-        view_menu = self.menuBar().addMenu("&View")
-        theme_menu = view_menu.addMenu("Theme")
-        self._theme_group = QActionGroup(self)
-        self._theme_group.setExclusive(True)
-        current = stored_theme_setting()
-        for setting, label in (
-            (core.THEME_SYSTEM, "Match system"),
-            (core.THEME_LIGHT, "Light"),
-            (core.THEME_DARK, "Dark"),
-        ):
-            act = QAction(label, self, checkable=True)
-            act.setChecked(setting == current)
-            act.triggered.connect(lambda _checked=False, s=setting: self._set_theme(s))
-            self._theme_group.addAction(act)
-            theme_menu.addAction(act)
-
        help_menu = self.menuBar().addMenu("&Help")
        about_action = QAction("About Better Claude Config…", self)
        about_action.triggered.connect(self._show_about)
        help_menu.addAction(about_action)

-    def _set_theme(self, setting: str):
-        """Persist the theme choice and repaint the running window."""
-        QSettings("BCC", "BetterClaudeConfig").setValue("ui/theme", setting)
-        app = QApplication.instance()
-        if app is None:  # pragma: no cover - only in a headless test harness
-            return
-        app.setStyleSheet(theme_stylesheet_for(app, setting))
-        # The global stylesheet covers most of the UI, but the inline
-        # setStyleSheet calls (status dots, warning labels, update banner) only
-        # pick up the new palette when their widget next renders -- so re-render
-        # them now rather than leaving dark-on-light text behind.
-        self._repaint_themed_widgets()
-
-    def _repaint_themed_widgets(self):
-        """Re-run the inline-styled bits after a palette change."""
-        self.status.setStyleSheet(f"color: {MUTED};")
-        idx = self._current_index()
-        self._refresh_tables(select_index=idx if idx >= 0 else -1)
-        self._update_status(saved=False)
-
    def _show_about(self):
        AboutDialog(self).exec()

@@ -1851,6 +2092,10 @@ class MainWindow(QMainWindow):
        self.del_btn = QPushButton("Delete")
        self.del_btn.setObjectName("danger")
        self.paste_btn = QPushButton("Paste JSON...")
+        self.browse_catalog_btn = QPushButton("Browse catalog…")
+        self.browse_catalog_btn.setToolTip(
+            "Add a popular MCP server from the curated, signed catalog"
+        )
        self.copy_btn = QPushButton("Copy to ▸")
        self.undo_btn = QPushButton("Undo")
        self.undo_btn.setEnabled(False)
@@ -1863,6 +2108,7 @@ class MainWindow(QMainWindow):
        self.dup_btn.clicked.connect(self.duplicate_server)
        self.del_btn.clicked.connect(self.delete_server)
        self.paste_btn.clicked.connect(self.paste_json)
+        self.browse_catalog_btn.clicked.connect(self.browse_catalog)
        self.copy_btn.clicked.connect(self.copy_to_menu)
        self.undo_btn.clicked.connect(self._undo)
        self.test_all_btn.clicked.connect(self._test_all_servers)
@@ -1871,6 +2117,7 @@ class MainWindow(QMainWindow):
            self.dup_btn,
            self.del_btn,
            self.paste_btn,
+            self.browse_catalog_btn,
            self.copy_btn,
            self.undo_btn,
            self.test_all_btn,
@@ -2010,21 +2257,9 @@ class MainWindow(QMainWindow):
                return
            self.full_config = cfg
            repaired = True
-        # extract_servers tolerates malformed entries rather than raising (#72),
-        # but keep it inside the guard: a load failure must leave the previously
-        # loaded profile intact instead of half-swapping the window's state.
-        try:
-            servers = core.extract_servers(self.full_config)
-        except Exception as exc:  # pragma: no cover - defence in depth
-            QMessageBox.critical(
-                self,
-                "Could not read config",
-                f"{profile.path}\n\nThe server list couldn't be read: {exc}",
-            )
-            return
        self._loaded_stat = core.config_fingerprint(profile.path)
        self.current_profile = profile
-        self.servers = servers
+        self.servers = core.extract_servers(self.full_config)
        self.dirty = False
        self.restart_btn.hide()
        self._undo_stack.clear()
@@ -2347,7 +2582,7 @@ class MainWindow(QMainWindow):
        entry = self.servers[idx]
        old_name = entry.name
        entry.name = self.editor.current_name()
-        entry.set_data(self.editor.dump_data())
+        entry.data = self.editor.dump_data()
        # The server stays in its section (enable state unchanged), so update
        # its existing row in place rather than re-rendering.
        # An edit invalidates any cached "Test all" result -- the server that
@@ -2441,7 +2676,7 @@ class MainWindow(QMainWindow):
                QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No,
            )
            if ans == QMessageBox.StandardButton.Yes:
-                self.servers[existing[name]].set_data(data)
+                self.servers[existing[name]].data = data
                return False, True
            name = core.resolve_name_collision(name, {s.name for s in self.servers})
        self.servers.append(core.ServerEntry(name, data, True))
@@ -2461,6 +2696,41 @@ class MainWindow(QMainWindow):
        self._mark_dirty()
        self.status.setText(f"Imported {added} added, {replaced} replaced. Review and Save.")

+    def browse_catalog(self):
+        """
+        Open the Browse-catalog dialog (issue #10 phase 2). The catalog is
+        loaded and signature-verified fresh every time the dialog opens --
+        never cached across app runs at this phase (remote fetch/cache is
+        #61, not yet built) -- so a bundled-catalog swap only takes effect
+        on next dialog open, never mid-session in a stale way.
+        """
+        entries = core.load_bundled_catalog_entries(
+            _asset_dir() / "data" / "catalog.json", _asset_dir() / "data" / "catalog.json.sig"
+        )
+        dlg = BrowseCatalogDialog(self, entries)
+        if dlg.exec() != QDialog.DialogCode.Accepted or not dlg.result_entry:
+            return
+        entry = dlg.result_entry
+        paste = core.catalog_entry_to_paste_json(entry)
+        name, data = next(iter(paste.items()))
+
+        existing_before = {s.name: i for i, s in enumerate(self.servers)}
+        self._push_undo()
+        _added, replaced = self._import_server(name, data)
+        idx = (
+            existing_before.get(name, len(self.servers) - 1) if replaced else len(self.servers) - 1
+        )
+        self._refresh_tables(select_index=idx)
+        self._mark_dirty()
+
+        target = core.first_unfilled_focus_target(data)
+        self.editor.focus_target(target)
+
+        verb = "Replaced" if replaced else "Added"
+        self.status.setText(
+            f"{verb} “{name}” from the catalog. Fill in the highlighted field and Save."
+        )
+
    def copy_to_menu(self):
        idx = self._current_index()
        if not (0 <= idx < len(self.servers)):
@@ -2539,6 +2809,29 @@ class MainWindow(QMainWindow):
            QMessageBox.warning(self, "Can't save yet", "Fix the highlighted problem first.")
            return

+        # Placeholder guard (issue #10): a catalog Add can leave a
+        # <PLACEHOLDER>-style token in args/env until the user fills it in.
+        # This warns, it does not block -- the user may be deliberately
+        # saving a stub to finish later -- but it must never save silently,
+        # since a server launched with a literal "<PLACEHOLDER>" argument
+        # just fails in a confusing way at spawn time.
+        placeholder_names = [
+            s.name for s in self.servers if core.config_has_unfilled_placeholders(s.data)
+        ]
+        if placeholder_names:
+            names = ", ".join(f"“{n}”" for n in placeholder_names)
+            ans = QMessageBox.warning(
+                self,
+                "Unfilled placeholder",
+                f"{names} still has a <PLACEHOLDER> value that hasn't been "
+                "replaced with a real value. Claude won't be able to use "
+                "it as-is.\n\nSave anyway?",
+                QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No,
+                QMessageBox.StandardButton.No,
+            )
+            if ans != QMessageBox.StandardButton.Yes:
+                return
+
        # Stale-file check: if the file changed on disk since we loaded it, prompt.
        # Compare mtime AND size (not mtime alone) so a concurrent external write
        # that lands within the mtime resolution window, or that restores the
@@ -2561,11 +2854,6 @@ class MainWindow(QMainWindow):
                except Exception as e:
                    QMessageBox.critical(self, "Reload failed", str(e))
                    return
-                # The reload above is the on-disk truth for everything the user
-                # didn't touch -- but it also wipes BCC-authored keys the user
-                # changed in this session (named sets), which apply_servers
-                # doesn't write. Carry them over before saving (#73).
-                contested = core.carry_owned_keys(self.full_config, fresh)
                core.apply_servers(fresh, self.servers)
                try:
                    backup = core.write_config(self.current_profile.path, fresh)
@@ -2578,13 +2866,8 @@ class MainWindow(QMainWindow):
                self.dirty = False
                self.save_btn.setEnabled(False)
                bnote = f"  ·  backup: {backup.name}" if backup else "  ·  (new file)"
-                cnote = (
-                    f"  ·  kept your {', '.join(contested)} (the file on disk had a different copy)"
-                    if contested
-                    else ""
-                )
                self.status.setText(
-                    f"Merged & saved {self.current_profile.path}{bnote}{cnote}"
+                    f"Merged & saved {self.current_profile.path}{bnote}"
                    f"  ·  Restart {self.current_profile.label} to apply."
                )
                self._offer_restart_button()
@@ -2742,33 +3025,6 @@ class MainWindow(QMainWindow):
        e.accept()


-def system_is_dark(app: QApplication) -> bool:
-    """Whether the desktop is currently using a dark appearance.
-
-    Read from the style's own window colour rather than per-platform APIs --
-    Qt has already resolved the OS appearance by the time it builds the
-    default palette, so this works the same on all three platforms.
-    """
-    try:
-        return app.palette().color(QPalette.ColorRole.Window).lightness() < 128
-    except Exception:  # pragma: no cover - defensive; never block startup on theming
-        return True
-
-
-def stored_theme_setting() -> str:
-    """The user's theme choice, defaulting to following the system."""
-    value = QSettings("BCC", "BetterClaudeConfig").value("ui/theme", core.THEME_SYSTEM)
-    return value if value in core.THEME_CHOICES else core.THEME_SYSTEM
-
-
-def theme_stylesheet_for(app: QApplication, setting: str | None = None) -> str:
-    """Resolve setting + OS appearance into a palette, apply it, return the QSS."""
-    if setting is None:
-        setting = stored_theme_setting()
-    theme = core.resolve_theme(setting, system_is_dark(app))
-    return apply_palette(core.palette_for(theme))
-
-
 def main():
    if sys.platform == "win32":
        # Without an explicit AppUserModelID, Windows taskbar groups the app
@@ -2787,7 +3043,7 @@ def main():
    icon = _app_icon()
    if not icon.isNull():
        app.setWindowIcon(icon)
-    app.setStyleSheet(theme_stylesheet_for(app))
+    app.setStyleSheet(STYLESHEET)
    win = MainWindow()
    win.show()
    sys.exit(app.exec())
@@ -31,7 +31,11 @@ a = Analysis(
    ["bcc.py"],
    pathex=[],
    binaries=[],
-    datas=[("icons", "icons"), ("data/catalog.json", "data")],
+    datas=[
+        ("icons", "icons"),
+        ("data/catalog.json", "data"),
+        ("data/catalog.json.sig", "data"),
+    ],
    hiddenimports=[],
    hookspath=[],
    hooksconfig={},
@@ -15,7 +15,6 @@ from __future__ import annotations

 import base64
 import contextlib
-import copy
 import difflib
 import functools
 import glob
@@ -30,6 +29,7 @@ import tempfile
 import threading
 import time
 from dataclasses import dataclass
+from datetime import date
 from pathlib import Path
 from typing import NamedTuple
 from urllib.parse import urlparse
@@ -50,12 +50,6 @@ DISABLED_KEY = "_disabledMcpServers"
 # parks the rest under DISABLED_KEY.
 SETS_KEY = "_bccServerSets"

-# Top-level keys BCC itself authors. They live in the client's config file, but
-# BCC is their owner, so on a stale-file merge the in-memory copy wins over the
-# on-disk one (see `carry_owned_keys`). Any future BCC-authored key belongs
-# here -- forgetting to add one is exactly how #73 happened.
-BCC_OWNED_KEYS = (SETS_KEY,)
-
 BACKUP_DIRNAME = ".bcc_backups"
 MAX_BACKUPS = 15

@@ -185,195 +179,16 @@ class Profile:
        self.path = Path(self.path)


-class _NoRaw:
-    """Sentinel for ServerEntry.raw.
-
-    `None` can't do this job: `{"mcpServers": {"foo": null}}` is legal JSON and
-    a real malformed-entry case, so None has to mean "the config said null",
-    not "there was nothing here".
-    """
-
-    __slots__ = ()
-
-    def __repr__(self) -> str:  # keeps ServerEntry reprs readable in test output
-        return "<no raw>"
-
-
-NO_RAW = _NoRaw()
-
-
@dataclass
 class ServerEntry:
-    """One server definition.
-
-    `data` is always a dict so every consumer can treat it as one. When the
-    config held something that wasn't a JSON object for this server (a string,
-    a number, a list -- all legal JSON, all wrong here), `data` is empty and
-    the original value is preserved verbatim in `raw` so Save round-trips it
-    instead of silently deleting the user's line. `lint_servers` surfaces it.
-    `raw` defaults to the NO_RAW sentinel rather than None, because a config
-    value of literal `null` is itself a malformed entry worth preserving.
-
-    Assigning `data` means the user replaced the definition through the editor,
-    which retires `raw` -- use `set_data` so that can't be forgotten.
-    """
-
    name: str
    data: dict
    enabled: bool = True
-    raw: object = NO_RAW

    @property
    def kind(self) -> str:
        return "remote" if "url" in self.data and "command" not in self.data else "stdio"

-    @property
-    def malformed(self) -> bool:
-        """True when the config value for this server wasn't a JSON object."""
-        return self.raw is not NO_RAW
-
-    def set_data(self, data: dict) -> None:
-        """Replace the definition from the editor, clearing any malformed original."""
-        self.data = data
-        self.raw = NO_RAW
-
-    def config_value(self):
-        """What to write back to the config: the edited dict, or the untouched
-        malformed original when the user never edited it."""
-        return self.data if self.raw is NO_RAW else self.raw
-
-
-# --------------------------------------------------------------------------- #
-# Theming (issue #75)
-# --------------------------------------------------------------------------- #
-THEME_SYSTEM = "system"
-THEME_LIGHT = "light"
-THEME_DARK = "dark"
-THEME_CHOICES = (THEME_SYSTEM, THEME_LIGHT, THEME_DARK)
-
-
-@dataclass(frozen=True)
-class Palette:
-    """Every colour the UI draws with.
-
-    Deliberately exhaustive: the stylesheet used to inline a handful of
-    near-black literals (`#1a1205` for text on the accent, `#202229` for the
-    disabled table, `#16181d` for the diagnostics pane), which is fine while
-    there's one theme and invisible breakage the moment there are two. Each
-    gets a slot here so a light palette can't silently inherit a dark value.
-    """
-
-    name: str
-    accent: str
-    accent_dim: str
-    bg: str
-    panel: str
-    panel_2: str
-    text: str
-    muted: str
-    border: str
-    good: str
-    bad: str
-    warn: str
-    remote: str
-    on_accent: str  # text drawn on top of an accent fill
-    disabled_bg: str  # the parked-servers table
-    mono_bg: str  # diagnostics / log panes
-    selection_text: str
-
-
-# The shipping theme through v1.3.0. These values are carried over verbatim --
-# adding a light theme must not restyle the dark one.
-DARK_PALETTE = Palette(
-    name="dark",
-    accent="#f97316",
-    accent_dim="#c2570b",
-    bg="#1b1d23",
-    panel="#23262e",
-    panel_2="#2b2f39",
-    text="#e7e9ee",
-    muted="#9aa0ad",
-    border="#3a3f4b",
-    good="#4ade80",
-    bad="#f87171",
-    warn="#fbbf24",
-    remote="#60a5fa",
-    on_accent="#1a1205",
-    disabled_bg="#202229",
-    mono_bg="#16181d",
-    selection_text="#ffffff",
-)
-
-# The semantic colours are NOT the dark ones lightened. #4ade80 / #fbbf24 sit
-# around 1.7:1 against white -- illegible. These are darkened to clear 4.5:1,
-# which `test_light_palette_meets_contrast` enforces so nobody "tidies" them
-# back toward the dark hues later.
-LIGHT_PALETTE = Palette(
-    name="light",
-    accent="#c2410c",
-    accent_dim="#9a3412",
-    bg="#f6f7f9",
-    panel="#ffffff",
-    panel_2="#eef0f4",
-    text="#1b1d23",
-    muted="#5c6270",
-    border="#d3d7de",
-    good="#15803d",
-    bad="#b91c1c",
-    warn="#a16207",
-    remote="#1d4ed8",
-    on_accent="#ffffff",
-    disabled_bg="#e9ebef",
-    mono_bg="#f0f2f5",
-    selection_text="#ffffff",
-)
-
-PALETTES = {DARK_PALETTE.name: DARK_PALETTE, LIGHT_PALETTE.name: LIGHT_PALETTE}
-
-
-def resolve_theme(setting: str, system_is_dark: bool) -> str:
-    """Map a stored theme setting + the OS appearance onto a concrete palette name.
-
-    Anything unrecognised (a hand-edited QSettings value, a setting written by
-    a future version) falls back to following the system rather than to a
-    fixed theme -- the user's desktop is the better guess.
-    """
-    if setting == THEME_DARK:
-        return THEME_DARK
-    if setting == THEME_LIGHT:
-        return THEME_LIGHT
-    return THEME_DARK if system_is_dark else THEME_LIGHT
-
-
-def palette_for(theme: str) -> Palette:
-    """Concrete palette by name; unknown names fall back to dark (the historical look)."""
-    return PALETTES.get(theme, DARK_PALETTE)
-
-
-def _hex_to_rgb(value: str) -> tuple[int, int, int]:
-    v = value.lstrip("#")
-    if len(v) == 3:
-        v = "".join(ch * 2 for ch in v)
-    return int(v[0:2], 16), int(v[2:4], 16), int(v[4:6], 16)
-
-
-def relative_luminance(color: str) -> float:
-    """WCAG relative luminance for a #rrggbb colour."""
-
-    def chan(c: int) -> float:
-        srgb = c / 255.0
-        return srgb / 12.92 if srgb <= 0.04045 else ((srgb + 0.055) / 1.055) ** 2.4
-
-    r, g, b = (chan(c) for c in _hex_to_rgb(color))
-    return 0.2126 * r + 0.7152 * g + 0.0722 * b
-
-
-def contrast_ratio(fg: str, bg: str) -> float:
-    """WCAG contrast ratio between two #rrggbb colours (1.0 to 21.0)."""
-    a, b = relative_luminance(fg), relative_luminance(bg)
-    lighter, darker = max(a, b), min(a, b)
-    return (lighter + 0.05) / (darker + 0.05)
-

 # --------------------------------------------------------------------------- #
 # Discovery
@@ -638,30 +453,13 @@ def repair_config_file(path: str | os.PathLike) -> tuple[dict, list[str], str]:
    return obj, notes, pretty


-def _server_entry(name: str, data, enabled: bool) -> ServerEntry:
-    """Build a ServerEntry, tolerating a value that isn't a JSON object.
-
-    A hand-edited config can legally hold `{"mcpServers": {"foo": "oops"}}` --
-    valid JSON, wrong shape. Calling dict() on that raises, which used to take
-    the whole load down before the linter ever got a look at it (#72). Keep the
-    original instead and let the linter report it.
-    """
-    if isinstance(data, dict):
-        return ServerEntry(name=name, data=dict(data), enabled=enabled)
-    return ServerEntry(name=name, data={}, enabled=enabled, raw=data)
-
-
 def extract_servers(cfg: dict) -> list[ServerEntry]:
-    """Pull enabled (`mcpServers`) and disabled (`_disabledMcpServers`) servers.
-
-    Never raises on a structurally-odd config -- malformed entries come back as
-    empty-data entries carrying their original value (see `_server_entry`).
-    """
+    """Pull enabled (`mcpServers`) and disabled (`_disabledMcpServers`) servers."""
    out: list[ServerEntry] = []
    for name, data in (cfg.get("mcpServers") or {}).items():
-        out.append(_server_entry(name, data, True))
+        out.append(ServerEntry(name=name, data=dict(data), enabled=True))
    for name, data in (cfg.get(DISABLED_KEY) or {}).items():
-        out.append(_server_entry(name, data, False))
+        out.append(ServerEntry(name=name, data=dict(data), enabled=False))
    return out


@@ -753,8 +551,8 @@ def apply_servers(cfg: dict, servers: list[ServerEntry]) -> dict:
    Write the server list back into `cfg` in place, preserving every other key
    and the position of `mcpServers`. Returns the same dict for convenience.
    """
-    enabled = {s.name: s.config_value() for s in servers if s.enabled}
-    disabled = {s.name: s.config_value() for s in servers if not s.enabled}
+    enabled = {s.name: s.data for s in servers if s.enabled}
+    disabled = {s.name: s.data for s in servers if not s.enabled}

    cfg["mcpServers"] = enabled  # replaces value if key existed; appends otherwise
    if disabled:
@@ -767,34 +565,6 @@ def apply_servers(cfg: dict, servers: list[ServerEntry]) -> dict:
 # --------------------------------------------------------------------------- #
 # Write (atomic, with rotating backups)
 # --------------------------------------------------------------------------- #
-def carry_owned_keys(local_cfg: dict, fresh_cfg: dict) -> list[str]:
-    """Carry BCC-authored top-level keys from `local_cfg` onto `fresh_cfg`.
-
-    Used by the stale-file "Merge & save" path, which reloads the file from
-    disk and re-applies the user's server edits. That reload used to drop
-    anything BCC owns but `apply_servers` doesn't write -- named server sets
-    vanished without a word (#73). BCC owns these keys, so the in-memory copy
-    wins; mutates `fresh_cfg` in place.
-
-    Returns the keys where the on-disk copy differed and was overwritten, so
-    the caller can tell the user something was actually contested rather than
-    merely carried across.
-
-    Deliberately one-directional: a key absent locally is left alone on disk.
-    We can't tell "user deleted their last set" from "user never had sets and
-    another machine just added some", and silently deleting someone else's
-    data is the worse of the two failures.
-    """
-    conflicts: list[str] = []
-    for key in BCC_OWNED_KEYS:
-        if key not in local_cfg:
-            continue
-        if key in fresh_cfg and fresh_cfg[key] != local_cfg[key]:
-            conflicts.append(key)
-        fresh_cfg[key] = copy.deepcopy(local_cfg[key])
-    return conflicts
-
-
 def _make_backup(path: Path) -> Path:
    bdir = path.parent / BACKUP_DIRNAME
    bdir.mkdir(exist_ok=True)
@@ -1611,21 +1381,9 @@ def lint_server(name: str, data: dict) -> list[str]:


 def lint_servers(servers: list[ServerEntry]) -> list[str]:
-    """Concatenate lint_server warnings across every entry, in order.
-
-    Entries whose config value wasn't a JSON object at all are reported here
-    rather than in lint_server, which takes an already-dict `data` (#72).
-    """
+    """Concatenate lint_server warnings across every entry, in order."""
    out: list[str] = []
    for s in servers:
-        if s.malformed:
-            nm = s.name.strip() or "(unnamed)"
-            out.append(
-                f"'{nm}': server definition is not an object "
-                f"(found {type(s.raw).__name__}) -- it is preserved as-is; "
-                f"edit it to replace it with a proper definition"
-            )
-            continue
        out.extend(lint_server(s.name, s.data))
    return out

@@ -3011,8 +2769,17 @@ def catalog_entry_to_paste_json(entry: dict) -> dict:
    """
    Convert a basic-tier catalog entry into the {name: {command, args, env}}
    shape parse_pasted_json()/_import_server() already understand, so the
-    (future) catalog picker dialog can feed a selection straight into the
-    existing paste-import path instead of growing a parallel one.
+    Browse-catalog dialog can feed a selection straight into the existing
+    paste-import path instead of growing a parallel one.
+
+    `env` is seeded from two sources: config.env (rare -- e.g. grafana's
+    non-secret GRAFANA_URL) and, for every key in `env_required` not already
+    present, an empty-string placeholder. env_required is where the seed
+    data actually keeps its secret VAR NAMES (validate_catalog requires its
+    values to be "" -- never a real secret); config.env alone, without this,
+    would silently drop those names on Add for the 9 of 19 seed entries that
+    need a secret and only declare it via env_required -- the user would
+    see a server added with no field prompting them for the key it needs.
    """
    config = entry.get("config") or {}
    name = entry.get("id") or entry.get("display") or "server"
@@ -3020,9 +2787,11 @@ def catalog_entry_to_paste_json(entry: dict) -> dict:
        "command": config.get("command", ""),
        "args": list(config.get("args") or []),
    }
-    env = config.get("env")
+    env = dict(config.get("env") or {})
+    for key in entry.get("env_required") or {}:
+        env.setdefault(key, "")
    if env:
-        data["env"] = dict(env)
+        data["env"] = env
    return {str(name): data}


@@ -3042,3 +2811,190 @@ def config_has_unfilled_placeholders(cfg: dict) -> bool:
    if isinstance(env, dict):
        values.extend(v for v in env.values() if isinstance(v, str))
    return any(_PLACEHOLDER_RE.search(v) for v in values)
+
+
+# --------------------------------------------------------------------------- #
+# Catalog: Browse-dialog helpers (issue #10 phase 2)
+#
+# Everything below is pure and GUI-free on purpose (per the design comment on
+# #10): the dialog itself should be a thin shell that calls into this module,
+# the same relationship bcc.py already has with the rest of bcc_core.py.
+# --------------------------------------------------------------------------- #
+
+# Collapses the 20-value category taxonomy from the catalog research pass
+# down to the 7 chips shown in the Browse dialog. Any category not listed
+# here (including one a future catalog entry introduces that we don't yet
+# know about) falls back to "Other" rather than raising -- an unrecognized
+# category must never make an entry disappear from the dialog.
+CATALOG_CATEGORY_GROUPS: dict[str, str] = {
+    "files": "Files & Dev",
+    "dev": "Files & Dev",
+    "code-hosting": "Files & Dev",
+    "browser": "Files & Dev",
+    "database": "Data",
+    "data": "Data",
+    "search": "Search & AI",
+    "ai": "Search & AI",
+    "cloud": "Cloud & Infra",
+    "infra": "Cloud & Infra",
+    "observability": "Cloud & Infra",
+    "productivity": "Work",
+    "communication": "Work",
+    "crm": "Work",
+    "finance": "Work",
+    "design": "Work",
+    "media": "Home & Personal",
+    "smart-home": "Home & Personal",
+    "personal": "Home & Personal",
+}
+
+# Ordered for chip display: "All" first, the 6 named groups next in the order
+# given in the #10 design comment, "Other" last as the catch-all.
+CATALOG_CATEGORY_CHIPS: tuple[str, ...] = (
+    "All",
+    "Files & Dev",
+    "Data",
+    "Search & AI",
+    "Cloud & Infra",
+    "Work",
+    "Home & Personal",
+    "Other",
+)
+
+
+def catalog_category_group(category: str) -> str:
+    """Collapse a raw catalog `category` value to one of the 7 UI chips.
+
+    Unknown/missing categories map to "Other" -- never raises, never drops
+    an entry from the list just because its category tag doesn't match one
+    of the ones known at the time this mapping was written.
+    """
+    return CATALOG_CATEGORY_GROUPS.get(str(category or "").strip().lower(), "Other")
+
+
+def catalog_entry_matches_query(entry: dict, query: str) -> bool:
+    """
+    Case-insensitive substring match against a catalog entry's id, display
+    name, description, and category. An empty/whitespace-only query matches
+    everything, so the search box doubles as "no filter" when cleared --
+    the same convention server_matches_filter() uses for the main table.
+    """
+    q = (query or "").strip().lower()
+    if not q:
+        return True
+    haystacks = (
+        str(entry.get("id", "")),
+        str(entry.get("display", "")),
+        str(entry.get("description", "")),
+        str(entry.get("category", "")),
+    )
+    return any(q in h.lower() for h in haystacks)
+
+
+def filter_catalog_entries(entries: list[dict], query: str) -> list[dict]:
+    """Return only the catalog entries that match `query` (see
+    catalog_entry_matches_query)."""
+    return [e for e in entries if catalog_entry_matches_query(e, query)]
+
+
+def catalog_entries_in_group(entries: list[dict], group: str) -> list[dict]:
+    """
+    Return only the entries whose category collapses into `group` (one of
+    CATALOG_CATEGORY_CHIPS). "All" (or a falsy/unrecognized group) returns
+    every entry unfiltered -- that's the default chip state.
+    """
+    if not group or group == "All":
+        return list(entries)
+    return [e for e in entries if catalog_category_group(e.get("category", "")) == group]
+
+
+def format_freshness_hint(last_release: str | None, today: date | None = None) -> str:
+    """
+    Turn a catalog entry's `last_release` (an ISO "YYYY-MM-DD" date, or None
+    when the registry didn't expose one) into a short freshness hint for the
+    detail pane, e.g. "Last updated 14 months ago".
+
+    Returns "" (nothing to show) when `last_release` is missing or
+    unparseable, or when it's somehow in the future relative to `today` --
+    a bogus "-3 months ago" would undermine the one signal this hint exists
+    to give the user, so we'd rather show nothing than something wrong.
+
+    `today` is an injectable override so this is exactly reproducible in
+    tests without depending on the wall clock.
+    """
+    if not last_release or not isinstance(last_release, str):
+        return ""
+    try:
+        released = date.fromisoformat(last_release)
+    except ValueError:
+        return ""
+    now = today or date.today()
+    if released > now:
+        return ""
+
+    months = (now.year - released.year) * 12 + (now.month - released.month)
+    if now.day < released.day:
+        months -= 1
+    months = max(months, 0)
+
+    if months == 0:
+        return "Last updated this month"
+    if months == 1:
+        return "Last updated 1 month ago"
+    if months < 24:
+        return f"Last updated {months} months ago"
+    years = months // 12
+    return f"Last updated {years} year{'s' if years != 1 else ''} ago"
+
+
+def first_unfilled_focus_target(data: dict) -> tuple[str, int | str] | None:
+    """
+    Given a server config dict shaped like catalog_entry_to_paste_json()'s
+    output (command/args/env), find the first thing a user must fill in
+    after a catalog Add: a <PLACEHOLDER>-style arg (checked first, since a
+    missing path/target usually blocks the server from starting at all) or
+    else the first env var the catalog left blank.
+
+    Returns ("args", index) or ("env", key), or None when there's nothing
+    left to fill (e.g. a server with no placeholders and no required env).
+    The GUI uses this to focus+select the right field right after Add,
+    instead of leaving the user to hunt for what still needs a value.
+    """
+    args = data.get("args") or []
+    for i, a in enumerate(args):
+        if isinstance(a, str) and _PLACEHOLDER_RE.search(a):
+            return ("args", i)
+
+    env = data.get("env") or {}
+    if isinstance(env, dict):
+        for k, v in env.items():
+            if not isinstance(v, str) or not v.strip() or _PLACEHOLDER_RE.search(v):
+                return ("env", k)
+
+    return None
+
+
+def load_bundled_catalog_entries(catalog_path: Path, sig_path: Path) -> list[dict]:
+    """
+    Read+verify+validate the bundled catalog.json/.sig pair from disk and
+    return its `servers` list -- or an EMPTY list if anything at all is
+    wrong: files missing/unreadable, signature doesn't verify, JSON doesn't
+    parse, or validate_catalog() finds a problem.
+
+    🔴 SECURITY: this is the load-bearing guarantee for the Browse dialog.
+    There is deliberately no partial-success path here -- a signature
+    failure must never surface a half-trusted list, only an empty one, so
+    the GUI's only job is to render "Catalog unavailable" when this comes
+    back empty. All the real trust decisions (signature, schema, command
+    allowlist) already live in resolve_catalog()/validate_catalog(); this
+    is a thin disk-reading wrapper around them so the GUI never touches
+    catalog bytes directly.
+    """
+    try:
+        raw = catalog_path.read_bytes()
+        sig = sig_path.read_bytes()
+    except OSError:
+        return []
+    data = resolve_catalog(bundled=(raw, sig), cached=None, remote=None)
+    servers = data.get("servers") if isinstance(data, dict) else None
+    return servers if isinstance(servers, list) else []
@@ -1,7 +1,6 @@
 """Pytest port of the original test_core.py script (same 23 behaviours, now
 proper test functions with tmp_path/monkeypatch fixtures)."""

-import dataclasses
 import json
 import os
 import re
@@ -2358,6 +2357,43 @@ def test_catalog_entry_to_paste_json_includes_env_when_present():
    assert c.validate_catalog(malicious) != []


+def test_catalog_entry_to_paste_json_seeds_env_required_keys():
+    # Regression: env_required is where the seed data actually keeps its
+    # secret VAR NAMES (postgres/github/notion/etc. all declare their secret
+    # here with config.env left empty) -- catalog_entry_to_paste_json must
+    # surface those names as blank env rows, not silently drop them.
+    entry = _minimal_catalog()["servers"][0]
+    entry["env_required"] = {"DATABASE_URI": ""}
+    result = c.catalog_entry_to_paste_json(entry)
+    assert result["widget"]["env"] == {"DATABASE_URI": ""}
+
+
+def test_catalog_entry_to_paste_json_config_env_wins_over_env_required_default():
+    entry = _minimal_catalog()["servers"][0]
+    entry["config"]["env"] = {"GRAFANA_URL": "<GRAFANA_URL>"}
+    entry["env_required"] = {"GRAFANA_URL": "", "GRAFANA_SERVICE_ACCOUNT_TOKEN": ""}
+    result = c.catalog_entry_to_paste_json(entry)
+    assert result["widget"]["env"] == {
+        "GRAFANA_URL": "<GRAFANA_URL>",
+        "GRAFANA_SERVICE_ACCOUNT_TOKEN": "",
+    }
+
+
+def test_catalog_entry_to_paste_json_real_postgres_entry_seeds_database_uri():
+    """End-to-end regression against the actual shipped postgres entry,
+    which needs DATABASE_URI via env_required and has no config.env at
+    all -- this is exactly the shape that was silently dropping the env
+    field before catalog_entry_to_paste_json accounted for env_required."""
+    root = Path(__file__).resolve().parent.parent
+    raw = (root / "data" / "catalog.json").read_bytes()
+    data = c.load_catalog(raw)
+    entry = next(s for s in data["servers"] if s["id"] == "postgres")
+    result = c.catalog_entry_to_paste_json(entry)
+    assert result["postgres"]["env"] == {"DATABASE_URI": ""}
+    # And the focus-target helper now has something to point the user at.
+    assert c.first_unfilled_focus_target(result["postgres"]) == ("env", "DATABASE_URI")
+
+
 def test_config_has_unfilled_placeholders_true_for_token():
    cfg = {"command": "npx", "args": ["-y", "server", "<ALLOWED_DIR>"]}
    assert c.config_has_unfilled_placeholders(cfg) is True
@@ -2374,255 +2410,307 @@ def test_config_has_unfilled_placeholders_checks_env_too():


 # --------------------------------------------------------------------------- #
-# #72 -- a server value that isn't a JSON object must not take the load down
+# Browse-catalog dialog helpers (issue #10 phase 2)
 # --------------------------------------------------------------------------- #
-@pytest.mark.parametrize("bad", ["not-a-dict", 123, ["a", "b"], None, True, 1.5])
-def test_extract_servers_survives_non_dict_server_value(bad):
-    entries = c.extract_servers({"mcpServers": {"foo": bad}})
-    assert len(entries) == 1
-    assert entries[0].name == "foo"
-    assert entries[0].data == {}
-    assert entries[0].malformed is True
-    assert entries[0].raw == bad


-def test_extract_servers_marks_only_the_bad_entry():
-    cfg = {"mcpServers": {"good": {"command": "npx"}, "bad": "oops"}}
-    by_name = {e.name: e for e in c.extract_servers(cfg)}
-    assert by_name["good"].malformed is False
-    assert by_name["good"].data == {"command": "npx"}
-    assert by_name["bad"].malformed is True
-
-
-def test_extract_servers_handles_malformed_disabled_entry():
-    entries = c.extract_servers({c.DISABLED_KEY: {"parked": ["nope"]}})
-    assert entries[0].enabled is False
-    assert entries[0].malformed is True
-
-
-def test_malformed_entry_round_trips_through_save_unchanged():
-    """The cardinal rule: never silently delete what the user had on disk."""
-    cfg = {"mcpServers": {"good": {"command": "npx"}, "bad": "oops"}}
-    servers = c.extract_servers(cfg)
-    out = c.apply_servers(dict(cfg), servers)
-    assert out["mcpServers"]["bad"] == "oops"
-    assert out["mcpServers"]["good"] == {"command": "npx"}
-
-
-def test_editing_a_malformed_entry_retires_the_raw_value():
-    entry = c.extract_servers({"mcpServers": {"bad": "oops"}})[0]
-    entry.set_data({"command": "npx"})
-    assert entry.malformed is False
-    assert entry.config_value() == {"command": "npx"}
-    assert c.apply_servers({}, [entry])["mcpServers"]["bad"] == {"command": "npx"}
-
-
-def test_lint_reports_the_malformed_entry_by_name():
-    servers = c.extract_servers({"mcpServers": {"bad": "oops"}})
-    warnings = c.lint_servers(servers)
-    assert len(warnings) == 1
-    assert "'bad'" in warnings[0]
-    assert "not an object" in warnings[0]
-    assert "str" in warnings[0]
-
-
-def test_lint_still_reports_normal_warnings_alongside_malformed():
-    cfg = {"mcpServers": {"bad": "oops", "sloppy": {"command": "npx", "args": "one two"}}}
-    warnings = c.lint_servers(c.extract_servers(cfg))
-    assert any("not an object" in w for w in warnings)
-    assert any("'args' should be a list" in w for w in warnings)
-
-
-# --------------------------------------------------------------------------- #
-# #73 -- the stale-file merge must not discard BCC-authored keys
-# --------------------------------------------------------------------------- #
-def test_carry_owned_keys_moves_sets_onto_the_reloaded_config():
-    local = {"mcpServers": {}, c.SETS_KEY: {"work": ["a", "b"]}}
-    fresh = {"mcpServers": {"external": {"command": "npx"}}}
-    contested = c.carry_owned_keys(local, fresh)
-    assert contested == []
-    assert fresh[c.SETS_KEY] == {"work": ["a", "b"]}
-    assert fresh["mcpServers"] == {"external": {"command": "npx"}}
-
-
-def test_carry_owned_keys_reports_a_genuine_conflict():
-    local = {c.SETS_KEY: {"work": ["a"]}}
-    fresh = {c.SETS_KEY: {"work": ["a", "b"]}}
-    assert c.carry_owned_keys(local, fresh) == [c.SETS_KEY]
-    assert fresh[c.SETS_KEY] == {"work": ["a"]}  # local wins: BCC owns the key
-
-
-def test_carry_owned_keys_is_quiet_when_both_sides_agree():
-    local = {c.SETS_KEY: {"work": ["a"]}}
-    fresh = {c.SETS_KEY: {"work": ["a"]}}
-    assert c.carry_owned_keys(local, fresh) == []
-
-
-def test_carry_owned_keys_leaves_disk_alone_when_absent_locally():
-    """Can't distinguish 'deleted my last set' from 'never had sets'; keep theirs."""
-    fresh = {c.SETS_KEY: {"remote": ["a"]}}
-    assert c.carry_owned_keys({}, fresh) == []
-    assert fresh[c.SETS_KEY] == {"remote": ["a"]}
-
-
-def test_carry_owned_keys_deep_copies_so_later_edits_do_not_leak():
-    local = {c.SETS_KEY: {"work": ["a"]}}
-    fresh = {}
-    c.carry_owned_keys(local, fresh)
-    local[c.SETS_KEY]["work"].append("b")
-    assert fresh[c.SETS_KEY] == {"work": ["a"]}
-
-
-def test_merge_flow_preserves_sets_and_external_servers(tmp_path):
-    """End-to-end shape of the Merge & save path that lost sets in #73."""
-    path = tmp_path / "claude.json"
-    path.write_text(json.dumps({"mcpServers": {"old": {"command": "old"}}}))
-
-    # BCC loads, user saves a named set and edits servers in memory.
-    local = c.load_config(path)
-    servers = c.extract_servers(local)
-    c.save_server_set(local, "work", servers)
-
-    # Something else rewrites the file underneath us.
-    path.write_text(json.dumps({"mcpServers": {"external": {"command": "new"}}, "other": 1}))
-
-    # Merge & save: reload disk, carry BCC keys, re-apply the user's servers.
-    fresh = c.load_config(path)
-    c.carry_owned_keys(local, fresh)
-    c.apply_servers(fresh, servers)
-    c.write_config(path, fresh)
-
-    saved = c.load_config(path)
-    assert saved[c.SETS_KEY] == {"work": ["old"]}  # the set survived
-    assert saved["other"] == 1  # unrelated external key preserved
-    assert "old" in saved["mcpServers"]  # user's servers re-applied
-
-
-def test_null_server_value_is_malformed_not_mistaken_for_absent():
-    """`{"mcpServers": {"foo": null}}` is legal JSON and a real malformed case,
-    so None must not double as the 'nothing here' sentinel."""
-    entry = c.extract_servers({"mcpServers": {"foo": None}})[0]
-    assert entry.malformed is True
-    assert entry.raw is None
-    assert c.apply_servers({}, [entry])["mcpServers"]["foo"] is None
-
-
-def test_a_normal_entry_is_not_malformed():
-    entry = c.extract_servers({"mcpServers": {"foo": {"command": "npx"}}})[0]
-    assert entry.malformed is False
-    assert entry.raw is c.NO_RAW
-
-
-# --------------------------------------------------------------------------- #
-# #75 -- theming
-# --------------------------------------------------------------------------- #
+# --- catalog_category_group / CATALOG_CATEGORY_GROUPS --------------------- #
@pytest.mark.parametrize(
-    "setting,system_dark,expected",
+    "category,expected_group",
    [
-        (c.THEME_DARK, False, "dark"),
-        (c.THEME_DARK, True, "dark"),
-        (c.THEME_LIGHT, False, "light"),
-        (c.THEME_LIGHT, True, "light"),
-        (c.THEME_SYSTEM, True, "dark"),
-        (c.THEME_SYSTEM, False, "light"),
+        ("files", "Files & Dev"),
+        ("dev", "Files & Dev"),
+        ("code-hosting", "Files & Dev"),
+        ("browser", "Files & Dev"),
+        ("database", "Data"),
+        ("data", "Data"),
+        ("search", "Search & AI"),
+        ("ai", "Search & AI"),
+        ("cloud", "Cloud & Infra"),
+        ("infra", "Cloud & Infra"),
+        ("observability", "Cloud & Infra"),
+        ("productivity", "Work"),
+        ("communication", "Work"),
+        ("crm", "Work"),
+        ("finance", "Work"),
+        ("design", "Work"),
+        ("media", "Home & Personal"),
+        ("smart-home", "Home & Personal"),
+        ("personal", "Home & Personal"),
    ],
 )
-def test_resolve_theme_covers_every_setting_and_appearance(setting, system_dark, expected):
-    assert c.resolve_theme(setting, system_dark) == expected
+def test_catalog_category_group_maps_every_taxonomy_value(category, expected_group):
+    assert c.catalog_category_group(category) == expected_group


-@pytest.mark.parametrize("junk", ["", "solarized", None, "DARK", 3])
-def test_resolve_theme_falls_back_to_following_the_system(junk):
-    """A hand-edited or future QSettings value should follow the desktop,
-    not pin a fixed theme."""
-    assert c.resolve_theme(junk, True) == "dark"
-    assert c.resolve_theme(junk, False) == "light"
+def test_catalog_category_group_unknown_falls_back_to_other():
+    assert c.catalog_category_group("some-future-category-nobody-has-seen-yet") == "Other"
+    assert c.catalog_category_group("") == "Other"
+    assert c.catalog_category_group(None) == "Other"


-def test_palette_for_known_names():
-    assert c.palette_for("dark") is c.DARK_PALETTE
-    assert c.palette_for("light") is c.LIGHT_PALETTE
+def test_catalog_category_group_is_case_insensitive():
+    assert c.catalog_category_group("Files") == "Files & Dev"
+    assert c.catalog_category_group("DATABASE") == "Data"


-def test_palette_for_unknown_name_falls_back_to_dark():
-    assert c.palette_for("chartreuse") is c.DARK_PALETTE
+def test_shipped_catalog_categories_all_have_a_known_group():
+    """Regression: every category actually used in data/catalog.json must
+    collapse to one of the 7 chips, never silently drop an entry."""
+    root = Path(__file__).resolve().parent.parent
+    raw = (root / "data" / "catalog.json").read_bytes()
+    data = c.load_catalog(raw)
+    for entry in data["servers"]:
+        group = c.catalog_category_group(entry["category"])
+        assert group in c.CATALOG_CATEGORY_CHIPS


-def test_dark_palette_is_unchanged_from_the_shipped_look():
-    """v1.3.0 shipped these exact colours; adding a light theme must not
-    quietly restyle the dark one."""
-    p = c.DARK_PALETTE
-    assert (p.accent, p.bg, p.panel, p.panel_2) == ("#f97316", "#1b1d23", "#23262e", "#2b2f39")
-    assert (p.text, p.muted, p.border) == ("#e7e9ee", "#9aa0ad", "#3a3f4b")
-    assert (p.good, p.bad, p.warn, p.remote) == ("#4ade80", "#f87171", "#fbbf24", "#60a5fa")
-    assert (p.on_accent, p.disabled_bg, p.mono_bg) == ("#1a1205", "#202229", "#16181d")
+# --- catalog_entry_matches_query / filter_catalog_entries ------------------ #
+def _catalog_entries():
+    return [
+        {
+            "id": "filesystem",
+            "display": "Filesystem",
+            "description": "Read/write access to local directories you choose.",
+            "category": "files",
+        },
+        {
+            "id": "postgres",
+            "display": "Postgres MCP Pro",
+            "description": "Query and inspect a PostgreSQL database.",
+            "category": "database",
+        },
+        {
+            "id": "slack",
+            "display": "Slack",
+            "description": "Search messages and send messages from your assistant.",
+            "category": "communication",
+        },
+    ]


-def test_both_palettes_define_every_slot():
-    """A missing slot should fail here rather than render a broken window."""
-    for pal in (c.DARK_PALETTE, c.LIGHT_PALETTE):
-        for f in dataclasses.fields(c.Palette):
-            value = getattr(pal, f.name)
-            assert value, f"{pal.name}.{f.name} is empty"
-            if f.name != "name":
-                assert re.fullmatch(r"#[0-9a-fA-F]{6}", value), f"{pal.name}.{f.name}={value!r}"
+def test_catalog_entry_matches_query_empty_matches_everything():
+    entries = _catalog_entries()
+    assert c.filter_catalog_entries(entries, "") == entries
+    assert c.filter_catalog_entries(entries, "   ") == entries


-@pytest.mark.parametrize("pal_name", ["dark", "light"])
-@pytest.mark.parametrize("slot", ["text", "muted", "good", "bad", "warn", "remote", "accent"])
-def test_palette_meets_contrast_on_panel(pal_name, slot):
-    """Every colour drawn as text/glyph must clear WCAG AA (4.5:1) against the
-    surface it sits on. The light palette's semantic colours are NOT the dark
-    ones lightened -- #4ade80 sits near 1.7:1 on white -- so this guards
-    against someone 'harmonising' them back toward the dark hues."""
-    pal = c.palette_for(pal_name)
-    assert c.contrast_ratio(getattr(pal, slot), pal.panel) >= 4.5
+def test_catalog_entry_matches_query_matches_id():
+    result = c.filter_catalog_entries(_catalog_entries(), "postgres")
+    assert [e["id"] for e in result] == ["postgres"]


-@pytest.mark.parametrize("pal_name", ["dark", "light"])
-def test_on_accent_is_legible_against_the_accent_fill(pal_name):
-    """Primary buttons and selected rows draw on_accent on top of accent."""
-    pal = c.palette_for(pal_name)
-    assert c.contrast_ratio(pal.on_accent, pal.accent) >= 4.5
+def test_catalog_entry_matches_query_matches_display_case_insensitive():
+    result = c.filter_catalog_entries(_catalog_entries(), "SLACK")
+    assert [e["id"] for e in result] == ["slack"]


-def test_contrast_ratio_endpoints():
-    assert c.contrast_ratio("#000000", "#ffffff") == pytest.approx(21.0, abs=0.01)
-    assert c.contrast_ratio("#123456", "#123456") == pytest.approx(1.0, abs=0.001)
-    assert c.contrast_ratio("#ffffff", "#000000") == pytest.approx(21.0, abs=0.01)
+def test_catalog_entry_matches_query_matches_description():
+    result = c.filter_catalog_entries(_catalog_entries(), "PostgreSQL database")
+    assert [e["id"] for e in result] == ["postgres"]


-def test_relative_luminance_extremes():
-    assert c.relative_luminance("#000000") == pytest.approx(0.0)
-    assert c.relative_luminance("#ffffff") == pytest.approx(1.0)
+def test_catalog_entry_matches_query_matches_category():
+    result = c.filter_catalog_entries(_catalog_entries(), "database")
+    assert [e["id"] for e in result] == ["postgres"]


-def test_stylesheet_builder_has_no_hardcoded_colours():
-    """Every colour in the QSS must come from the palette.
-
-    Three near-black literals used to be inlined here (#1a1205, #202229,
-    #16181d). Harmless with one theme; with two, they silently render dark
-    chrome on a light window. Reads the source rather than importing bcc,
-    which needs PySide6.
-    """
-    src = (Path(__file__).resolve().parent.parent / "bcc.py").read_text(encoding="utf-8")
-    start = src.index("def build_stylesheet")
-    body = src[start : src.index("def apply_palette")]
-    assert re.findall(r"#[0-9a-fA-F]{6}", body) == []
+def test_catalog_entry_matches_query_no_match_returns_empty():
+    assert c.filter_catalog_entries(_catalog_entries(), "kubernetes") == []


-def test_every_palette_slot_is_consumed():
-    """A slot added to Palette but never wired up is dead weight.
+def test_catalog_entries_in_group_all_returns_everything():
+    entries = _catalog_entries()
+    assert c.catalog_entries_in_group(entries, "All") == entries
+    assert c.catalog_entries_in_group(entries, "") == entries
+    assert c.catalog_entries_in_group(entries, None) == entries

-    Checks for `p.<slot>` anywhere in bcc.py, which covers both the QSS and
-    apply_palette's global bindings -- not every slot belongs in the
-    stylesheet (`good` and `remote` feed the inline status dots via
-    STATUS_COLORS/HEALTH_COLORS, never the QSS). This won't catch a slot bound
-    to a global that nothing then uses; it does catch the common mistake of
-    extending the dataclass and forgetting to plumb it through.
-    """
-    src = (Path(__file__).resolve().parent.parent / "bcc.py").read_text(encoding="utf-8")
-    for f in dataclasses.fields(c.Palette):
-        if f.name == "name":
-            continue
-        assert f"p.{f.name}" in src, f"palette slot {f.name!r} is never consumed"
+
+def test_catalog_entries_in_group_filters_by_collapsed_category():
+    result = c.catalog_entries_in_group(_catalog_entries(), "Data")
+    assert [e["id"] for e in result] == ["postgres"]
+
+    result = c.catalog_entries_in_group(_catalog_entries(), "Work")
+    assert [e["id"] for e in result] == ["slack"]
+
+
+# --- format_freshness_hint -------------------------------------------------- #
+def test_format_freshness_hint_none_returns_empty_string():
+    assert c.format_freshness_hint(None) == ""
+    assert c.format_freshness_hint("") == ""
+
+
+def test_format_freshness_hint_unparseable_returns_empty_string():
+    assert c.format_freshness_hint("not-a-date") == ""
+
+
+def test_format_freshness_hint_this_month():
+    assert (
+        c.format_freshness_hint("2026-07-01", today=c.date(2026, 7, 12))
+        == "Last updated this month"
+    )
+
+
+def test_format_freshness_hint_one_month_singular():
+    assert (
+        c.format_freshness_hint("2026-06-01", today=c.date(2026, 7, 12))
+        == "Last updated 1 month ago"
+    )
+
+
+def test_format_freshness_hint_months_ago():
+    # Exactly 14 full months elapsed, no day-of-month remainder to round off.
+    assert (
+        c.format_freshness_hint("2025-01-15", today=c.date(2026, 3, 15))
+        == "Last updated 14 months ago"
+    )
+
+
+def test_format_freshness_hint_rounds_down_partial_month():
+    # 2025-05-16 -> 2026-07-12 is 13 full months, not 14: the 14th month
+    # would only complete on 2026-07-16.
+    assert (
+        c.format_freshness_hint("2025-05-16", today=c.date(2026, 7, 12))
+        == "Last updated 13 months ago"
+    )
+
+
+def test_format_freshness_hint_years_ago():
+    assert (
+        c.format_freshness_hint("2024-01-01", today=c.date(2026, 7, 12))
+        == "Last updated 2 years ago"
+    )
+
+
+def test_format_freshness_hint_23_months_stays_in_months_not_years():
+    # The switch to "N years ago" happens at 24 full months, not 12 -- the
+    # whole point of this hint is the granular "14 months ago" phrasing the
+    # design comment on #10 asked for, so 13-23 months must stay in months.
+    assert (
+        c.format_freshness_hint("2024-08-12", today=c.date(2026, 7, 12))
+        == "Last updated 23 months ago"
+    )
+
+
+def test_format_freshness_hint_future_date_returns_empty_string():
+    # A last_release "in the future" relative to `today` is nonsensical --
+    # show nothing rather than a misleading negative offset.
+    assert c.format_freshness_hint("2027-01-01", today=c.date(2026, 7, 12)) == ""
+
+
+# --- first_unfilled_focus_target -------------------------------------------- #
+def test_first_unfilled_focus_target_prefers_placeholder_arg():
+    data = {
+        "command": "npx",
+        "args": ["-y", "server", "<ALLOWED_DIR>"],
+        "env": {"API_KEY": ""},
+    }
+    assert c.first_unfilled_focus_target(data) == ("args", 2)
+
+
+def test_first_unfilled_focus_target_falls_back_to_first_blank_env():
+    data = {"command": "uvx", "args": ["mcp-grafana"], "env": {"GRAFANA_URL": ""}}
+    assert c.first_unfilled_focus_target(data) == ("env", "GRAFANA_URL")
+
+
+def test_first_unfilled_focus_target_none_when_fully_filled():
+    data = {"command": "npx", "args": ["-y", "server"], "env": {"API_KEY": "sk-real-value"}}
+    assert c.first_unfilled_focus_target(data) is None
+
+
+def test_first_unfilled_focus_target_none_for_config_with_no_env_or_args():
+    assert c.first_unfilled_focus_target({"command": "npx", "args": []}) is None
+
+
+# --- load_bundled_catalog_entries ------------------------------------------- #
+def test_load_bundled_catalog_entries_valid_signature(tmp_path, monkeypatch):
+    priv = Ed25519PrivateKey.generate()
+    pub = priv.public_key().public_bytes_raw()
+    monkeypatch.setattr(c, "CATALOG_PUBKEYS", [pub])
+
+    raw, sig = _signed(_minimal_catalog(version=1), priv)
+    catalog_path = tmp_path / "catalog.json"
+    sig_path = tmp_path / "catalog.json.sig"
+    catalog_path.write_bytes(raw)
+    sig_path.write_bytes(sig)
+
+    entries = c.load_bundled_catalog_entries(catalog_path, sig_path)
+    assert len(entries) == 1
+    assert entries[0]["id"] == "widget"
+
+
+def test_load_bundled_catalog_entries_tampered_payload_returns_empty_list(tmp_path, monkeypatch):
+    priv = Ed25519PrivateKey.generate()
+    pub = priv.public_key().public_bytes_raw()
+    monkeypatch.setattr(c, "CATALOG_PUBKEYS", [pub])
+
+    raw, sig = _signed(_minimal_catalog(version=1), priv)
+    tampered = bytearray(raw)
+    tampered[-2] ^= 0xFF  # flip a byte inside the trailing bytes, still valid-ish JSON shape
+    catalog_path = tmp_path / "catalog.json"
+    sig_path = tmp_path / "catalog.json.sig"
+    catalog_path.write_bytes(bytes(tampered))
+    sig_path.write_bytes(sig)
+
+    assert c.load_bundled_catalog_entries(catalog_path, sig_path) == []
+
+
+def test_load_bundled_catalog_entries_wrong_key_returns_empty_list(tmp_path, monkeypatch):
+    priv = Ed25519PrivateKey.generate()
+    other_priv = Ed25519PrivateKey.generate()
+    other_pub = other_priv.public_key().public_bytes_raw()
+    monkeypatch.setattr(c, "CATALOG_PUBKEYS", [other_pub])
+
+    raw, sig = _signed(_minimal_catalog(version=1), priv)  # signed by the WRONG key
+    catalog_path = tmp_path / "catalog.json"
+    sig_path = tmp_path / "catalog.json.sig"
+    catalog_path.write_bytes(raw)
+    sig_path.write_bytes(sig)
+
+    assert c.load_bundled_catalog_entries(catalog_path, sig_path) == []
+
+
+def test_load_bundled_catalog_entries_missing_files_returns_empty_list(tmp_path):
+    assert c.load_bundled_catalog_entries(tmp_path / "nope.json", tmp_path / "nope.json.sig") == []
+
+
+def test_load_bundled_catalog_entries_missing_sig_returns_empty_list(tmp_path, monkeypatch):
+    priv = Ed25519PrivateKey.generate()
+    pub = priv.public_key().public_bytes_raw()
+    monkeypatch.setattr(c, "CATALOG_PUBKEYS", [pub])
+
+    raw, _sig = _signed(_minimal_catalog(version=1), priv)
+    catalog_path = tmp_path / "catalog.json"
+    catalog_path.write_bytes(raw)
+    missing_sig_path = tmp_path / "catalog.json.sig"  # never written
+
+    assert c.load_bundled_catalog_entries(catalog_path, missing_sig_path) == []
+
+
+def test_load_bundled_catalog_entries_invalid_but_signed_returns_empty_list(tmp_path, monkeypatch):
+    """A payload that verifies but fails validate_catalog() (disallowed
+    command) must still come back empty -- signing is necessary, not
+    sufficient."""
+    priv = Ed25519PrivateKey.generate()
+    pub = priv.public_key().public_bytes_raw()
+    monkeypatch.setattr(c, "CATALOG_PUBKEYS", [pub])
+
+    raw, sig = _signed(_catalog_with({"config": {"command": "bash", "args": []}}), priv)
+    catalog_path = tmp_path / "catalog.json"
+    sig_path = tmp_path / "catalog.json.sig"
+    catalog_path.write_bytes(raw)
+    sig_path.write_bytes(sig)
+
+    assert c.load_bundled_catalog_entries(catalog_path, sig_path) == []
+
+
+def test_load_bundled_catalog_entries_real_shipped_catalog():
+    """End-to-end regression against the actual bundled data/catalog.json +
+    .sig, using the real CATALOG_PUBKEYS (no monkeypatch) -- this is what
+    the Browse dialog actually calls on startup."""
+    root = Path(__file__).resolve().parent.parent
+    entries = c.load_bundled_catalog_entries(
+        root / "data" / "catalog.json", root / "data" / "catalog.json.sig"
+    )
+    assert len(entries) == 19
+    assert {e["id"] for e in entries} >= {"filesystem", "github", "slack", "postgres"}