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

{solstone_linux-0.3.3 → solstone_linux-0.4.1}/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.3 → solstone_linux-0.4.1}/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.1] - 2026-06-17
+
+### Added
+- you can now check which version you're running. `solstone-linux --version` prints it, so when you're following along with the release notes or asking for help, you know exactly what you have.
+
+## [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

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

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

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

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

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

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

{solstone_linux-0.3.3 → solstone_linux-0.4.1}/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
 """
@@ -24,7 +25,7 @@ import sys
 import time
 from pathlib import Path
 
-from . import doctor, streams
+from . import __version__, doctor, streams
 from .config import DEFAULT_SERVER_URL, load_config, save_config
 from .streams import stream_name
 from .sync_health import derive_health, load_facts
@@ -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()
 
@@ -406,6 +481,9 @@ def main() -> None:
     parser.add_argument(
         "-v", "--verbose", action="store_true", help="Enable debug logging"
     )
+    parser.add_argument(
+        "--version", action="version", version=f"%(prog)s {__version__}"
+    )
     subparsers = parser.add_subparsers(dest="command")
 
     # run
@@ -440,6 +518,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 +537,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.3 → solstone_linux-0.4.1}/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.4.1/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.3 → solstone_linux-0.4.1}/tests/test_cli.py

@@ -3,15 +3,20 @@
 
 import argparse
 import os
+import sys
 from pathlib import Path
 from unittest.mock import MagicMock
 from unittest.mock import patch
 
+import pytest
+
+from solstone_linux import __version__
 from solstone_linux import cli as cli_module
 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 +27,39 @@ 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]
+
+
+def test_main_version_flag(monkeypatch, capsys):
+    monkeypatch.setattr(sys, "argv", ["solstone-linux", "--version"])
+
+    with pytest.raises(SystemExit) as excinfo:
+        cli_module.main()
+
+    assert excinfo.value.code == 0
+    out = capsys.readouterr().out
+    assert __version__ in out
+
+
 _BINARY = "/home/user/.local/pipx/venvs/solstone-linux/bin/solstone-linux"
 _EXPECTED_SVGS = {
     "solstone-error.svg",
@@ -41,6 +79,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,

solstone_linux-0.4.1/tests/test_config.py

@@ -0,0 +1,254 @@
+# SPDX-License-Identifier: AGPL-3.0-only
+# Copyright (c) 2026 sol pbc
+
+import json
+import logging
+import os
+import stat
+from pathlib import Path
+
+from solstone_linux.config import Config, load_config, save_config
+
+
+class TestConfig:
+    def test_defaults(self):
+        config = Config()
+        assert config.server_url == ""
+        assert config.key == ""
+        assert config.segment_interval == 300
+
+    def test_captures_dir(self):
+        config = Config()
+        assert config.captures_dir == config.base_dir / "captures"
+
+    def test_restore_token_path(self):
+        config = Config()
+        assert config.restore_token_path == config.config_dir / "restore_token"
+
+    def test_config_dir_uses_absolute_xdg(self, tmp_path: Path, monkeypatch):
+        monkeypatch.setenv("XDG_CONFIG_HOME", str(tmp_path))
+        config = Config()
+
+        assert config.config_dir == tmp_path / "solstone-linux"
+        assert config.config_path == tmp_path / "solstone-linux" / "config.json"
+        assert (
+            config.restore_token_path == tmp_path / "solstone-linux" / "restore_token"
+        )
+
+    def test_config_dir_ignores_relative_xdg(self, monkeypatch):
+        monkeypatch.setenv("XDG_CONFIG_HOME", "relative/path")
+
+        assert Config().config_dir == Path.home() / ".config" / "solstone-linux"
+
+    def test_config_dir_falls_back_when_xdg_unset(self, monkeypatch):
+        monkeypatch.delenv("XDG_CONFIG_HOME", raising=False)
+
+        assert Config().config_dir == Path.home() / ".config" / "solstone-linux"
+
+    def test_round_trip(self, tmp_path: Path):
+        config = Config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        config.server_url = "https://example.com"
+        config.key = "test-key-123"
+        config.stream = "archon"
+        config.segment_interval = 600
+
+        save_config(config)
+
+        loaded = load_config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        assert loaded.server_url == "https://example.com"
+        assert loaded.key == "test-key-123"
+        assert loaded.stream == "archon"
+        assert loaded.segment_interval == 600
+
+    def test_load_missing(self, tmp_path: Path):
+        config = load_config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        assert config.server_url == ""
+        assert config.key == ""
+
+    def test_load_corrupt(self, tmp_path: Path):
+        config_dir = tmp_path / "config"
+        config_dir.mkdir(parents=True)
+        (config_dir / "config.json").write_text("not json!")
+
+        config = load_config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        assert config.server_url == ""
+
+    def test_permissions(self, tmp_path: Path):
+        config = Config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        config.server_url = "https://example.com"
+        config.key = "secret"
+        save_config(config)
+
+        mode = config.config_path.stat().st_mode & 0o777
+        assert mode == 0o600
+
+    def test_sync_config_roundtrip(self, tmp_path: Path):
+        config = Config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        config.sync_retry_delays = [10, 60, 300]
+        config.sync_max_retries = 5
+        save_config(config)
+
+        loaded = load_config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        assert loaded.sync_retry_delays == [10, 60, 300]
+        assert loaded.sync_max_retries == 5
+
+    def test_cache_retention_days_roundtrip(self, tmp_path: Path):
+        config = Config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        config.cache_retention_days = 14
+        save_config(config)
+
+        loaded = load_config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        assert loaded.cache_retention_days == 14
+
+    def test_cache_retention_days_default(self, tmp_path: Path):
+        """Existing configs without cache_retention_days default to 7."""
+        config_dir = tmp_path / "config"
+        config_dir.mkdir(parents=True)
+        (config_dir / "config.json").write_text('{"server_url": "http://test"}')
+
+        loaded = load_config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        assert loaded.cache_retention_days == 7
+
+    def test_capture_framerate_default(self):
+        config = Config()
+        assert config.capture_framerate == 1
+
+    def test_draw_cursor_default(self):
+        config = Config()
+        assert config.draw_cursor is True
+
+    def test_capture_framerate_roundtrip(self, tmp_path: Path):
+        config = Config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        config.capture_framerate = 2
+        save_config(config)
+
+        loaded = load_config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        assert loaded.capture_framerate == 2
+
+    def test_draw_cursor_roundtrip(self, tmp_path: Path):
+        config = Config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        config.draw_cursor = False
+        save_config(config)
+
+        loaded = load_config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        assert loaded.draw_cursor is False
+
+    def test_capture_framerate_defaults_on_old_config(self, tmp_path: Path):
+        """Existing configs without capture_framerate default to 1."""
+        config_dir = tmp_path / "config"
+        config_dir.mkdir(parents=True)
+        (config_dir / "config.json").write_text('{"server_url": "http://test"}')
+
+        loaded = load_config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        assert loaded.capture_framerate == 1
+        assert loaded.draw_cursor is True
+
+    def test_capture_framerate_clamped_to_max(self, tmp_path: Path):
+        config_dir = tmp_path / "config"
+        config_dir.mkdir(parents=True)
+        (config_dir / "config.json").write_text('{"capture_framerate": 999}')
+
+        loaded = load_config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        assert loaded.capture_framerate == 10
+
+    def test_capture_framerate_clamped_to_min(self, tmp_path: Path):
+        config_dir = tmp_path / "config"
+        config_dir.mkdir(parents=True)
+        (config_dir / "config.json").write_text('{"capture_framerate": 0}')
+
+        loaded = load_config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        assert loaded.capture_framerate == 1
+
+    def test_start_paused_default(self):
+        config = Config()
+        assert config.start_paused is False
+
+    def test_start_paused_roundtrip(self, tmp_path: Path):
+        config = Config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        config.start_paused = True
+        save_config(config)
+
+        loaded = load_config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        assert loaded.start_paused is True
+
+    def test_start_paused_defaults_on_old_config(self, tmp_path: Path):
+        """Existing configs without start_paused default to False."""
+        config_dir = tmp_path / "config"
+        config_dir.mkdir(parents=True)
+        (config_dir / "config.json").write_text('{"server_url": "http://test"}')
+
+        loaded = load_config(base_dir=tmp_path, config_dir=tmp_path / "config")
+        assert loaded.start_paused is False
+
+    def test_migrates_legacy_config(self, tmp_path: Path, caplog):
+        old_dir = tmp_path / "config"
+        old_dir.mkdir()
+        old_config = old_dir / "config.json"
+        old_config.write_text(
+            json.dumps(
+                {
+                    "server_url": "https://example.com",
+                    "key": "test-key-123",
+                    "stream": "archon",
+                    "capture_framerate": 3,
+                }
+            )
+        )
+        os.chmod(old_config, stat.S_IRUSR | stat.S_IWUSR)
+        old_token = old_dir / "restore_token"
+        old_token.write_text("tok")
+        new_dir = tmp_path / "newcfg"
+
+        with caplog.at_level(logging.INFO):
+            loaded = load_config(base_dir=tmp_path, config_dir=new_dir)
+
+        new_config = new_dir / "config.json"
+        new_token = new_dir / "restore_token"
+        assert loaded.server_url == "https://example.com"
+        assert loaded.key == "test-key-123"
+        assert loaded.stream == "archon"
+        assert loaded.capture_framerate == 3
+        assert new_config.exists()
+        assert stat.S_IMODE(new_config.stat().st_mode) == 0o600
+        assert new_token.read_text() == "tok"
+        assert not old_config.exists()
+        assert not old_token.exists()
+        assert not old_dir.exists()
+        migration_records = [
+            record for record in caplog.records if "Migrated config" in record.message
+        ]
+        assert len(migration_records) == 1
+
+        snapshot = (
+            new_config.read_text(),
+            new_token.read_text(),
+            stat.S_IMODE(new_config.stat().st_mode),
+        )
+        caplog.clear()
+
+        with caplog.at_level(logging.INFO):
+            loaded_again = load_config(base_dir=tmp_path, config_dir=new_dir)
+
+        assert loaded_again.capture_framerate == 3
+        assert [
+            record for record in caplog.records if "Migrated config" in record.message
+        ] == []
+        assert (
+            new_config.read_text(),
+            new_token.read_text(),
+            stat.S_IMODE(new_config.stat().st_mode),
+        ) == snapshot
+
+    def test_no_migration_when_config_dir_is_legacy(self, tmp_path: Path):
+        config_dir = tmp_path / "config"
+        config_dir.mkdir()
+        config_path = config_dir / "config.json"
+        content = '{"server_url": "http://test", "capture_framerate": 4}'
+        config_path.write_text(content)
+
+        loaded = load_config(base_dir=tmp_path, config_dir=config_dir)
+
+        assert loaded.server_url == "http://test"
+        assert loaded.capture_framerate == 4
+        assert config_path.exists()
+        assert config_path.read_text() == content

{solstone_linux-0.3.3 → solstone_linux-0.4.1}/tests/test_observer.py

@@ -39,8 +39,8 @@ class TestSegmentDirStructure:
 
     def test_restore_token_path(self, tmp_path: Path):
         config = Config(base_dir=tmp_path)
+        assert config.restore_token_path == config.config_dir / "restore_token"
         assert str(config.restore_token_path).endswith("restore_token")
-        assert "config" in str(config.restore_token_path)
 
 
 class TestPauseResumeState:

{solstone_linux-0.3.3 → solstone_linux-0.4.1}/tests/test_tray.py

@@ -28,6 +28,7 @@ def _make_app(tmp_path=None):
     config = Config()
     if tmp_path:
         config.base_dir = tmp_path
+        config.config_dir = tmp_path / "config"
     config.server_url = "https://test.example.com"
     observer = MagicMock()
     observer.config = config

solstone_linux-0.3.3/tests/test_config.py

@@ -1,157 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-only
-# Copyright (c) 2026 sol pbc
-
-from pathlib import Path
-
-from solstone_linux.config import Config, load_config, save_config
-
-
-class TestConfig:
-    def test_defaults(self):
-        config = Config()
-        assert config.server_url == ""
-        assert config.key == ""
-        assert config.segment_interval == 300
-
-    def test_captures_dir(self):
-        config = Config()
-        assert config.captures_dir == config.base_dir / "captures"
-
-    def test_restore_token_path(self):
-        config = Config()
-        assert config.restore_token_path == config.base_dir / "config" / "restore_token"
-
-    def test_round_trip(self, tmp_path: Path):
-        config = Config(base_dir=tmp_path)
-        config.server_url = "https://example.com"
-        config.key = "test-key-123"
-        config.stream = "archon"
-        config.segment_interval = 600
-
-        save_config(config)
-
-        loaded = load_config(tmp_path)
-        assert loaded.server_url == "https://example.com"
-        assert loaded.key == "test-key-123"
-        assert loaded.stream == "archon"
-        assert loaded.segment_interval == 600
-
-    def test_load_missing(self, tmp_path: Path):
-        config = load_config(tmp_path)
-        assert config.server_url == ""
-        assert config.key == ""
-
-    def test_load_corrupt(self, tmp_path: Path):
-        config_dir = tmp_path / "config"
-        config_dir.mkdir(parents=True)
-        (config_dir / "config.json").write_text("not json!")
-
-        config = load_config(tmp_path)
-        assert config.server_url == ""
-
-    def test_permissions(self, tmp_path: Path):
-        config = Config(base_dir=tmp_path)
-        config.server_url = "https://example.com"
-        config.key = "secret"
-        save_config(config)
-
-        mode = config.config_path.stat().st_mode & 0o777
-        assert mode == 0o600
-
-    def test_sync_config_roundtrip(self, tmp_path: Path):
-        config = Config(base_dir=tmp_path)
-        config.sync_retry_delays = [10, 60, 300]
-        config.sync_max_retries = 5
-        save_config(config)
-
-        loaded = load_config(tmp_path)
-        assert loaded.sync_retry_delays == [10, 60, 300]
-        assert loaded.sync_max_retries == 5
-
-    def test_cache_retention_days_roundtrip(self, tmp_path: Path):
-        config = Config(base_dir=tmp_path)
-        config.cache_retention_days = 14
-        save_config(config)
-
-        loaded = load_config(tmp_path)
-        assert loaded.cache_retention_days == 14
-
-    def test_cache_retention_days_default(self, tmp_path: Path):
-        """Existing configs without cache_retention_days default to 7."""
-        config_dir = tmp_path / "config"
-        config_dir.mkdir(parents=True)
-        (config_dir / "config.json").write_text('{"server_url": "http://test"}')
-
-        loaded = load_config(tmp_path)
-        assert loaded.cache_retention_days == 7
-
-    def test_capture_framerate_default(self):
-        config = Config()
-        assert config.capture_framerate == 1
-
-    def test_draw_cursor_default(self):
-        config = Config()
-        assert config.draw_cursor is True
-
-    def test_capture_framerate_roundtrip(self, tmp_path: Path):
-        config = Config(base_dir=tmp_path)
-        config.capture_framerate = 2
-        save_config(config)
-
-        loaded = load_config(tmp_path)
-        assert loaded.capture_framerate == 2
-
-    def test_draw_cursor_roundtrip(self, tmp_path: Path):
-        config = Config(base_dir=tmp_path)
-        config.draw_cursor = False
-        save_config(config)
-
-        loaded = load_config(tmp_path)
-        assert loaded.draw_cursor is False
-
-    def test_capture_framerate_defaults_on_old_config(self, tmp_path: Path):
-        """Existing configs without capture_framerate default to 1."""
-        config_dir = tmp_path / "config"
-        config_dir.mkdir(parents=True)
-        (config_dir / "config.json").write_text('{"server_url": "http://test"}')
-
-        loaded = load_config(tmp_path)
-        assert loaded.capture_framerate == 1
-        assert loaded.draw_cursor is True
-
-    def test_capture_framerate_clamped_to_max(self, tmp_path: Path):
-        config_dir = tmp_path / "config"
-        config_dir.mkdir(parents=True)
-        (config_dir / "config.json").write_text('{"capture_framerate": 999}')
-
-        loaded = load_config(tmp_path)
-        assert loaded.capture_framerate == 10
-
-    def test_capture_framerate_clamped_to_min(self, tmp_path: Path):
-        config_dir = tmp_path / "config"
-        config_dir.mkdir(parents=True)
-        (config_dir / "config.json").write_text('{"capture_framerate": 0}')
-
-        loaded = load_config(tmp_path)
-        assert loaded.capture_framerate == 1
-
-    def test_start_paused_default(self):
-        config = Config()
-        assert config.start_paused is False
-
-    def test_start_paused_roundtrip(self, tmp_path: Path):
-        config = Config(base_dir=tmp_path)
-        config.start_paused = True
-        save_config(config)
-
-        loaded = load_config(tmp_path)
-        assert loaded.start_paused is True
-
-    def test_start_paused_defaults_on_old_config(self, tmp_path: Path):
-        """Existing configs without start_paused default to False."""
-        config_dir = tmp_path / "config"
-        config_dir.mkdir(parents=True)
-        (config_dir / "config.json").write_text('{"server_url": "http://test"}')
-
-        loaded = load_config(tmp_path)
-        assert loaded.start_paused is False