solstone-linux 0.3.2__tar.gz → 0.4.0__tar.gz

{solstone_linux-0.3.2 → solstone_linux-0.4.0}/AGENTS.md

@@ -13,9 +13,9 @@ This is **not** part of the solstone monorepo. It is a standalone package with i
 ```
 src/solstone_linux/
     __init__.py             Package version
-    cli.py                  CLI entry point (run, setup, install-service, status)
+    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 (~/.local/share/solstone-linux/)
+    config.py               Config loading/persistence (config under ~/.config/solstone-linux/)
     observer.py             Main capture loop — state machine (idle/screencast), audio + video
     screencast.py           Portal-based multi-monitor recording (xdg-desktop-portal + GStreamer)
     audio_recorder.py       Stereo audio recording (mic + system via soundcard)
@@ -126,10 +126,10 @@ Python packages (in pyproject.toml):
 
 ## Data Paths
 
-- Config: `~/.local/share/solstone-linux/config/config.json`
+- Config: `~/.config/solstone-linux/config.json`
 - Captures: `~/.local/share/solstone-linux/captures/`
 - State: `~/.local/share/solstone-linux/state/`
-- Restore token: `~/.local/share/solstone-linux/config/restore_token`
+- Restore token: `~/.config/solstone-linux/restore_token`
 - Install source marker: `~/.config/solstone-linux/.install-source` (tracks which repo clone owns the pipx install)
 
 ## Key Patterns

{solstone_linux-0.3.2 → solstone_linux-0.4.0}/CHANGELOG.md

@@ -4,6 +4,19 @@ 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.0] - 2026-06-17
+
+### Added
+- a new `solstone-linux settings` command lets you adjust how this observer behaves after setup, from one place instead of hand-editing a config file. you can change how often it makes a segment, the framerate, whether it starts paused, the chat bridge, and how long it keeps local cache. setup itself stays prompt-free; your identity and pairing are left untouched.
+
+### Changed
+- this observer's settings now live under `~/.config/solstone-linux/`, where linux tools expect config to be. if you're upgrading, the move happens on its own the first time you run, with nothing to redo: no re-setup, no re-pairing. your segments stay exactly where they are.
+
+## [0.3.3] - 2026-06-16
+
+### Fixed
+- the tray status submenu now refreshes its values every time you open it. the segment countdown, cache size, captures today, uptime, and sync line had been showing stale values on reopen on some desktops; they now reflect the current state each time you open the menu.
+
 ## [0.3.2] - 2026-06-16
 
 ### Changed

{solstone_linux-0.3.2 → solstone_linux-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solstone-linux
-Version: 0.3.2
+Version: 0.4.0
 Summary: Standalone Linux desktop observer for solstone
 License-Expression: AGPL-3.0-only
 License-File: LICENSE

{solstone_linux-0.3.2 → solstone_linux-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "solstone-linux"
-version = "0.3.2"
+version = "0.4.0"
 description = "Standalone Linux desktop observer for solstone"
 readme = "README.md"
 license = "AGPL-3.0-only"

{solstone_linux-0.3.2 → solstone_linux-0.4.0}/src/solstone_linux/__init__.py

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

{solstone_linux-0.3.2 → solstone_linux-0.4.0}/src/solstone_linux/cli.py

@@ -6,6 +6,7 @@
 Subcommands:
     run             Start capture loop + sync service (default)
     setup           Interactive configuration
+    settings        Edit capture/behavior settings
     install-service Write systemd user unit, enable, start
     status          Show capture and sync state
 """
@@ -39,6 +40,63 @@ def _setup_logging(verbose: bool = False) -> None:
     )
 
 
+def _prompt_bool(label: str, current: bool) -> bool:
+    while True:
+        value = input(f"{label} [{'y' if current else 'n'}]: ").strip().lower()
+        if value == "":
+            return current
+        if value in ("y", "yes"):
+            return True
+        if value in ("n", "no"):
+            return False
+        print("Enter y or n.")
+
+
+def _prompt_positive_int(label: str, current: int) -> int:
+    while True:
+        value = input(f"{label} [{current}]: ").strip()
+        if value == "":
+            return current
+        try:
+            parsed = int(value)
+        except ValueError:
+            print("Enter a positive integer.")
+            continue
+        if parsed > 0:
+            return parsed
+        print("Enter a positive integer.")
+
+
+def _prompt_framerate(current: int) -> int:
+    while True:
+        value = input(f"Capture framerate [{current}]: ").strip()
+        if value == "":
+            return current
+        try:
+            parsed = int(value)
+        except ValueError:
+            print("Enter an integer.")
+            continue
+        clamped = max(1, min(parsed, 10))
+        if clamped != parsed:
+            print(f"(clamped to {clamped})")
+        return clamped
+
+
+def _prompt_retention(current: int) -> int:
+    while True:
+        value = input(
+            "Cache retention days (-1 = keep forever, 0 = delete after sync, "
+            f"N = keep N days) [{current}]: "
+        ).strip()
+        if value == "":
+            return current
+        try:
+            return int(value)
+        except ValueError:
+            print("Enter an integer.")
+
+
 def cmd_run(args: argparse.Namespace) -> int:
     """Start the capture loop + sync service."""
     from .observer import async_run
@@ -199,6 +257,23 @@ def _cmd_setup_interactive() -> int:
     return 0
 
 
+def cmd_settings(args: argparse.Namespace) -> int:
+    config = load_config()
+    config.capture_framerate = _prompt_framerate(config.capture_framerate)
+    config.draw_cursor = _prompt_bool("Draw cursor", config.draw_cursor)
+    config.start_paused = _prompt_bool("Start paused", config.start_paused)
+    config.segment_interval = _prompt_positive_int(
+        "Segment interval seconds", config.segment_interval
+    )
+    config.chat_bridge_enabled = _prompt_bool(
+        "Chat bridge enabled", config.chat_bridge_enabled
+    )
+    config.cache_retention_days = _prompt_retention(config.cache_retention_days)
+    save_config(config)
+    print(f"\nSettings saved to {config.config_path}")
+    return 0
+
+
 def cmd_doctor(args: argparse.Namespace) -> int:
     return doctor.run_doctor()
 
@@ -440,6 +515,9 @@ def main() -> None:
         help="Verify install prerequisites",
     )
 
+    # settings
+    subparsers.add_parser("settings", help="Edit capture/behavior settings")
+
     # install-service
     subparsers.add_parser("install-service", help="Install systemd user service")
 
@@ -456,6 +534,7 @@ def main() -> None:
         "run": cmd_run,
         "setup": cmd_setup,
         "doctor": cmd_doctor,
+        "settings": cmd_settings,
         "install-service": cmd_install_service,
         "status": cmd_status,
     }

{solstone_linux-0.3.2 → solstone_linux-0.4.0}/src/solstone_linux/config.py

@@ -3,9 +3,9 @@
 
 """Configuration loading and persistence for solstone-linux.
 
-Config lives at ~/.local/share/solstone-linux/config/config.json.
+Config lives at ~/.config/solstone-linux/config.json.
 Captures go to ~/.local/share/solstone-linux/captures/.
-Screencast restore token at ~/.local/share/solstone-linux/config/restore_token.
+Screencast restore token at ~/.config/solstone-linux/restore_token.
 """
 
 from __future__ import annotations
@@ -13,6 +13,7 @@ from __future__ import annotations
 import json
 import logging
 import os
+import shutil
 import stat
 from dataclasses import dataclass, field
 from pathlib import Path
@@ -27,6 +28,15 @@ DEFAULT_SYNC_MAX_RETRIES = 10
 DEFAULT_SYNC_STALE_THRESHOLD = 600
 
 
+def _default_config_dir() -> Path:
+    xdg = os.environ.get("XDG_CONFIG_HOME")
+    if xdg:
+        base = Path(xdg)
+        if base.is_absolute():
+            return base / "solstone-linux"
+    return Path.home() / ".config" / "solstone-linux"
+
+
 @dataclass
 class Config:
     """Configuration for the Linux desktop observer."""
@@ -46,15 +56,12 @@ class Config:
     draw_cursor: bool = True
     start_paused: bool = False
     base_dir: Path = DEFAULT_BASE_DIR
+    config_dir: Path = field(default_factory=_default_config_dir)
 
     @property
     def captures_dir(self) -> Path:
         return self.base_dir / "captures"
 
-    @property
-    def config_dir(self) -> Path:
-        return self.base_dir / "config"
-
     @property
     def state_dir(self) -> Path:
         return self.base_dir / "state"
@@ -74,11 +81,45 @@ class Config:
         self.state_dir.mkdir(parents=True, exist_ok=True)
 
 
-def load_config(base_dir: Path | None = None) -> Config:
+def _migrate_legacy_config(config: Config) -> None:
+    old_dir = config.base_dir / "config"
+    if config.config_dir == old_dir:
+        return
+    if config.config_path.exists():
+        return
+    old_config = old_dir / "config.json"
+    if not old_config.exists():
+        return
+    try:
+        config.config_dir.mkdir(parents=True, exist_ok=True)
+        shutil.copy2(old_config, config.config_path)
+        os.chmod(config.config_path, stat.S_IRUSR | stat.S_IWUSR)
+        old_token = old_dir / "restore_token"
+        if old_token.exists():
+            shutil.copy2(old_token, config.restore_token_path)
+        logger.info(f"Migrated config to {config.config_dir}")
+    except OSError as e:
+        logger.warning(f"Config migration failed: {e}")
+        return
+    for p in (old_config, old_dir / "restore_token"):
+        try:
+            p.unlink()
+        except OSError:
+            pass
+    try:
+        old_dir.rmdir()
+    except OSError:
+        pass
+
+
+def load_config(base_dir: Path | None = None, config_dir: Path | None = None) -> Config:
     """Load config from disk, returning defaults if not found."""
     config = Config()
     if base_dir:
         config.base_dir = base_dir
+    if config_dir:
+        config.config_dir = config_dir
+    _migrate_legacy_config(config)
 
     config_path = config.config_path
     if not config_path.exists():

{solstone_linux-0.3.2 → solstone_linux-0.4.0}/src/solstone_linux/dbusmenu.py

@@ -86,6 +86,8 @@ class DBusMenu(ServiceInterface):
 
     def __init__(self):
         super().__init__("com.canonical.dbusmenu")
+        self.on_about_to_show = None
+        self._props_emitted = 0
         self._revision = 1
         self._root = MenuItem()  # id 0 is root
         self._root.id = 0
@@ -106,6 +108,7 @@ class DBusMenu(ServiceInterface):
             return
 
         updated = {name: self._property_variant(item, name) for name in names}
+        self._props_emitted += 1
         self.ItemsPropertiesUpdated([[item.id, updated]], [])
 
     def _register_items(self, items: list[MenuItem]):
@@ -198,11 +201,16 @@ class DBusMenu(ServiceInterface):
 
     @method()
     def AboutToShow(self, item_id: "i") -> "b":
-        return False  # GetLayout always returns fresh state; no pending unsignaled changes.
+        if self.on_about_to_show is None:
+            return False
+        return bool(self.on_about_to_show())
 
     @method()
     def AboutToShowGroup(self, ids: "ai") -> "aiai":
-        return [[], []]  # no updates, no errors
+        if self.on_about_to_show is None:
+            return [[], []]
+        changed = bool(self.on_about_to_show())
+        return [list(ids), []] if changed else [[], []]
 
     # ── D-Bus Properties ──
 

{solstone_linux-0.3.2 → solstone_linux-0.4.0}/src/solstone_linux/tray.py

@@ -160,9 +160,10 @@ class TrayApp:
 
         return True
 
-    def update(self):
+    def update(self, force_stats=False):
         """Read observer state and update tray display."""
         obs = self._observer
+        now = time.monotonic()
 
         # Determine status
         if obs._paused:
@@ -178,18 +179,17 @@ class TrayApp:
         if obs._paused or obs.segment_dir is None:
             segment_timer = 0
         else:
-            remaining = obs.interval - (time.monotonic() - obs.start_at_mono)
+            remaining = obs.interval - (now - obs.start_at_mono)
             segment_timer = max(0, int(remaining))
 
         # Pause remaining
         if not obs._paused or obs._pause_until <= 0:
             pause_remaining = 0
         else:
-            pause_remaining = max(0, int(obs._pause_until - time.monotonic()))
+            pause_remaining = max(0, int(obs._pause_until - now))
 
         # Compute stats (throttled — filesystem walk every 60s)
-        now = time.monotonic()
-        if now - self._last_stats_time >= 60:
+        if force_stats or now - self._last_stats_time >= 60:
             self._last_stats_time = now
             captures_today = 0
             total_size = 0
@@ -220,7 +220,7 @@ class TrayApp:
                 pass
 
             total_size_mb = int(total_size / (1024 * 1024))
-            uptime_seconds = int(time.monotonic() - obs._start_mono)
+            uptime_seconds = int(now - obs._start_mono)
 
             self.stats = {
                 "captures_today": captures_today,
@@ -234,6 +234,19 @@ class TrayApp:
         self._update_live_stats(segment_timer, pause_remaining)
         self.paused_remaining = pause_remaining
 
+    def _on_about_to_show(self) -> bool:
+        """Full recompute on menu open; returns True if any item changed.
+
+        Runs outside _refresh_tray so a failure here never tears down the tray.
+        """
+        before = self.menu._props_emitted
+        try:
+            self.update(force_stats=True)
+        except Exception:
+            log.warning("Tray on-open recompute failed", exc_info=True)
+            return False
+        return self.menu._props_emitted > before
+
     def _build_menu(self):
         """Build the full tray menu structure."""
 
@@ -361,6 +374,7 @@ class TrayApp:
                 service_hint,
             ]
         )
+        self.menu.on_about_to_show = self._on_about_to_show
 
     def _icon_for_health(self, status: str, health: SyncHealth) -> str:
         if self.error:
@@ -420,6 +434,7 @@ class TrayApp:
         self._status_header.label = label
         self._status_item.label = label
         self.menu.update_properties(self._status_header, "label")
+        self.menu.update_properties(self._status_item, "label")
 
     def _update_sync(self, health: SyncHealth):
         """Update sync status display."""
@@ -427,6 +442,7 @@ class TrayApp:
             return
         self.health = health
         self._sync_item.label = health.sync_line
+        self.menu.update_properties(self._sync_item, "label")
 
         if not self.error:
             self.sni.set_icon(self._icon_for_health(self.status, health))
@@ -446,6 +462,7 @@ class TrayApp:
         new_label = f"segment: {mins}:{secs:02d} remaining"
         if self._segment_item.label != new_label:
             self._segment_item.label = new_label
+            self.menu.update_properties(self._segment_item, "label")
 
         # Stats (computed in update())
         if self.stats:
@@ -462,10 +479,13 @@ class TrayApp:
 
             if self._cache_item.label != new_cache:
                 self._cache_item.label = new_cache
+                self.menu.update_properties(self._cache_item, "label")
             if self._captures_item.label != new_captures:
                 self._captures_item.label = new_captures
+                self.menu.update_properties(self._captures_item, "label")
             if self._uptime_item.label != new_uptime:
                 self._uptime_item.label = new_uptime
+                self.menu.update_properties(self._uptime_item, "label")
 
         # Update pause remaining in resume button
         if self.status == "paused" and pause_remaining > 0:
@@ -473,6 +493,7 @@ class TrayApp:
             new_resume = f"resume ({pr_mins}m remaining)"
             if self._resume_item.label != new_resume:
                 self._resume_item.label = new_resume
+                self.menu.update_properties(self._resume_item, "label")
 
     def _build_tooltip(self, health: SyncHealth | None = None) -> str:
         """Build plain-text tooltip body (cross-DE compatible)."""

solstone_linux-0.4.0/tests/conftest.py

@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: AGPL-3.0-only
+# Copyright (c) 2026 sol pbc
+
+import pytest
+
+
+@pytest.fixture(autouse=True)
+def _isolate_xdg_config(tmp_path, monkeypatch):
+    monkeypatch.setenv("XDG_CONFIG_HOME", str(tmp_path / "xdg-config-home"))
+    yield

{solstone_linux-0.3.2 → solstone_linux-0.4.0}/tests/test_cli.py

@@ -12,6 +12,7 @@ from solstone_linux.cli import (
     _cmd_setup_interactive,
     cmd_install_service,
     cmd_setup,
+    cmd_settings,
     cmd_status,
 )
 from solstone_linux.config import Config, DEFAULT_SERVER_URL
@@ -22,6 +23,28 @@ def _args() -> argparse.Namespace:
     return argparse.Namespace()
 
 
+def _settings_config(tmp_path: Path) -> Config:
+    return Config(
+        base_dir=tmp_path,
+        config_dir=tmp_path / "config",
+        server_url="https://id",
+        key="KKKK",
+        stream="strm",
+        capture_framerate=2,
+    )
+
+
+def _run_settings(tmp_path: Path, inputs: list[str]) -> Config:
+    config = _settings_config(tmp_path)
+
+    with patch("solstone_linux.cli.load_config", return_value=config):
+        with patch("solstone_linux.cli.save_config") as save_mock:
+            with patch("builtins.input", side_effect=inputs):
+                assert cmd_settings(_args()) == 0
+
+    return save_mock.call_args.args[0]
+
+
 _BINARY = "/home/user/.local/pipx/venvs/solstone-linux/bin/solstone-linux"
 _EXPECTED_SVGS = {
     "solstone-error.svg",
@@ -41,6 +64,56 @@ def _is_dir_without_icons(self: Path) -> bool:
     return _REAL_IS_DIR(self)
 
 
+def test_cmd_settings_enter_keeps_all(tmp_path: Path):
+    saved_config = _run_settings(tmp_path, ["", "", "", "", "", ""])
+
+    assert saved_config.capture_framerate == 2
+    assert saved_config.draw_cursor is True
+    assert saved_config.start_paused is False
+    assert saved_config.segment_interval == 300
+    assert saved_config.chat_bridge_enabled is True
+    assert saved_config.cache_retention_days == 7
+    assert saved_config.server_url == "https://id"
+    assert saved_config.key == "KKKK"
+    assert saved_config.stream == "strm"
+
+
+def test_cmd_settings_changes_framerate(tmp_path: Path):
+    saved_config = _run_settings(tmp_path, ["5", "", "", "", "", ""])
+
+    assert saved_config.capture_framerate == 5
+    assert saved_config.server_url == "https://id"
+    assert saved_config.key == "KKKK"
+    assert saved_config.stream == "strm"
+
+
+def test_cmd_settings_framerate_clamped(tmp_path: Path):
+    saved_config = _run_settings(tmp_path, ["99", "", "", "", "", ""])
+
+    assert saved_config.capture_framerate == 10
+
+
+def test_cmd_settings_framerate_reprompts_on_invalid(tmp_path: Path):
+    saved_config = _run_settings(tmp_path, ["abc", "3", "", "", "", "", ""])
+
+    assert saved_config.capture_framerate == 3
+
+
+def test_cmd_settings_toggles_bool(tmp_path: Path):
+    saved_config = _run_settings(tmp_path, ["", "n", "", "", "", ""])
+
+    assert saved_config.draw_cursor is False
+    assert saved_config.server_url == "https://id"
+    assert saved_config.key == "KKKK"
+    assert saved_config.stream == "strm"
+
+
+def test_cmd_settings_retention_semantics(tmp_path: Path):
+    saved_config = _run_settings(tmp_path, ["", "", "", "", "", "-1"])
+
+    assert saved_config.cache_retention_days == -1
+
+
 def test_cmd_status_prints_sync_health(tmp_path: Path, monkeypatch, capsys):
     config = Config(
         base_dir=tmp_path,