solstone-linux 0.4.1__tar.gz → 0.4.3__tar.gz

{solstone_linux-0.4.1 → solstone_linux-0.4.3}/AGENTS.md

@@ -16,7 +16,10 @@ src/solstone_linux/
     cli.py                  CLI entry point (run, setup, settings, install-service, status)
     solstone-linux.service.in        Systemd unit template (rendered by install-service)
     config.py               Config loading/persistence (config under ~/.config/solstone-linux/)
+    doctor.py               Install prerequisite checks for the doctor command
+    install_guard.py        Install ownership guard for pipx-managed service installs
     observer.py             Main capture loop — state machine (idle/screencast), audio + video
+    capture_stats.py        Shared capture cache statistics
     screencast.py           Portal-based multi-monitor recording (xdg-desktop-portal + GStreamer)
     audio_recorder.py       Stereo audio recording (mic + system via soundcard)
     audio_detect.py         Audio device detection via ultrasonic tone
@@ -25,9 +28,16 @@ src/solstone_linux/
     monitor_positions.py    Monitor position assignment from geometry
     session_env.py          Desktop session environment checks and recovery
     streams.py              Stream name derivation (hostname-based)
+    event_sender.py         Background sender for observer event relay
     sync.py                 Background sync service — uploads completed segments to server
+    sync_health.py          Sync health facts, derivation, persistence, and surface copy
     upload.py               HTTP upload client for solstone ingest server
     recovery.py             Crash recovery for orphaned .incomplete segments
+    chat_bridge.py          Server-initiated chat event bridge to local notifications
+    dbus_service.py         Observer status/control D-Bus service interface
+    dbusmenu.py             D-Bus menu protocol implementation for tray menus
+    sni.py                  StatusNotifierItem D-Bus interface for tray icons
+    tray.py                 In-process D-Bus SNI tray icon, menu, and tooltip
 
 tests/                      pytest test suite
 contrib/                    Reference icons for development fallback
@@ -47,6 +57,8 @@ State machine has two modes: `screencast` (screen active, recording video) and `
 
 The capture loop never makes network calls. It writes locally; sync handles all uploads.
 
+The `observe/status` heartbeat carries top-level diagnostics-only health-beacon fields for registered observers; these contain no captured content, paths, URLs, tokens, titles, or labels. Missing or legacy beacons are liveness-only and not failures; journal-side ingest rejections (`health.ingest_rejection`) are separate and are not produced by the observer.
+
 ## Commands
 
 ```bash
@@ -121,7 +133,7 @@ Python packages (in pyproject.toml):
 - `numpy` — Audio buffer manipulation and RMS computation
 - `soundfile` — FLAC encoding
 - `soundcard` — Audio device enumeration and recording
-- `dbus-next` — Async DBus client for portal and activity detection
+- `dbus-fast` — Async DBus client for portal and activity detection
 - `PyGObject` — GDK monitor geometry (installed from system)
 
 ## Data Paths

{solstone_linux-0.4.1 → solstone_linux-0.4.3}/CHANGELOG.md

@@ -4,6 +4,29 @@ All notable changes to solstone-linux are documented here.
 The format is based on Keep a Changelog (https://keepachangelog.com/),
 and this project adheres to Semantic Versioning.
 
+## [0.4.3] - 2026-07-03
+
+### Changed
+- the app now calls itself sol everywhere you see it — the launcher, tray, menus, status, and notifications. your journal is the memory it keeps, and solstone is the platform underneath. the command you run stays `solstone-linux`; nothing about what it does changed, only what it's called.
+- segments your journal rejected or sol couldn't recover are now held for 30 days before they're removed, instead of being dropped silently. `status` and `doctor` show the count, so you can see when any are waiting.
+
+### Fixed
+- local cleanup now deletes a synced segment only after your journal confirms, file by file, that it holds everything in it. previously a segment could be cleaned up while your journal was missing part of it. if your journal can't yet confirm file by file, cleanup holds off and keeps the local copy.
+- sol now recovers on its own from situations that used to leave it quietly stalled or stopped: the first screen-share dialog being dismissed, a journal that's slow to respond or offline, and speakers muted at startup (it goes on without audio and picks it back up when a device is available). an accidental second copy now declines to run rather than disturb the one already going. a round of smaller stability improvements rides along.
+- closing the lid on a docked KDE laptop no longer makes sol go idle.
+- chat notifications now come back on their own after a network drop, and dismissing a notification no longer counts as opening it.
+
+## [0.4.2] - 2026-06-29
+
+### Added
+- this observer now sends your journal a small, diagnostics-only health note alongside its regular check-in, covering its name, version, how long it's been running, and whether syncing is keeping up. it carries none of what it experiences with you: no screen, audio, file paths, or titles. just enough for you to see at a glance that an observer is alive and in good health.
+
+### Changed
+- this observer now carries the sol mark across your desktop, in the app launcher and menus. the tray status icons are unchanged.
+
+### Fixed
+- installing solstone-linux now works cleanly on current debian and ubuntu. the earlier steps could fail while rebuilding the desktop graphics libraries from scratch; the updated install reuses the ones already on your system, so it goes through.
+
 ## [0.4.1] - 2026-06-17
 
 ### Added

{solstone_linux-0.4.1 → solstone_linux-0.4.3}/INSTALL.md

@@ -4,7 +4,9 @@ these instructions are for a coding agent and human working together. solstone-l
 
 solstone must already be installed and running. if it isn't, start there: https://solstone.app/install
 
-> **most users install solstone-linux from PyPI in three commands** on the machine that will host the observer: `pipx install solstone-linux`, `solstone-linux install-service`, then `solstone-linux setup` (which registers against your journal over the local `http://localhost:5015` link — no URL to type). if the observer machine reaches your solstone host directly instead, run `solstone-linux setup --server-url <journal-url>`. the instructions below are for developers building from source or troubleshooting the install.
+> **most users install solstone-linux from PyPI in three commands** on the machine that will host the observer: `pipx install --system-site-packages solstone-linux`, `solstone-linux install-service`, then `solstone-linux setup` (which registers against your journal over the local `http://localhost:5015` link — no URL to type). if the observer machine reaches your solstone host directly instead, run `solstone-linux setup --server-url <journal-url>`. the instructions below are for developers building from source or troubleshooting the install.
+>
+> the `--system-site-packages` flag is **required**: it lets pipx's virtualenv reuse your distro's system PyGObject, pycairo, and GStreamer bindings (the `python3-gi` / `python3-cairo` packages installed below) instead of rebuilding PyGObject from source. a plain `pipx install solstone-linux` rebuilds PyGObject in an isolated venv, which needs the full GObject-Introspection build toolchain (`libgirepository-2.0-dev`) — and that dev package isn't even available on every supported distro (Debian 12 stable doesn't ship it). `--system-site-packages` is the path that works on every distro and skips the compile entirely.
 
 ## before you begin
 
