diff --git a/bcc.py b/bcc.py index 5e2dbbd..a7770e0 100644 --- a/bcc.py +++ b/bcc.py @@ -10,6 +10,7 @@ Run: python mcp_manager.py from __future__ import annotations +import contextlib import sys import time from pathlib import Path @@ -141,6 +142,10 @@ QScrollBar::handle:vertical {{ background: {p.border}; border-radius: 5px; min-h 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; }} +QFrame#noticeBanner {{ background: {p.panel_2}; border: 1px solid {p.accent}; border-radius: 8px; }} +QLabel#noticeText {{ color: {p.text}; }} +QPushButton#noticeClose {{ background: transparent; border: none; color: {p.muted}; font-size: 14px; padding: 2px; }} +QPushButton#noticeClose:hover {{ color: {p.text}; }} 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; }} @@ -1528,6 +1533,54 @@ class AboutDialog(QDialog): QDesktopServices.openUrl(QUrl(self._release_url or core.RELEASES_URL)) +class NoticeBanner(QFrame): + """A persistent, dismissible notice with an optional action button. + + The status bar is the wrong home for anything the user needs to act on -- + 21 call sites rewrite it, so a message posted there is gone by the next + click. That wiped the MSIX warning (#35) and then the update notice (#78). + This is the shared mechanism so it doesn't happen a third time. + """ + + def __init__(self, parent=None): + super().__init__(parent) + self.setObjectName("noticeBanner") + row = QHBoxLayout(self) + row.setContentsMargins(10, 8, 8, 8) + row.setSpacing(8) + self._label = QLabel("") + self._label.setObjectName("noticeText") + self._label.setWordWrap(True) + row.addWidget(self._label, 1) + self._action_btn = QPushButton("") + self._action_btn.setCursor(Qt.CursorShape.PointingHandCursor) + self._action_btn.hide() + row.addWidget(self._action_btn) + self._close_btn = QPushButton("\u2715") + self._close_btn.setObjectName("noticeClose") + self._close_btn.setCursor(Qt.CursorShape.PointingHandCursor) + self._close_btn.setFixedWidth(26) + self._close_btn.setToolTip("Dismiss") + self._close_btn.clicked.connect(self.hide) + row.addWidget(self._close_btn) + self.hide() + + def show_notice(self, text: str, action_label: str = "", on_action=None): + self._label.setText(text) + self._label.setToolTip(text) + # Reconnect cleanly: a banner reused for a second notice would + # otherwise fire the previous notice's action too. + with contextlib.suppress(RuntimeError, TypeError): + self._action_btn.clicked.disconnect() + if action_label and on_action is not None: + self._action_btn.setText(action_label) + self._action_btn.clicked.connect(lambda _=False: on_action()) + self._action_btn.show() + else: + self._action_btn.hide() + self.show() + + # --------------------------------------------------------------------------- # # Restart worker: core.restart_claude_desktop() blocks up to ~5 s on macOS # waiting for the old instance to exit, so it must run off the UI thread. @@ -1585,6 +1638,11 @@ class MainWindow(QMainWindow): self.warn_banner.hide() root.addWidget(self.warn_banner) + # Update availability gets its own persistent banner rather than a + # status-line write, which the next UI action overwrites (#78). + self.update_banner = NoticeBanner(self) + root.addWidget(self.update_banner) + # User-draggable divider between the server list and the editor. split = QSplitter(Qt.Orientation.Horizontal) split.setChildrenCollapsible(False) @@ -1637,10 +1695,59 @@ class MainWindow(QMainWindow): theme_menu.addAction(act) help_menu = self.menuBar().addMenu("&Help") + + # "Check for updates" used to exist only as a button inside the About + # dialog, which is not somewhere anyone looks for it (#79). + update_action = QAction("Check for updates…", self) + # Explicit role: macOS relocates actions it recognises by text, and + # some Qt versions treat "update" as application-menu material. Pin it + # so the item stays where the menu says it is on every platform. + update_action.setMenuRole(QAction.MenuRole.ApplicationSpecificRole) + update_action.triggered.connect(self.check_for_updates) + help_menu.addAction(update_action) + help_menu.addSeparator() + about_action = QAction("About Better Claude Config…", self) + # Qt auto-assigns AboutRole to actions whose text starts with "About", + # which moves this into the application menu on macOS. That is the + # right home there -- state it explicitly rather than inheriting it by + # accident, since the behaviour is invisible from this call site. + about_action.setMenuRole(QAction.MenuRole.AboutRole) about_action.triggered.connect(self._show_about) help_menu.addAction(about_action) + def _show_update_notice(self, notice: dict): + """Surface an available update where it survives the next click.""" + url = notice["url"] + self.update_banner.show_notice( + notice["text"], + action_label="Open releases page", + on_action=lambda: QDesktopServices.openUrl(QUrl(url)), + ) + + def check_for_updates(self): + """Menu-driven check. Unlike the startup check this is never throttled + and always reports back -- the user asked, so silence would read as a + broken button.""" + self.status.setText("Checking for updates…") + self._menu_update_worker = UpdateCheckWorker() + self._menu_update_worker.done.connect(self._on_menu_update_checked) + self._menu_update_worker.start() + + def _on_menu_update_checked(self, release: dict | None): + self._menu_update_worker = None + if release is None: + self.status.setText("Couldn't check for updates (offline?).") + return + QSettings("BCC", "BetterClaudeConfig").setValue("update/lastCheck", time.time()) + notice = core.update_notice(core.__version__, release) + if notice: + self._show_update_notice(notice) + self.status.setText(f"Update available: {notice['version']}") + else: + self.update_banner.hide() + self.status.setText(f"You're up to date ({core.__version__}).") + def _set_theme(self, setting: str): """Persist the theme choice and repaint the running window.""" QSettings("BCC", "BetterClaudeConfig").setValue("ui/theme", setting) @@ -1681,10 +1788,9 @@ class MainWindow(QMainWindow): if release is None: return # offline/failed check: don't advance lastCheck, allow retry QSettings("BCC", "BetterClaudeConfig").setValue("update/lastCheck", time.time()) - if core.is_newer_version(core.__version__, release["version"]): - self.status.setText( - f"Update available: {release['version']} · Help ▸ About to view it." - ) + notice = core.update_notice(core.__version__, release) + if notice: + self._show_update_notice(notice) # --- layout persistence ---------------------------------------------- # def _restore_layout(self): diff --git a/bcc_core.py b/bcc_core.py index 03ab61f..63b0dc8 100644 --- a/bcc_core.py +++ b/bcc_core.py @@ -170,6 +170,39 @@ def fetch_latest_release(timeout: float = 4.0) -> dict | None: return {"version": tag, "url": payload.get("html_url") or RELEASES_URL} +def update_notice( + current: str, release: dict | None, url_fallback: str = RELEASES_URL +) -> dict | None: + """Decide whether to tell the user about a release, and what to say. + + Returns {"version", "text", "url"} when `release` is newer than `current`, + or None when it isn't, when the check failed, or when the payload is + malformed. Kept here rather than in the GUI so the wording and the + should-we-notify decision are testable -- bcc.py can't be imported by the + test suite, which has no PySide6. + + The text deliberately names no menu path. The old status-line notice read + "Help > About to view it", which is wrong on macOS: Qt relocates the About + action into the application menu (#79). A notice that carries its own + action can't drift out of sync with the platform. + """ + if not isinstance(release, dict): + return None + version = release.get("version") + if not version or not isinstance(version, str): + return None + if not is_newer_version(current, version): + return None + # Tags carry a "v" prefix and __version__ doesn't; render both the same way + # so the notice doesn't read "Version v1.3.0 ... you're running 1.2.0". + shown = version.lstrip("vV") + return { + "version": version, + "text": f"Version {shown} is available. You're running {current.lstrip('vV')}.", + "url": release.get("url") or url_fallback, + } + + # --------------------------------------------------------------------------- # # Data model # --------------------------------------------------------------------------- # diff --git a/tests/test_core.py b/tests/test_core.py index 55a1bb2..4ccea2b 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -2626,3 +2626,57 @@ def test_every_palette_slot_is_consumed(): if f.name == "name": continue assert f"p.{f.name}" in src, f"palette slot {f.name!r} is never consumed" + + +# --------------------------------------------------------------------------- # +# #78/#79 -- update notice: when to show it, and what it says +# --------------------------------------------------------------------------- # +def test_update_notice_when_a_newer_release_exists(): + n = c.update_notice("1.2.0", {"version": "v1.3.0", "url": "https://example.test/rel"}) + assert n is not None + assert n["version"] == "v1.3.0" + assert n["url"] == "https://example.test/rel" + assert "1.3.0" in n["text"] and "1.2.0" in n["text"] + + +def test_update_notice_is_silent_when_current(): + assert c.update_notice("1.3.0", {"version": "v1.3.0"}) is None + assert c.update_notice("1.4.0", {"version": "v1.3.0"}) is None + + +@pytest.mark.parametrize("bad", [None, {}, {"version": ""}, {"version": None}, {"version": 3}, []]) +def test_update_notice_is_silent_on_a_failed_or_malformed_check(bad): + """fetch_latest_release returns None on any failure; a half-formed payload + must not produce a notice pointing at nothing.""" + assert c.update_notice("1.0.0", bad) is None + + +def test_update_notice_falls_back_to_the_releases_page_without_a_url(): + n = c.update_notice("1.0.0", {"version": "v2.0.0"}) + assert n["url"] == c.RELEASES_URL + + +def test_update_notice_names_no_menu_path(): + """The old status-line text said 'Help > About to view it', which is wrong + on macOS -- Qt moves the About action into the application menu (#79). The + notice carries its own action, so it must not describe a menu path.""" + n = c.update_notice("1.0.0", {"version": "v2.0.0"}) + lowered = n["text"].lower() + for phrase in ("help", "about", "menu", "▸", ">"): + assert phrase not in lowered, f"notice text should not reference {phrase!r}" + + +def test_update_notice_handles_the_v_prefix_consistently(): + assert c.update_notice("1.2.0", {"version": "1.3.0"}) is not None + assert c.update_notice("v1.2.0", {"version": "v1.3.0"}) is not None + assert c.update_notice("1.3.0", {"version": "v1.3.0"}) is None + + +def test_update_notice_renders_both_versions_the_same_way(): + """Tags carry a 'v' prefix, __version__ doesn't -- don't show both forms + in one sentence.""" + n = c.update_notice("1.2.0", {"version": "v1.3.0"}) + assert "v1.3.0" not in n["text"] + assert "1.3.0" in n["text"] and "1.2.0" in n["text"] + # the machine-readable field keeps the real tag + assert n["version"] == "v1.3.0"