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

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

@@ -4,6 +4,14 @@ 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.3.2] - 2026-06-16
+
+### Changed
+- the tray status now tells the truth about sync. it shows "connected" only when this observer has genuinely reached your journal with nothing left to send, and clearly says when it's offline, needs updating, or needs to re-authorize, instead of looking fine while quietly falling behind. the same honest status carries across the tray, `status`, and `doctor`.
+
+### Fixed
+- setup no longer asks for a journal url under any path. if you ran into a lingering "journal url" prompt during setup, that's gone — setup connects to your local journal automatically, and `solstone-linux setup --server-url <url>` still points at a journal you reach directly.
+
 ## [0.3.1] - 2026-06-15
 
 ### Changed

{solstone_linux-0.3.1 → solstone_linux-0.3.2}/INSTALL.md

@@ -4,7 +4,7 @@ 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 prompts for your journal URL and auto-registers). if the observer machine can't reach your solstone host, mint a key from there first with `sol observer create <name>` and paste it during setup. 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 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.
 
 ## before you begin
 
@@ -14,7 +14,7 @@ check if solstone-linux is already installed and running:
 
 ```
 systemctl --user status solstone-linux
-sol remote list
+journal observer list
 ```
 
 if it's already active and connected, you're done.
@@ -24,12 +24,12 @@ if it's already active and connected, you're done.
 - **system dependencies.** the observer needs PyGObject, GStreamer, and PipeWire bindings from system packages. installing these requires sudo.
 - **stream name.** this identifies this observer's stream. the machine's hostname is the typical choice.
 
-### remote sol
+### journal reached directly (not over the local link)
 
-The observer connects to your solstone journal over HTTPS — colocation is optional. For remote-sol setups:
+By default the observer registers over the local `http://localhost:5015` link, so the journal and observer are colocated. If you reach your journal directly over HTTPS instead:
 
 - clone anywhere; the `$(sol root)/observers` path in step 2 only applies when sol is installed locally.