@@ -34,7 +36,7 @@ By default the observer registers over the local `http://localhost:5015` link, s
 
 ## install sequence
 
-this is the developer/from-source path; most installs should use the `pipx install solstone-linux` + `solstone-linux install-service` + `solstone-linux setup` flow described in the callout above.
+this is the developer/from-source path; most installs should use the `pipx install --system-site-packages solstone-linux` + `solstone-linux install-service` + `solstone-linux setup` flow described in the callout above.
 
 1. install system dependencies for your distro, including `pipx`. if you need sudo, walk your human through it.
 
@@ -50,7 +52,7 @@ this is the developer/from-source path; most installs should use the `pipx insta
 
    **arch:**
    ```
-   sudo pacman -S python-gobject gtk4 gstreamer gst-plugin-pipewire libpulse alsa-lib xdg-desktop-portal pipx
+   sudo pacman -S python-gobject gtk4 gstreamer gst-plugin-pipewire gst-plugins-good libpulse alsa-lib xdg-desktop-portal python-pipx uv python-cairo
    ```
 
    **opensuse:**
@@ -62,7 +64,7 @@ this is the developer/from-source path; most installs should use the `pipx insta
    ```
    note: package names diverge from Fedora — `typelib-1_0-Gtk-4_0` (not `gtk4`), `gstreamer-plugin-pipewire` (singular), and `alsa-devel` (not `alsa-lib-devel`).
 
-   the `cairo` headers + `gcc` + Python dev headers in the Fedora/Debian lines above are there because `pycairo` builds from source during install; without them the install fails with a compile error before you'd reach the Troubleshooting section. they're the same fixes listed under Troubleshooting, hoisted up so a fresh install works in one shot.
+   with the recommended `pipx install --system-site-packages solstone-linux`, the system `python3-gi` and `python3-cairo` packages above satisfy PyGObject and pycairo, so **neither builds from source**. the `cairo` headers + `gcc` + Python dev headers in the Fedora/Debian lines are kept as a fallback for any other pure-Python dependency that lacks a prebuilt wheel on your platform — and they're what an *isolated*-venv install (a plain `pipx install` without `--system-site-packages`) needs to compile pycairo from source. (an isolated-venv install also needs `libgirepository-2.0-dev`; see Troubleshooting.)
 
    `uv` / `pipx`: Fedora packages both (`sudo dnf install uv pipx`); Debian/Ubuntu package `pipx` but not `uv`. the PyPI install flow only needs `pipx` — `uv` is optional and used by the from-source dev workflow in the Makefile.
 
@@ -86,6 +88,15 @@ this is the developer/from-source path; most installs should use the `pipx insta
    systemctl --user status solstone-linux
    ```
 
+## updating from PyPI
+
+```
+pipx upgrade solstone-linux
+systemctl --user restart solstone-linux
+```
+
+the systemd unit template and icons only refresh when you re-run `solstone-linux install-service`, so after upgrading across a release that changed the unit, re-run `solstone-linux install-service`.
+
 ## updating after a code change
 
 ```
@@ -94,7 +105,7 @@ git pull && make install-service
 
 ## notes
 
-- activity detection (idle timeout, screen lock, power save) works on both GNOME and KDE. on other desktops the observer still experiences your screen and audio fine, but activity-based segment boundaries won't trigger.
+- Activity detection uses screen-lock and power-save signals to notice when you step away. Coverage varies by desktop: GNOME provides both signals; KDE (Wayland) provides screen lock only; any X11 session also provides DPMS power save; other Wayland desktops provide screen lock where the compositor exposes it. Where neither signal is available, solstone-linux still experiences your screen and audio, but activity-based segment boundaries won't trigger.
 - the tray icon uses the StatusNotifierItem (SNI) D-Bus protocol. it works on KDE natively and GNOME with the AppIndicator extension. if no SNI host is available, the observer runs normally without a tray icon.
 
 ## appendix: GNOME tray support
@@ -140,11 +151,13 @@ Common install-time errors and their fixes:
   - arch: `sudo pacman -S pkgconf cairo`
   - opensuse: `sudo zypper install pkgconf-pkg-config cairo-devel`
 
-- **`girepository-2.0` missing or `pygobject` build failure**
-  - fedora: `sudo dnf install gobject-introspection-devel`
-  - debian/ubuntu: `sudo apt install libgirepository1.0-dev`
-  - arch: `sudo pacman -S gobject-introspection`
-  - opensuse: `sudo zypper install gobject-introspection-devel`
+- **`girepository-2.0` missing or `pygobject` build failure** — only hit when installing into an *isolated* venv (a plain `pipx install` **without** `--system-site-packages`), which rebuilds PyGObject from PyPI from source. the recommended `pipx install --system-site-packages solstone-linux` uses your system `python3-gi` and skips this build entirely.
+  - **first, retry with `--system-site-packages`.** `pipx install --system-site-packages solstone-linux` needs no build toolchain. this is the fix on Debian 12 (stable) and other distros that don't package the `-2.0` dev headers at all.
+  - if you must build from source: PyPI's PyGObject (3.50+, Sept 2024 onward) needs the girepository-**2.0** dev headers, not the old 1.0 package:
+    - fedora: `sudo dnf install gobject-introspection-devel`
+    - debian/ubuntu: `sudo apt install libgirepository-2.0-dev` (Debian 13 / Ubuntu 24.04+; older releases that ship PyGObject < 3.50 use `libgirepository1.0-dev`)
+    - arch: `sudo pacman -S gobject-introspection`
+    - opensuse: `sudo zypper install gobject-introspection-devel`
 
 - **`Python.h: No such file or directory`**
   - fedora: `sudo dnf install python3-devel`

{solstone_linux-0.4.1 → solstone_linux-0.4.3}/Makefile

@@ -156,7 +156,7 @@ versions: .installed
 	$(PYTHON) --version
 	@echo ""
 	@echo "=== Installed packages ==="
-	@$(UV) pip list | grep -E "^(pytest|ruff|requests|numpy|soundfile|soundcard|dbus-next|PyGObject)" || true
+	@$(UV) pip list | grep -E "^(pytest|ruff|requests|numpy|soundfile|soundcard|dbus-fast|PyGObject)" || true
 
 release: ## Publish solstone-linux to PyPI (production)
 	@bash scripts/release.sh

{solstone_linux-0.4.1 → solstone_linux-0.4.3}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: solstone-linux
-Version: 0.4.1
+Version: 0.4.3
 Summary: Standalone Linux desktop observer for solstone
 License-Expression: AGPL-3.0-only
 License-File: LICENSE
 Requires-Python: >=3.10