-- `solstone-linux setup` will prompt for the journal URL (since local `sol remote list` isn't available) and auto-register the observer with your journal via HTTP, persisting the returned key. No manual key handoff is needed if the journal's observer-registration endpoint is reachable.
+- run `solstone-linux setup --server-url <journal-url>` to point at that journal and auto-register the observer over HTTP, persisting the returned key. No manual key handoff is needed if the journal's observer-registration endpoint is reachable.
 - otherwise, the install sequence below is the same.
 
 ## install sequence
@@ -66,7 +66,7 @@ this is the developer/from-source path; most installs should use the `pipx insta
 
    `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.
 
-2. cloning into `$(sol root)/observers` is only a developer convenience for keeping observer checkouts colocated with a local solstone clone. for remote-sol setups, clone anywhere — the observer runs independently of your journal at runtime:
+2. cloning into `$(sol root)/observers` is only a developer convenience for keeping observer checkouts colocated with a local solstone clone. for a journal you reach directly, clone anywhere — the observer runs independently of your journal at runtime:
    ```
    cd "$(sol root)/observers"
    git clone https://github.com/solpbc/solstone-linux.git
@@ -75,11 +75,11 @@ this is the developer/from-source path; most installs should use the `pipx insta
    ```
    `make install-service` is a smart install-or-upgrade: detects fresh-install vs upgrade via a marker file, runs CI in upgrade mode, guards against cross-repo contamination.
 
-3. run the interactive setup:
+3. run setup:
    ```
    solstone-linux setup
    ```
-   this prompts for the journal URL and registers the observer with your journal.
+   this registers the observer against your journal over the local `http://localhost:5015` link — no URL to type. pass `--server-url <journal-url>` for a journal you reach directly.
 
 4. verify the service is running:
    ```

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solstone-linux
-Version: 0.3.1
+Version: 0.3.2
 Summary: Standalone Linux desktop observer for solstone
 License-Expression: AGPL-3.0-only
 License-File: LICENSE
@@ -53,7 +53,7 @@ solstone-linux install-service
 solstone-linux setup
 ```
 
-`setup` prompts for your journal URL and registers the observer for you. If this machine can't reach your solstone host directly, mint a key from there with `sol observer create <name>` and paste it during setup.
+`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
 

{solstone_linux-0.3.1 → solstone_linux-0.3.2}/README.md

@@ -38,7 +38,7 @@ solstone-linux install-service
 solstone-linux setup
 ```
 
-`setup` prompts for your journal URL and registers the observer for you. If this machine can't reach your solstone host directly, mint a key from there with `sol observer create <name>` and paste it during setup.
+`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
 

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

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

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

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

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

@@ -15,18 +15,19 @@ from __future__ import annotations
 import argparse
 import asyncio
 import importlib.resources
-import json
 import logging
 import os
 import shutil
 import socket
 import subprocess
 import sys
+import time
 from pathlib import Path
 
 from . import 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
 
 
 def _setup_logging(verbose: bool = False) -> None:
@@ -93,11 +94,12 @@ def cmd_setup(args: argparse.Namespace) -> int:
 
     config = load_config()
 
-    server_url = getattr(args, "server_url", None) or config.server_url
-    if not server_url and not non_interactive:
-        url = input(f"Solstone journal URL [{DEFAULT_SERVER_URL}]: ").strip()
-        server_url = url or DEFAULT_SERVER_URL
-    server_url = server_url or DEFAULT_SERVER_URL
+    # Resolve the journal URL: an explicit --server-url wins, then any saved
+    # URL, otherwise the local link default. Under pure-PL the journal is
+    # reached over the localhost link, so no URL needs to be typed.
+    server_url = (
+        getattr(args, "server_url", None) or config.server_url or DEFAULT_SERVER_URL
+    )
     config.server_url = server_url
 
     stream_override = getattr(args, "stream_name", None)
@@ -157,10 +159,11 @@ def _cmd_setup_interactive() -> int:
 
     config = load_config()
 
-    # Prompt for server URL
-    default_url = config.server_url or DEFAULT_SERVER_URL
-    url = input(f"Solstone journal URL [{default_url}]: ").strip()
-    config.server_url = url or default_url
+    # No prompt: default to the local link. Under pure-PL the journal is reached
+    # over the localhost link, so no URL needs to be typed; a saved URL (or
+    # `solstone-linux setup --server-url <url>`) points at a journal reached
+    # directly.
+    config.server_url = config.server_url or DEFAULT_SERVER_URL
 
     # Derive stream name
     if not config.stream:
@@ -375,15 +378,9 @@ def cmd_status(args: argparse.Namespace) -> int:
     else:
         print(f"Retain: {retention} day(s)")
 
-    # Synced days
-    synced_path = config.state_dir / "synced_days.json"
-    if synced_path.exists():
-        try:
-            with open(synced_path) as f:
-                synced = json.load(f)
-            print(f"Synced: {len(synced)} day(s) fully synced")
-        except (json.JSONDecodeError, OSError):
-            pass
+    facts = load_facts(config.state_dir)
+    health = derive_health(facts, time.time(), config.sync_stale_threshold)
+    print(health.cli)
 
     # Systemd status
     try:

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

@@ -24,6 +24,7 @@ DEFAULT_SERVER_URL = "http://localhost:5015"
 DEFAULT_SEGMENT_INTERVAL = 300
 DEFAULT_SYNC_RETRY_DELAYS = [5, 30, 120, 300]
 DEFAULT_SYNC_MAX_RETRIES = 10
+DEFAULT_SYNC_STALE_THRESHOLD = 600
 
 
 @dataclass
@@ -38,6 +39,7 @@ class Config:
         default_factory=lambda: list(DEFAULT_SYNC_RETRY_DELAYS)
     )
     sync_max_retries: int = DEFAULT_SYNC_MAX_RETRIES
+    sync_stale_threshold: int = DEFAULT_SYNC_STALE_THRESHOLD
     cache_retention_days: int = 7
     chat_bridge_enabled: bool = True
     capture_framerate: int = 1
@@ -97,6 +99,12 @@ def load_config(base_dir: Path | None = None) -> Config:
         config.sync_retry_delays = data["sync_retry_delays"]
     if "sync_max_retries" in data:
         config.sync_max_retries = data["sync_max_retries"]
+    try:
+        config.sync_stale_threshold = int(
+            data.get("sync_stale_threshold", DEFAULT_SYNC_STALE_THRESHOLD)
+        )
+    except (TypeError, ValueError):
+        config.sync_stale_threshold = DEFAULT_SYNC_STALE_THRESHOLD
     try:
         config.cache_retention_days = int(data.get("cache_retention_days", 7))
     except (TypeError, ValueError):
@@ -120,6 +128,7 @@ def save_config(config: Config) -> None:
         "segment_interval": config.segment_interval,
         "sync_retry_delays": config.sync_retry_delays,
         "sync_max_retries": config.sync_max_retries,
+        "sync_stale_threshold": config.sync_stale_threshold,
         "cache_retention_days": config.cache_retention_days,
         "chat_bridge_enabled": config.chat_bridge_enabled,
         "capture_framerate": config.capture_framerate,

{solstone_linux-0.3.1 → solstone_linux-0.3.2}/src/solstone_linux/dbus_service.py

@@ -38,13 +38,13 @@ class ObserverService(ServiceInterface):
     @dbus_property(access=PropertyAccess.READ)
     def SyncStatus(self) -> "s":
         if self._observer._sync:
-            return self._observer._sync.sync_status
-        return "synced"
+            return self._observer._sync.health.state.value
+        return "unknown"
 
     @dbus_property(access=PropertyAccess.READ)
     def SyncProgress(self) -> "s":
         if self._observer._sync:
-            return self._observer._sync.sync_progress
+            return self._observer._sync.progress
         return ""
 
     @dbus_property(access=PropertyAccess.READ)
@@ -122,17 +122,12 @@ class ObserverService(ServiceInterface):
         except OSError:
             pass
 
-        synced_days = 0
-        if self._observer._sync:
-            synced_days = len(self._observer._sync._synced_days)
-
         total_size_mb = int(total_size / (1024 * 1024))
         uptime_seconds = int(time.monotonic() - self._observer._start_mono)
 
         return {
             "captures_today": Variant("i", captures_today),
             "total_size_mb": Variant("i", total_size_mb),
-            "synced_days": Variant("i", synced_days),
             "uptime_seconds": Variant("i", uptime_seconds),
         }
 

{solstone_linux-0.3.1 → solstone_linux-0.3.2}/src/solstone_linux/doctor.py

@@ -13,8 +13,12 @@ import os
 import shutil
 import subprocess
 import sys
+import time
 from typing import Callable, NamedTuple
 
+from .config import load_config
+from .sync_health import derive_health, load_facts
+
 CheckResult = NamedTuple(
     "CheckResult",
     [("name", str), ("severity", str), ("detail", str)],
@@ -286,6 +290,13 @@ def check_appindicator_ext() -> CheckResult:
     )
 
 
+def check_sync_health() -> CheckResult:
+    config = load_config()
+    facts = load_facts(config.state_dir)
+    health = derive_health(facts, time.time(), config.sync_stale_threshold)
+    return CheckResult("sync health", health.doctor_severity, health.doctor_detail)
+
+
 def run_doctor() -> int:
     checks: list[tuple[str, Callable[[], CheckResult]]] = [
         ("python version", check_python_version),
@@ -297,6 +308,7 @@ def run_doctor() -> int:
         ("xdg-desktop-portal", lambda: asyncio.run(check_portal())),
         ("x11 capture", check_x11_capture),
         ("systemd --user", check_user_systemd),
+        ("sync health", check_sync_health),
         ("pipx", check_pipx),
         ("appindicator ext (soft)", check_appindicator_ext),
     ]