-Requires-Dist: dbus-next
+Requires-Dist: dbus-fast>=5.0
 Requires-Dist: numpy
 Requires-Dist: pygobject
 Requires-Dist: requests
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 
 Standalone Linux desktop observer for [solstone](https://solpbc.org). Experiences your screen and audio along with you on a GNOME Wayland session, stores segments locally, and syncs to your solstone journal.
 
-**Note:** Activity detection (idle timeout, screen lock, power save) currently requires a GNOME desktop. On other desktops (KDE, Sway, Hyprland, XFCE), the observer still experiences your screen and audio, but activity-based segment boundaries won't trigger.
+**Note:** Activity detection uses screen-lock and power-save signals to notice when you step away. Coverage varies by desktop: GNOME provides both signals; KDE (Wayland) provides screen lock only; any X11 session also provides DPMS power save; other Wayland desktops provide screen lock where the compositor exposes it. Where neither signal is available, solstone-linux still experiences your screen and audio, but activity-based segment boundaries won't trigger.
 
 ## System Dependencies
 
@@ -48,11 +48,13 @@ solstone (the journal) must already be installed and running on the host this ob
 On the machine that will host the observer:
 
 ```bash
-pipx install solstone-linux
+pipx install --system-site-packages solstone-linux
 solstone-linux install-service
 solstone-linux setup
 ```
 
+The `--system-site-packages` flag is required: it lets pipx reuse your distro's system PyGObject/pycairo/GStreamer bindings (the `python3-gi` / `python3-cairo` packages from System Dependencies above) instead of rebuilding PyGObject from source — which needs the GObject-Introspection build toolchain and isn't packaged on every distro. See `INSTALL.md` if a plain `pipx install` failed with a `girepository-2.0` build error.
+
 `setup` registers the observer against your journal over the local `http://localhost:5015` link, so there's no URL to type. If this machine reaches your solstone host directly instead, run `solstone-linux setup --server-url <journal-url>`. (Legacy fallback: mint a key on the journal host with `journal observer create <name>` and paste it during setup.)
 
 ### Developers building from source
@@ -85,6 +87,10 @@ solstone-linux run
 solstone-linux status
 ```
 
+Registered observers also include a diagnostics-only status beacon in the
+journal: identity, version, uptime, and sync liveness counts only, with no
+captured or experienced content.
+
 ## License
 
 AGPL-3.0-only — Copyright (c) 2026 sol pbc

{solstone_linux-0.4.1 → solstone_linux-0.4.3}/README.md

@@ -2,7 +2,7 @@
 
 Standalone Linux desktop observer for [solstone](https://solpbc.org). Experiences your screen and audio along with you on a GNOME Wayland session, stores segments locally, and syncs to your solstone journal.
 
-**Note:** Activity detection (idle timeout, screen lock, power save) currently requires a GNOME desktop. On other desktops (KDE, Sway, Hyprland, XFCE), the observer still experiences your screen and audio, but activity-based segment boundaries won't trigger.
+**Note:** Activity detection uses screen-lock and power-save signals to notice when you step away. Coverage varies by desktop: GNOME provides both signals; KDE (Wayland) provides screen lock only; any X11 session also provides DPMS power save; other Wayland desktops provide screen lock where the compositor exposes it. Where neither signal is available, solstone-linux still experiences your screen and audio, but activity-based segment boundaries won't trigger.
 
 ## System Dependencies
 
@@ -33,11 +33,13 @@ solstone (the journal) must already be installed and running on the host this ob
 On the machine that will host the observer:
 
 ```bash
-pipx install solstone-linux
+pipx install --system-site-packages solstone-linux
 solstone-linux install-service
 solstone-linux setup
 ```
 
+The `--system-site-packages` flag is required: it lets pipx reuse your distro's system PyGObject/pycairo/GStreamer bindings (the `python3-gi` / `python3-cairo` packages from System Dependencies above) instead of rebuilding PyGObject from source — which needs the GObject-Introspection build toolchain and isn't packaged on every distro. See `INSTALL.md` if a plain `pipx install` failed with a `girepository-2.0` build error.
+
 `setup` registers the observer against your journal over the local `http://localhost:5015` link, so there's no URL to type. If this machine reaches your solstone host directly instead, run `solstone-linux setup --server-url <journal-url>`. (Legacy fallback: mint a key on the journal host with `journal observer create <name>` and paste it during setup.)
 
 ### Developers building from source
@@ -70,6 +72,10 @@ solstone-linux run
 solstone-linux status
 ```
 
+Registered observers also include a diagnostics-only status beacon in the
+journal: identity, version, uptime, and sync liveness counts only, with no
+captured or experienced content.
+
 ## License
 
 AGPL-3.0-only — Copyright (c) 2026 sol pbc

solstone_linux-0.4.3/contrib/icons/hicolor/scalable/apps/solstone-observer.svg

@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" role="img" aria-label="solstone">
+  <title>solstone</title>
+  <!-- canonical sol app icon (transparent) — UNIFIED WORDMARK direction (locked 2026-06-25, founder-approved).
+       mark: the sol wordmark (sun ring + "sol" Comfortaa Bold) from sol-wordmark.svg, at full extents.
+       ground: NONE (transparent), open center — the background shows through the ring.
+       color: #E8923A sol orange (ring + "sol" glyph) + #FFCF33 sol gold rays — one recipe on every ground.
+              the mark is a logotype (WCAG-exempt), so the brand orange holds on light and dark alike
+              (palette simplification 2026-06-29, records/decisions/260629-cmo-sol-mark-palette-simplification.md).
+       geometry: identical mark + scale (1.185x, 35.9529) to sol-app-icon-cream.svg; only the ground differs.
+       use: Windows + Linux (and any controlled/dark surface — docs, dark UI, marketing on dark).
+       decision: records/decisions/260625-cmo-sol-app-icon-unified-wordmark.md
+       RENDERING RULE: render from this SVG at every target size; never downsample. -->
+  <g transform="translate(512,512) scale(35.9529) translate(-16,-16)">
+    <path fill="#FFCF33" d="M16.0 2.5 L18.6 7.3 A9.1 9.1 0 0 0 13.4 7.3 Z M23.9 5.1 L23.2 10.5 A9.1 9.1 0 0 0 19.0 7.4 Z M28.8 11.8 L25.1 15.8 A9.1 9.1 0 0 0 23.5 10.9 Z M28.8 20.2 L23.5 21.1 A9.1 9.1 0 0 0 25.1 16.2 Z M23.9 26.9 L19.0 24.6 A9.1 9.1 0 0 0 23.2 21.5 Z M16.0 29.5 L13.4 24.7 A9.1 9.1 0 0 0 18.6 24.7 Z M8.1 26.9 L8.8 21.5 A9.1 9.1 0 0 0 13.0 24.6 Z M3.2 20.2 L6.9 16.2 A9.1 9.1 0 0 0 8.5 21.1 Z M3.2 11.8 L8.5 10.9 A9.1 9.1 0 0 0 6.9 15.8 Z M8.1 5.1 L13.0 7.4 A9.1 9.1 0 0 0 8.8 10.5 Z"/>
+    <circle cx="16" cy="16" r="8.0" fill="none" stroke="#E8923A" stroke-width="1.2"/>
+    <path fill="#E8923A" fill-rule="evenodd" d="M12.079 18.795C13.489 18.795 14.229 18.065 14.229 17.155C14.229 16.365 13.729 15.835 12.229 15.535C11.149 15.315 10.939 15.095 10.939 14.725C10.939 14.345 11.399 14.135 11.989 14.135C12.499 14.135 12.859 14.235 13.199 14.555C13.399 14.745 13.729 14.815 13.949 14.665C14.159 14.505 14.169 14.255 13.989 14.035C13.589 13.545 12.889 13.245 12.009 13.245C10.989 13.245 9.959 13.735 9.959 14.755C9.959 15.525 10.529 16.075 11.879 16.335C12.919 16.525 13.249 16.815 13.239 17.215C13.229 17.615 12.809 17.895 12.039 17.895C11.429 17.895 10.889 17.625 10.659 17.375C10.469 17.175 10.189 17.125 9.929 17.335C9.699 17.515 9.659 17.825 9.859 18.035C10.299 18.475 11.149 18.795 12.079 18.795Z M16.999 18.795C18.609 18.795 19.749 17.645 19.749 16.025C19.739 14.395 18.599 13.245 16.999 13.245C15.379 13.245 14.239 14.395 14.239 16.025C14.239 17.645 15.379 18.795 16.999 18.795ZM16.999 17.895C15.959 17.895 15.219 17.125 15.219 16.025C15.219 14.925 15.959 14.145 16.999 14.145C18.039 14.145 18.769 14.925 18.769 16.025C18.769 17.125 18.039 17.895 16.999 17.895Z M21.569 18.755H21.589C21.989 18.755 22.269 18.545 22.269 18.255C22.269 17.965 22.079 17.755 21.819 17.755H21.569C21.279 17.755 21.069 17.405 21.069 16.905V11.445C21.069 11.155 20.859 10.945 20.569 10.945C20.279 10.945 20.069 11.155 20.069 11.445V16.905C20.069 17.985 20.689 18.755 21.569 18.755Z"/>
+  </g>
+</svg>

{solstone_linux-0.4.1 → solstone_linux-0.4.3}/contrib/icons/hicolor/scalable/status/solstone-error.svg

@@ -9,7 +9,7 @@
     </mask>
   </defs>
   <g mask="url(#ixko)">
-    <path fill="#F5C740" d="M16.0 2.5 L18.6 7.3 A9.1 9.1 0 0 0 13.4 7.3 Z M23.9 5.1 L23.2 10.5 A9.1 9.1 0 0 0 19.0 7.4 Z M28.8 11.8 L25.1 15.8 A9.1 9.1 0 0 0 23.5 10.9 Z M28.8 20.2 L23.5 21.1 A9.1 9.1 0 0 0 25.1 16.2 Z M23.9 26.9 L19.0 24.6 A9.1 9.1 0 0 0 23.2 21.5 Z M16.0 29.5 L13.4 24.7 A9.1 9.1 0 0 0 18.6 24.7 Z M8.1 26.9 L8.8 21.5 A9.1 9.1 0 0 0 13.0 24.6 Z M3.2 20.2 L6.9 16.2 A9.1 9.1 0 0 0 8.5 21.1 Z M3.2 11.8 L8.5 10.9 A9.1 9.1 0 0 0 6.9 15.8 Z M8.1 5.1 L13.0 7.4 A9.1 9.1 0 0 0 8.8 10.5 Z"/>
+    <path fill="#FFCF33" d="M16.0 2.5 L18.6 7.3 A9.1 9.1 0 0 0 13.4 7.3 Z M23.9 5.1 L23.2 10.5 A9.1 9.1 0 0 0 19.0 7.4 Z M28.8 11.8 L25.1 15.8 A9.1 9.1 0 0 0 23.5 10.9 Z M28.8 20.2 L23.5 21.1 A9.1 9.1 0 0 0 25.1 16.2 Z M23.9 26.9 L19.0 24.6 A9.1 9.1 0 0 0 23.2 21.5 Z M16.0 29.5 L13.4 24.7 A9.1 9.1 0 0 0 18.6 24.7 Z M8.1 26.9 L8.8 21.5 A9.1 9.1 0 0 0 13.0 24.6 Z M3.2 20.2 L6.9 16.2 A9.1 9.1 0 0 0 8.5 21.1 Z M3.2 11.8 L8.5 10.9 A9.1 9.1 0 0 0 6.9 15.8 Z M8.1 5.1 L13.0 7.4 A9.1 9.1 0 0 0 8.8 10.5 Z"/>
     <circle cx="16.0" cy="16.0" r="6.5" fill="none" stroke="#E8923A" stroke-width="1.7"/>
   </g>
   <path d="M7 7 L25 25 M25 7 L7 25" fill="none" stroke="#E8923A"

{solstone_linux-0.4.1 → solstone_linux-0.4.3}/contrib/icons/hicolor/scalable/status/solstone-paused.svg

@@ -9,7 +9,7 @@
     </mask>
   </defs>
   <g mask="url(#icko)">
-    <path fill="#F5C740" d="M16.0 2.5 L18.6 7.3 A9.1 9.1 0 0 0 13.4 7.3 Z M23.9 5.1 L23.2 10.5 A9.1 9.1 0 0 0 19.0 7.4 Z M28.8 11.8 L25.1 15.8 A9.1 9.1 0 0 0 23.5 10.9 Z M28.8 20.2 L23.5 21.1 A9.1 9.1 0 0 0 25.1 16.2 Z M23.9 26.9 L19.0 24.6 A9.1 9.1 0 0 0 23.2 21.5 Z M16.0 29.5 L13.4 24.7 A9.1 9.1 0 0 0 18.6 24.7 Z M8.1 26.9 L8.8 21.5 A9.1 9.1 0 0 0 13.0 24.6 Z M3.2 20.2 L6.9 16.2 A9.1 9.1 0 0 0 8.5 21.1 Z M3.2 11.8 L8.5 10.9 A9.1 9.1 0 0 0 6.9 15.8 Z M8.1 5.1 L13.0 7.4 A9.1 9.1 0 0 0 8.8 10.5 Z"/>
+    <path fill="#FFCF33" d="M16.0 2.5 L18.6 7.3 A9.1 9.1 0 0 0 13.4 7.3 Z M23.9 5.1 L23.2 10.5 A9.1 9.1 0 0 0 19.0 7.4 Z M28.8 11.8 L25.1 15.8 A9.1 9.1 0 0 0 23.5 10.9 Z M28.8 20.2 L23.5 21.1 A9.1 9.1 0 0 0 25.1 16.2 Z M23.9 26.9 L19.0 24.6 A9.1 9.1 0 0 0 23.2 21.5 Z M16.0 29.5 L13.4 24.7 A9.1 9.1 0 0 0 18.6 24.7 Z M8.1 26.9 L8.8 21.5 A9.1 9.1 0 0 0 13.0 24.6 Z M3.2 20.2 L6.9 16.2 A9.1 9.1 0 0 0 8.5 21.1 Z M3.2 11.8 L8.5 10.9 A9.1 9.1 0 0 0 6.9 15.8 Z M8.1 5.1 L13.0 7.4 A9.1 9.1 0 0 0 8.8 10.5 Z"/>
     <circle cx="16.0" cy="16.0" r="6.5" fill="none" stroke="#E8923A" stroke-width="1.7"/>
   </g>
   <path d="M 8.50 21.50 A 4.5 4.5 0 0 1 12.02 18.00 A 5.2 5.2 0 0 1 21.35 13.65 A 4.0 4.0 0 0 1 26.91 18.89 C 28 22, 27.5 25.5, 23 25.5 C 20 28.8, 16 28.8, 13 25.5 C 10 26.5, 8 23.5, 8.50 21.50 Z" fill="none" stroke="#999"

{solstone_linux-0.4.1/src/solstone_linux → solstone_linux-0.4.3/contrib}/icons/hicolor/scalable/status/solstone-recording.svg

@@ -1,7 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="2.5 2.5 27 27" role="img" aria-label="solstone icon observing state">
   <title>solstone — observing</title>
   <!-- Sun rays: 10 floating wedges with curved inner arc matching the ring -->
-  <path fill="#F5C740" d="M16.0 2.5 L18.6 7.3 A9.1 9.1 0 0 0 13.4 7.3 Z M23.9 5.1 L23.2 10.5 A9.1 9.1 0 0 0 19.0 7.4 Z M28.8 11.8 L25.1 15.8 A9.1 9.1 0 0 0 23.5 10.9 Z M28.8 20.2 L23.5 21.1 A9.1 9.1 0 0 0 25.1 16.2 Z M23.9 26.9 L19.0 24.6 A9.1 9.1 0 0 0 23.2 21.5 Z M16.0 29.5 L13.4 24.7 A9.1 9.1 0 0 0 18.6 24.7 Z M8.1 26.9 L8.8 21.5 A9.1 9.1 0 0 0 13.0 24.6 Z M3.2 20.2 L6.9 16.2 A9.1 9.1 0 0 0 8.5 21.1 Z M3.2 11.8 L8.5 10.9 A9.1 9.1 0 0 0 6.9 15.8 Z M8.1 5.1 L13.0 7.4 A9.1 9.1 0 0 0 8.8 10.5 Z"/>
+  <path fill="#FFCF33" d="M16.0 2.5 L18.6 7.3 A9.1 9.1 0 0 0 13.4 7.3 Z M23.9 5.1 L23.2 10.5 A9.1 9.1 0 0 0 19.0 7.4 Z M28.8 11.8 L25.1 15.8 A9.1 9.1 0 0 0 23.5 10.9 Z M28.8 20.2 L23.5 21.1 A9.1 9.1 0 0 0 25.1 16.2 Z M23.9 26.9 L19.0 24.6 A9.1 9.1 0 0 0 23.2 21.5 Z M16.0 29.5 L13.4 24.7 A9.1 9.1 0 0 0 18.6 24.7 Z M8.1 26.9 L8.8 21.5 A9.1 9.1 0 0 0 13.0 24.6 Z M3.2 20.2 L6.9 16.2 A9.1 9.1 0 0 0 8.5 21.1 Z M3.2 11.8 L8.5 10.9 A9.1 9.1 0 0 0 6.9 15.8 Z M8.1 5.1 L13.0 7.4 A9.1 9.1 0 0 0 8.8 10.5 Z"/>
   <!-- Sun ring: open annulus -->
   <circle cx="16" cy="16" r="6.5" fill="none" stroke="#E8923A" stroke-width="1.7"/>
 </svg>

{solstone_linux-0.4.1/src/solstone_linux → solstone_linux-0.4.3/contrib}/icons/hicolor/scalable/status/solstone-syncing.svg

@@ -2,11 +2,11 @@
      role="img" aria-label="solstone icon syncing state">
   <title>solstone — syncing</title>
   <!-- Top 5 rays only (no clip path needed) -->
-  <path fill="#F5C740" d="M16.0 2.5 L18.6 7.3 A9.1 9.1 0 0 0 13.4 7.3 Z"/>
-  <path fill="#F5C740" d="M23.9 5.1 L23.2 10.5 A9.1 9.1 0 0 0 19.0 7.4 Z"/>
-  <path fill="#F5C740" d="M28.8 11.8 L25.1 15.8 A9.1 9.1 0 0 0 23.5 10.9 Z"/>
-  <path fill="#F5C740" d="M3.2 11.8 L8.5 10.9 A9.1 9.1 0 0 0 6.9 15.8 Z"/>
-  <path fill="#F5C740" d="M8.1 5.1 L13.0 7.4 A9.1 9.1 0 0 0 8.8 10.5 Z"/>
+  <path fill="#FFCF33" d="M16.0 2.5 L18.6 7.3 A9.1 9.1 0 0 0 13.4 7.3 Z"/>
+  <path fill="#FFCF33" d="M23.9 5.1 L23.2 10.5 A9.1 9.1 0 0 0 19.0 7.4 Z"/>
+  <path fill="#FFCF33" d="M28.8 11.8 L25.1 15.8 A9.1 9.1 0 0 0 23.5 10.9 Z"/>
+  <path fill="#FFCF33" d="M3.2 11.8 L8.5 10.9 A9.1 9.1 0 0 0 6.9 15.8 Z"/>
+  <path fill="#FFCF33" d="M8.1 5.1 L13.0 7.4 A9.1 9.1 0 0 0 8.8 10.5 Z"/>
   <!-- Top arc of the ring -->
   <path fill="none" stroke="#E8923A" stroke-width="1.7"
         d="M 9.5 16.0 A 6.5 6.5 0 0 1 22.5 16.0"/>

{solstone_linux-0.4.1 → solstone_linux-0.4.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "solstone-linux"
-version = "0.4.1"
+version = "0.4.3"
 description = "Standalone Linux desktop observer for solstone"
 readme = "README.md"
 license = "AGPL-3.0-only"
@@ -10,7 +10,7 @@ dependencies = [
     "numpy",
     "soundfile",
     "soundcard",
-    "dbus-next",
+    "dbus-fast>=5.0",
     "PyGObject",
 ]
 

{solstone_linux-0.4.1 → solstone_linux-0.4.3}/scripts/release.sh

@@ -75,6 +75,16 @@ SDIST_NAME=$(basename "${SDISTS[0]}")
 VERSION="${SDIST_NAME#solstone_linux-}"
 VERSION="${VERSION%.tar.gz}"
 
+INIT_VERSION=$(grep -E '^__version__ = "[^"]+"' src/solstone_linux/__init__.py | sed 's/^__version__ = "\([^"]*\)".*/\1/' || true)
+if [[ -z "$INIT_VERSION" ]]; then
+  echo "error: could not read __version__ from src/solstone_linux/__init__.py" >&2
+  exit 1
+fi
+if [[ "$INIT_VERSION" != "$VERSION" ]]; then
+  echo "error: version mismatch: sdist version ${VERSION}, src/solstone_linux/__init__.py __version__ ${INIT_VERSION}" >&2
+  exit 1
+fi
+
 uvx twine check dist/*
 
 # Pre-flight: verify the CHANGELOG block exists before publishing.

{solstone_linux-0.4.1 → solstone_linux-0.4.3}/src/solstone_linux/__init__.py

@@ -3,4 +3,4 @@
 
 """Standalone Linux desktop observer for solstone."""
 
-__version__ = "0.4.1"
+__version__ = "0.4.3"

{solstone_linux-0.4.1 → solstone_linux-0.4.3}/src/solstone_linux/activity.py

@@ -16,9 +16,9 @@ import re
 import shutil
 import subprocess
 
-from dbus_next import Variant
-from dbus_next.aio import MessageBus
-from dbus_next.errors import (
+from dbus_fast import Variant
+from dbus_fast.aio import MessageBus
+from dbus_fast.errors import (
     DBusError,
     InvalidIntrospectionError,
     InvalidMemberNameError,
@@ -28,6 +28,10 @@ logger = logging.getLogger(__name__)
 
 _DBUS_PROBE_TIMEOUT_SEC = 2.0
 _POWER_SAVE_WARNED_BACKENDS: set[str] = set()
+# One session bus lives for the whole process, so id(bus) is stable and
+# never recycled — a plain dict needs no eviction. Keyed by bus identity
+# because dbus-fast's cython MessageBus cannot be weak-referenced.
+_PROXY_CACHE: dict = {}
 
 _SERVICE_MISSING_ERRORS = (
     "org.freedesktop.DBus.Error.ServiceUnknown",
@@ -62,10 +66,6 @@ DISPLAY_CONFIG_BUS = "org.gnome.Mutter.DisplayConfig"
 DISPLAY_CONFIG_PATH = "/org/gnome/Mutter/DisplayConfig"
 DISPLAY_CONFIG_IFACE = "org.gnome.Mutter.DisplayConfig"
 
-KDE_POWER_BUS = "org.kde.Solid.PowerManagement"
-KDE_POWER_PATH = "/org/kde/Solid/PowerManagement"
-KDE_POWER_IFACE = "org.kde.Solid.PowerManagement"
-
 # DBus service constants — monitor geometry (KDE)
 KSCREEN_BUS = "org.kde.KScreen"
 KSCREEN_PATH = "/backend"
@@ -88,6 +88,23 @@ def _is_gnome_desktop() -> bool:
     )
 
 
+async def _cached_interface(bus: MessageBus, service: str, path: str, iface_name: str):
+    key = (id(bus), service, path, iface_name)
+    if key in _PROXY_CACHE:
+        return _PROXY_CACHE[key]
+    intro = await bus.introspect(service, path)
+    obj = bus.get_proxy_object(service, path, intro)
+    iface = obj.get_interface(iface_name)
+    _PROXY_CACHE[key] = iface
+    return iface
+
+
+def _invalidate_interface(
+    bus: MessageBus, service: str, path: str, iface_name: str
+) -> None:
+    _PROXY_CACHE.pop((id(bus), service, path, iface_name), None)
+
+
 async def _name_has_owner(bus: MessageBus, bus_name: str) -> bool:
     """Ask the bus daemon whether a well-known name is currently owned.
 
@@ -199,7 +216,6 @@ async def probe_activity_services(bus: MessageBus) -> dict[str, bool]:
         "fdo_screensaver": FDO_SCREENSAVER_BUS,
         "gnome_screensaver": GNOME_SCREENSAVER_BUS,
         "gnome_display_config": DISPLAY_CONFIG_BUS,
-        "kde_power": KDE_POWER_BUS,
         "kscreen": KSCREEN_BUS,
     }
     results = {}
@@ -212,7 +228,7 @@ async def probe_activity_services(bus: MessageBus) -> dict[str, bool]:
 
     # Log grouped by function
     lock_backends = ["fdo_screensaver", "gnome_screensaver"]
-    power_backends = ["gnome_display_config", "kde_power"]
+    power_backends = ["gnome_display_config"]
     monitor_backends = ["kscreen"]
 
     def _status(keys):
@@ -253,9 +269,12 @@ async def is_screen_locked(bus: MessageBus) -> bool:
     if not _is_gnome_desktop():
         # Try freedesktop.org ScreenSaver first (KDE kwin and other non-GNOME desktops)
         try:
-            intro = await bus.introspect(FDO_SCREENSAVER_BUS, FDO_SCREENSAVER_PATH)
-            obj = bus.get_proxy_object(FDO_SCREENSAVER_BUS, FDO_SCREENSAVER_PATH, intro)
-            iface = obj.get_interface(FDO_SCREENSAVER_IFACE)
+            iface = await _cached_interface(
+                bus,
+                FDO_SCREENSAVER_BUS,
+                FDO_SCREENSAVER_PATH,
+                FDO_SCREENSAVER_IFACE,
+            )
             return bool(await iface.call_get_active())
         except (
             DBusError,
@@ -263,6 +282,12 @@ async def is_screen_locked(bus: MessageBus) -> bool:
             InvalidIntrospectionError,
             OSError,
         ) as exc:
+            _invalidate_interface(
+                bus,
+                FDO_SCREENSAVER_BUS,
+                FDO_SCREENSAVER_PATH,
+                FDO_SCREENSAVER_IFACE,
+            )
             if not _is_service_missing(exc):
                 logger.warning(
                     "is_screen_locked FDO backend failed: service=%s path=%s: %s: %s",
@@ -274,9 +299,12 @@ async def is_screen_locked(bus: MessageBus) -> bool:
 
     # Fall back to GNOME ScreenSaver
     try:
-        intro = await bus.introspect(GNOME_SCREENSAVER_BUS, GNOME_SCREENSAVER_PATH)
-        obj = bus.get_proxy_object(GNOME_SCREENSAVER_BUS, GNOME_SCREENSAVER_PATH, intro)
-        iface = obj.get_interface(GNOME_SCREENSAVER_IFACE)
+        iface = await _cached_interface(
+            bus,
+            GNOME_SCREENSAVER_BUS,
+            GNOME_SCREENSAVER_PATH,
+            GNOME_SCREENSAVER_IFACE,
+        )
         return bool(await iface.call_get_active())
     except (
         DBusError,
@@ -284,6 +312,12 @@ async def is_screen_locked(bus: MessageBus) -> bool:
         InvalidIntrospectionError,
         OSError,
     ) as exc:
+        _invalidate_interface(
+            bus,
+            GNOME_SCREENSAVER_BUS,
+            GNOME_SCREENSAVER_PATH,
+            GNOME_SCREENSAVER_IFACE,
+        )
         if not _is_service_missing(exc):
             logger.warning(
                 "is_screen_locked GNOME backend failed: service=%s path=%s: %s: %s",
@@ -296,9 +330,10 @@ async def is_screen_locked(bus: MessageBus) -> bool:
 
 
 async def is_power_save_active(bus: MessageBus) -> bool:
-    """Check display power save via GNOME Mutter, then KDE Solid.
+    """Return True when the session reports a power-saving/display-off state.
 
-    Returns True if power save is active, False otherwise.
+    Checks GNOME Mutter PowerSaveMode, then falls back to X11 DPMS when
+    XDG_SESSION_TYPE is x11; degrades to False when no backend is available.
     """
 
     def log_backend_failure_once(backend: str, bus_name: str, path: str, exc) -> None:
@@ -318,9 +353,12 @@ async def is_power_save_active(bus: MessageBus) -> bool:
 
     # Try GNOME Mutter DisplayConfig first
     try:
-        intro = await bus.introspect(DISPLAY_CONFIG_BUS, DISPLAY_CONFIG_PATH)
-        obj = bus.get_proxy_object(DISPLAY_CONFIG_BUS, DISPLAY_CONFIG_PATH, intro)
-        iface = obj.get_interface("org.freedesktop.DBus.Properties")
+        iface = await _cached_interface(
+            bus,
+            DISPLAY_CONFIG_BUS,
+            DISPLAY_CONFIG_PATH,
+            "org.freedesktop.DBus.Properties",
+        )
         mode_variant = await iface.call_get(DISPLAY_CONFIG_IFACE, "PowerSaveMode")
         mode = int(mode_variant.value)
         return mode != 0
@@ -330,6 +368,12 @@ async def is_power_save_active(bus: MessageBus) -> bool:
         InvalidIntrospectionError,
         OSError,
     ) as exc:
+        _invalidate_interface(
+            bus,
+            DISPLAY_CONFIG_BUS,
+            DISPLAY_CONFIG_PATH,
+            "org.freedesktop.DBus.Properties",
+        )
         if not _is_service_missing(exc):
             log_backend_failure_once(
                 "Mutter",
@@ -338,21 +382,6 @@ async def is_power_save_active(bus: MessageBus) -> bool:
                 exc,
             )
 
-    # Fall back to KDE Solid PowerManagement
-    try:
-        intro = await bus.introspect(KDE_POWER_BUS, KDE_POWER_PATH)
-        obj = bus.get_proxy_object(KDE_POWER_BUS, KDE_POWER_PATH, intro)
-        iface = obj.get_interface(KDE_POWER_IFACE)
-        return bool(await iface.call_is_lid_closed())
-    except (
-        DBusError,
-        InvalidMemberNameError,
-        InvalidIntrospectionError,
-        OSError,
-    ) as exc:
-        if not _is_service_missing(exc):
-            log_backend_failure_once("KDE", KDE_POWER_BUS, KDE_POWER_PATH, exc)
-
     # X11-only fallback: DPMS via xset
     if os.environ.get("XDG_SESSION_TYPE", "").lower() == "x11":
         return await is_dpms_active()
@@ -407,7 +436,7 @@ def get_monitor_geometries() -> list[dict]:
 
 
 def _unwrap_variants(obj):
-    """Recursively unwrap dbus-next Variants in nested DBus structures."""
+    """Recursively unwrap dbus-fast Variants in nested DBus structures."""
     if isinstance(obj, Variant):
         return _unwrap_variants(obj.value)
     if isinstance(obj, dict):