synodic-client 0.0.1.dev28__tar.gz → 0.0.1.dev30__tar.gz

{synodic_client-0.0.1.dev28 → synodic_client-0.0.1.dev30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: synodic_client
-Version: 0.0.1.dev28
+Version: 0.0.1.dev30
 Author-Email: Synodic Software <contact@synodic.software>
 License: LGPL-3.0-or-later
 Project-URL: homepage, https://github.com/synodic/synodic-client
@@ -8,9 +8,9 @@ Project-URL: repository, https://github.com/synodic/synodic-client
 Requires-Python: <3.15,>=3.14
 Requires-Dist: pyside6>=6.10.2
 Requires-Dist: packaging>=26.0
-Requires-Dist: porringer>=0.2.1.dev48
+Requires-Dist: porringer>=0.2.1.dev49
 Requires-Dist: qasync>=0.28.0
-Requires-Dist: velopack>=0.0.1369.dev7516
+Requires-Dist: velopack>=0.0.1442.dev64255
 Requires-Dist: typer>=0.24.1
 Description-Content-Type: text/markdown
 

{synodic_client-0.0.1.dev28 → synodic_client-0.0.1.dev30}/pyproject.toml

@@ -10,12 +10,12 @@ requires-python = ">=3.14, <3.15"
 dependencies = [
     "pyside6>=6.10.2",
     "packaging>=26.0",
-    "porringer>=0.2.1.dev48",
+    "porringer>=0.2.1.dev49",
     "qasync>=0.28.0",
-    "velopack>=0.0.1369.dev7516",
+    "velopack>=0.0.1442.dev64255",
     "typer>=0.24.1",
 ]
-version = "0.0.1.dev28"
+version = "0.0.1.dev30"
 
 [project.license]
 text = "LGPL-3.0-or-later"

synodic_client-0.0.1.dev30/synodic_client/_version.py

@@ -0,0 +1 @@
+__version__ = '0.0.1.dev30'

{synodic_client-0.0.1.dev28 → synodic_client-0.0.1.dev30}/synodic_client/application/qt.py

@@ -44,11 +44,16 @@ def _init_services(logger: logging.Logger) -> tuple[Client, API, GlobalConfigura
     update_config = resolve_update_config(config)
     client.initialize_updater(update_config)
 
+    cached_dirs = porringer.cache.list_directories()
+
     logger.info(
-        'Synodic Client v%s started (channel: %s, source: %s)',
+        'Synodic Client v%s started (channel: %s, source: %s, '
+        'config_fields_set: %s, cached_projects: %d)',
         client.version,
         update_config.channel.name,
         update_config.repo_url,
+        sorted(config.model_fields_set),
+        len(cached_dirs),
     )
 
     return client, porringer, config

{synodic_client-0.0.1.dev28 → synodic_client-0.0.1.dev30}/synodic_client/application/screen/action_card.py

@@ -14,11 +14,13 @@ from __future__ import annotations
 import html as html_mod
 import logging
 
+from porringer.backend.command.core.action_builder import PHASE_ORDER
 from porringer.schema import SetupAction, SetupActionResult, SkipReason
 from porringer.schema.plugin import PluginKind
 from PySide6.QtCore import QRect, Qt, QTimer, Signal
 from PySide6.QtGui import QColor, QFont, QPainter, QPen, QTextCursor
 from PySide6.QtWidgets import (
+    QApplication,
     QCheckBox,
     QFrame,
     QHBoxLayout,
@@ -26,6 +28,7 @@ from PySide6.QtWidgets import (
     QScrollArea,
     QSizePolicy,
     QTextEdit,
+    QToolButton,
     QVBoxLayout,
     QWidget,
 )
@@ -53,6 +56,10 @@ from synodic_client.application.theme import (
     ACTION_CARD_STYLE,
     ACTION_CARD_TYPE_BADGE_STYLE,
     ACTION_CARD_VERSION_STYLE,
+    COPY_BTN_SIZE,
+    COPY_BTN_STYLE,
+    COPY_FEEDBACK_MS,
+    COPY_ICON,
     LOG_COLOR_ERROR,
     LOG_COLOR_PHASE,
     LOG_COLOR_STDERR,
@@ -74,19 +81,9 @@ _SPINNER_INTERVAL = 50
 _SPINNER_ARC = 90
 
 
-#: Sort priority for each :class:`PluginKind`.
-#: Lower numbers appear first.  Matches the execution phase order
-#: defined in ``porringer.backend.command.core.action_builder.PHASE_ORDER``
-#: so that cards are displayed in the same order they execute:
-#: runtime → package → tool → project → SCM.
-_KIND_ORDER: dict[PluginKind | None, int] = {
-    PluginKind.RUNTIME: 0,
-    PluginKind.PACKAGE: 1,
-    PluginKind.TOOL: 2,
-    PluginKind.PROJECT: 3,
-    PluginKind.SCM: 4,
-    None: 99,  # bare commands are excluded from ActionCardList anyway
-}
+#: Sort priority derived from porringer's execution phase order so the
+#: display order always matches the order actions actually execute.
+_KIND_ORDER: dict[PluginKind | None, int] = {kind: i for i, kind in enumerate(PHASE_ORDER)}
 
 
 def action_key(action: SetupAction) -> tuple[object, ...]:
@@ -102,17 +99,17 @@ def action_key(action: SetupAction) -> tuple[object, ...]:
     return (action.kind, action.installer, pkg_name, pt_name, cmd)
 
 
-def action_sort_key(action: SetupAction) -> tuple[int, str]:
-    """Return a sort key so cards are grouped by kind then alphabetical.
+def action_sort_key(action: SetupAction) -> int:
+    """Return a sort key that groups cards by execution phase.
 
-    The ordering matches the execution phase order
-    (runtime → package → tool → project → SCM) so that displayed
-    cards appear in the same sequence as they execute.  Within a
-    group, actions are sorted case-insensitively by package name.
+    The ordering is derived from :data:`porringer.backend.command.core.
+    action_builder.PHASE_ORDER` so that displayed cards appear in the
+    same sequence as they execute.  Within a phase group the original
+    order from porringer is preserved (Python sort is stable), which
+    respects dependency ordering (e.g. a tool must be installed before
+    its plugins).
     """
-    kind_order = _KIND_ORDER.get(action.kind, 50)
-    pkg_name = str(action.package.name).lower() if action.package else ''
-    return (kind_order, pkg_name)
+    return _KIND_ORDER.get(action.kind, len(PHASE_ORDER))
 
 
 def _format_command(action: SetupAction) -> str:
@@ -284,7 +281,13 @@ class ActionCard(QFrame):
         outer.setContentsMargins(6, 6, 6, 6)
         outer.setSpacing(2)
 
-        # --- Top row: type badge | package name ... version | status/spinner | prerelease ---
+        outer.addLayout(self._build_top_row())
+        outer.addWidget(self._build_description_row())
+        outer.addWidget(self._build_command_row())
+        outer.addWidget(self._build_log_output())
+
+    def _build_top_row(self) -> QHBoxLayout:
+        """Build the top row: type badge | package name ... version | status/spinner | prerelease."""
         top = QHBoxLayout()
         top.setSpacing(8)
 
@@ -317,24 +320,45 @@ class ActionCard(QFrame):
         self._prerelease_cb.hide()
         top.addWidget(self._prerelease_cb)
 
-        outer.addLayout(top)
+        return top
 
-        # --- Description row ---
+    def _build_description_row(self) -> QLabel:
+        """Build the description label."""
         self._desc_label = QLabel()
         self._desc_label.setStyleSheet(ACTION_CARD_DESC_STYLE)
         self._desc_label.setWordWrap(True)
-        outer.addWidget(self._desc_label)
+        return self._desc_label
+
+    def _build_command_row(self) -> QWidget:
+        """Build the CLI command row with copy button."""
+        self._command_row = QWidget()
+        cmd_layout = QHBoxLayout(self._command_row)
+        cmd_layout.setContentsMargins(0, 0, 0, 0)
+        cmd_layout.setSpacing(4)
 
-        # --- CLI command row (always visible, muted monospace) ---
         self._command_label = QLabel()
         self._command_label.setStyleSheet(ACTION_CARD_COMMAND_STYLE)
         self._command_label.setTextInteractionFlags(
             Qt.TextInteractionFlag.TextSelectableByMouse,
         )
-        self._command_label.hide()
-        outer.addWidget(self._command_label)
+        cmd_layout.addWidget(self._command_label)
+
+        self._copy_btn = QToolButton()
+        self._copy_btn.setText(COPY_ICON)
+        self._copy_btn.setToolTip('Copy to clipboard')
+        self._copy_btn.setFixedSize(*COPY_BTN_SIZE)
+        self._copy_btn.setStyleSheet(COPY_BTN_STYLE)
+        self._copy_btn.setCursor(Qt.CursorShape.PointingHandCursor)
+        self._copy_btn.clicked.connect(self._copy_command)
+        cmd_layout.addWidget(self._copy_btn)
+
+        cmd_layout.addStretch()
+
+        self._command_row.hide()
+        return self._command_row
 
-        # --- Inline log body (hidden by default) ---
+    def _build_log_output(self) -> QTextEdit:
+        """Build the inline log body (hidden by default)."""
         self._log_output = QTextEdit()
         self._log_output.setReadOnly(True)
         self._log_output.setFont(QFont(MONOSPACE_FAMILY, MONOSPACE_SIZE))
@@ -343,16 +367,19 @@ class ActionCard(QFrame):
         self._log_output.setMaximumHeight(250)
         self._log_output.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred)
         self._log_output.hide()
-        outer.addWidget(self._log_output)
+        return self._log_output
 
     # ------------------------------------------------------------------
     # Mouse events (toggle log)
     # ------------------------------------------------------------------
 
-    def mousePressEvent(self, _event: object) -> None:  # noqa: N802
+    def mousePressEvent(self, event: object) -> None:  # noqa: N802
         """Toggle the inline log body on click."""
         if self._is_skeleton or not hasattr(self, '_log_output'):
             return
+        # Don't toggle the log when clicking the copy button
+        if hasattr(self, '_copy_btn') and self._copy_btn.underMouse():
+            return
         self._toggle_log()
 
     def _toggle_log(self) -> None:
@@ -360,6 +387,23 @@ class ActionCard(QFrame):
         self._log_expanded = not self._log_expanded
         self._log_output.setVisible(self._log_expanded)
 
+    def _copy_command(self) -> None:
+        """Copy the command label text to the clipboard with brief feedback."""
+        clipboard = QApplication.clipboard()
+        if clipboard:
+            clipboard.setText(self._command_label.text())
+        self._copy_btn.setText('\u2713')
+        self._copy_btn.setToolTip('Copied!')
+
+        def _restore() -> None:
+            try:
+                self._copy_btn.setText(COPY_ICON)
+                self._copy_btn.setToolTip('Copy to clipboard')
+            except RuntimeError:
+                pass
+
+        QTimer.singleShot(COPY_FEEDBACK_MS, _restore)
+
     # ------------------------------------------------------------------
     # Public API — populate from action data
     # ------------------------------------------------------------------
@@ -409,9 +453,9 @@ class ActionCard(QFrame):
         cmd_text = _format_command(action)
         if cmd_text:
             self._command_label.setText(cmd_text)
-            self._command_label.show()
+            self._command_row.show()
         else:
-            self._command_label.hide()
+            self._command_row.hide()
 
         # Version — populated later by set_check_result()
 
@@ -467,9 +511,9 @@ class ActionCard(QFrame):
         cmd_text = _format_command(action)
         if cmd_text:
             self._command_label.setText(cmd_text)
-            self._command_label.show()
+            self._command_row.show()
         else:
-            self._command_label.hide()
+            self._command_row.hide()
 
     def initial_status(self) -> str:
         """Return the initial status text set during :meth:`populate`."""

{synodic_client-0.0.1.dev28 → synodic_client-0.0.1.dev30}/synodic_client/application/screen/install.py

@@ -400,9 +400,9 @@ class SetupPreviewWidget(QWidget):
         self._card_list.prerelease_toggled.connect(self._on_prerelease_row_toggled)
         outer.addWidget(self._card_list, stretch=1)
 
-        # Post-install section lives below the card list but still scrolls
+        # Post-install section lives below the card list but still scrolls.
+        # It starts hidden and is inserted into the layout after populate().
         self._post_install_section = PostInstallSection()
-        self._card_list._layout.insertWidget(self._card_list._layout.count() - 1, self._post_install_section)
 
         # --- Button bar (fixed at bottom) ---
         button_bar = self._init_button_bar()
@@ -653,8 +653,12 @@ class SetupPreviewWidget(QWidget):
             if installer_missing:
                 self._action_statuses[i] = 'Not installed'
 
-        # Populate the post-install commands section
+        # Populate post-install commands and place them after all cards.
         self._post_install_section.populate(preview.actions)
+        self._card_list._layout.insertWidget(
+            self._card_list._layout.count() - 1,
+            self._post_install_section,
+        )
 
         self._install_btn.setEnabled(True)
 

{synodic_client-0.0.1.dev28 → synodic_client-0.0.1.dev30}/synodic_client/application/screen/screen.py

@@ -753,12 +753,14 @@ class ProjectsView(QWidget):
         manifest_key = normalize_manifest_key(str(selected_path))
         overrides = set((self._config.prerelease_packages or {}).get(manifest_key, []))
 
-        # Defer project directory assignment until the preview result
-        # provides root_directory — handles both file and directory inputs.
+        # For file paths, use the parent directory so the dry-run
+        # can detect already-cloned repositories on disk.  The final
+        # project directory may still be overridden once porringer
+        # returns ``root_directory`` in the preview result.
         preview_worker = PreviewWorker(
             self._porringer,
             str(selected_path),
-            project_directory=selected_path if selected_path.is_dir() else None,
+            project_directory=selected_path if selected_path.is_dir() else selected_path.parent,
             detect_updates=self._config.detect_updates,
             prerelease_packages=overrides or None,
         )

{synodic_client-0.0.1.dev28 → synodic_client-0.0.1.dev30}/synodic_client/application/screen/tray.py

@@ -485,11 +485,14 @@ class TrayScreen:
 
         if result.error:
             if not silent:
-                self.tray.showMessage(
-                    'Update Check Failed',
-                    f'Failed to check for updates: {result.error}',
-                    QSystemTrayIcon.MessageIcon.Warning,
+                # Distinguish informational messages (no releases for channel)
+                # from genuine failures.
+                is_no_releases = 'No releases found' in result.error
+                title = 'No Updates Available' if is_no_releases else 'Update Check Failed'
+                icon = (
+                    QSystemTrayIcon.MessageIcon.Information if is_no_releases else QSystemTrayIcon.MessageIcon.Warning
                 )
+                self.tray.showMessage(title, result.error, icon)
             else:
                 logger.warning('Automatic update check failed: %s', result.error)
             return

{synodic_client-0.0.1.dev28 → synodic_client-0.0.1.dev30}/synodic_client/config.py

@@ -194,6 +194,12 @@ def _load_global_config() -> GlobalConfiguration:
 def save_config(config: GlobalConfiguration) -> None:
     """Save configuration to the global (system) config directory.
 
+    Only fields that have been explicitly set (either loaded from the
+    existing config file or changed at runtime) are written.  This
+    sparse serialisation ensures that build-time local-config values
+    do not leak into the user's global config and that future defaults
+    can take effect for fields the user has not customised.
+
     Args:
         config: The configuration to persist.
     """
@@ -202,7 +208,10 @@ def save_config(config: GlobalConfiguration) -> None:
     path = directory / _CONFIG_FILENAME
 
     try:
-        path.write_text(config.model_dump_json(indent=2), encoding='utf-8')
+        path.write_text(
+            config.model_dump_json(indent=2, exclude_unset=True),
+            encoding='utf-8',
+        )
         logger.info('Saved config to %s', path)
     except Exception:
         logger.exception('Failed to save config to %s', path)

{synodic_client-0.0.1.dev28 → synodic_client-0.0.1.dev30}/synodic_client/resolution.py

@@ -32,8 +32,13 @@ def merge_config(
 ) -> GlobalConfiguration:
     """Merge local overrides into a global configuration.
 
-    Fields explicitly set (not None) in the local config override the
-    corresponding global values.
+    Fields that the user has explicitly saved (present in the global
+    config file) take priority over local overrides.  Local config
+    fields only fill in values the user has **not** set.
+
+    The returned object preserves the global config's
+    ``model_fields_set`` so that :func:`save_config` can use
+    ``exclude_unset=True`` to write only user-changed fields.
 
     Args:
         global_config: The user-scoped global configuration.
@@ -45,12 +50,13 @@ def merge_config(
     if local_config is None:
         return global_config
 
+    user_set = global_config.model_fields_set
     merged = global_config.model_dump()
     for field_name, value in local_config.model_dump().items():
-        if value is not None:
+        if value is not None and field_name not in user_set:
             merged[field_name] = value
 
-    return GlobalConfiguration.model_validate(merged)
+    return GlobalConfiguration.model_construct(_fields_set=set(user_set), **merged)
 
 
 def resolve_config() -> GlobalConfiguration:

{synodic_client-0.0.1.dev28 → synodic_client-0.0.1.dev30}/synodic_client/updater.py

@@ -193,6 +193,20 @@ class Updater:
             return self._update_info
 
         except Exception as e:
+            if '404' in str(e):
+                channel = self._config.channel_name
+                msg = (
+                    f"No releases found for the '{channel}' channel. "
+                    "Try switching to the 'Development' channel in Settings \u2192 Channel."
+                )
+                logger.debug('No releases for channel %s: %s', channel, e)
+                self._state = UpdateState.NO_UPDATE
+                return UpdateInfo(
+                    available=False,
+                    current_version=self._current_version,
+                    error=msg,
+                )
+
             logger.exception('Failed to check for updates')
             self._state = UpdateState.FAILED
             return UpdateInfo(

{synodic_client-0.0.1.dev28 → synodic_client-0.0.1.dev30}/tests/unit/qt/test_action_card.py

@@ -664,7 +664,7 @@ class TestActionCardCommandLabel:
         action = _make_action(package='ruff', installer='pip')
         card.populate(action)
         assert card._command_label.text() == 'pip install ruff'
-        assert not card._command_label.isHidden()
+        assert not card._command_row.isHidden()
 
     @staticmethod
     def test_explicit_cli_command() -> None:
@@ -694,22 +694,22 @@ class TestActionCardCommandLabel:
         resolved = _make_action(cli_command=['uv', 'tool', 'install', 'ruff'])
         card.update_command(resolved)
         assert card._command_label.text() == 'uv tool install ruff'
-        assert not card._command_label.isHidden()
+        assert not card._command_row.isHidden()
 
     @staticmethod
     def test_update_command_hides_label_when_empty() -> None:
-        """update_command hides the label when the resolved action has no command."""
+        """update_command hides the row when the resolved action has no command."""
         card = ActionCard()
         action = _make_action(package='ruff', installer='pip')
         card.populate(action)
-        assert not card._command_label.isHidden()
+        assert not card._command_row.isHidden()
 
         empty_action = _make_action(kind=PluginKind.RUNTIME)
         empty_action.cli_command = None
         empty_action.command = None
         empty_action.package = None
         card.update_command(empty_action)
-        assert card._command_label.isHidden()
+        assert card._command_row.isHidden()
 
     @staticmethod
     def test_update_command_noop_on_skeleton() -> None:
@@ -719,6 +719,29 @@ class TestActionCardCommandLabel:
         # Should not raise — skeleton simply returns early
         card.update_command(action)
 
+    @staticmethod
+    def test_copy_button_copies_command(monkeypatch: object) -> None:
+        """Clicking the copy button copies the command text to the clipboard."""
+        card = ActionCard()
+        action = _make_action(cli_command=['uv', 'tool', 'install', 'ruff'])
+        card.populate(action)
+
+        clipboard = QApplication.clipboard()
+        assert clipboard is not None
+        clipboard.clear()
+        card._copy_btn.click()
+        assert clipboard.text() == 'uv tool install ruff'
+
+    @staticmethod
+    def test_copy_button_shows_feedback() -> None:
+        """Clicking copy shows a check-mark on the button."""
+        card = ActionCard()
+        action = _make_action(cli_command=['uv', 'tool', 'install', 'ruff'])
+        card.populate(action)
+
+        card._copy_btn.click()
+        assert card._copy_btn.text() == '\u2713'
+
 
 # ---------------------------------------------------------------------------
 # ActionCard — per-card spinner
@@ -806,18 +829,11 @@ class TestActionSortKey:
         assert action_sort_key(package) < action_sort_key(tool)
 
     @staticmethod
-    def test_alphabetical_within_kind() -> None:
-        """Same-kind actions are sorted alphabetically by package name."""
+    def test_same_kind_returns_equal_key() -> None:
+        """Same-kind actions get equal sort keys so stable sort preserves order."""
         alpha = _make_action(package='alpha')
         beta = _make_action(package='beta')
-        assert action_sort_key(alpha) < action_sort_key(beta)
-
-    @staticmethod
-    def test_case_insensitive() -> None:
-        """Package name comparison is case-insensitive."""
-        upper = _make_action(package='Alpha')
-        lower = _make_action(package='alpha')
-        assert action_sort_key(upper) == action_sort_key(lower)
+        assert action_sort_key(alpha) == action_sort_key(beta)
 
 
 # ---------------------------------------------------------------------------
@@ -829,19 +845,21 @@ class TestActionCardListOrdering:
     """Tests for card ordering in ActionCardList."""
 
     @staticmethod
-    def test_cards_sorted_by_kind_then_name() -> None:
-        """Cards are sorted by kind priority, then alphabetically."""
+    def test_cards_grouped_by_kind_preserving_order() -> None:
+        """Cards are grouped by execution phase, preserving porringer order within."""
         card_list = ActionCardList()
         a_pkg_b = _make_action(kind=PluginKind.PACKAGE, package='beta')
         a_tool = _make_action(kind=PluginKind.TOOL, package='ruff')
         a_pkg_a = _make_action(kind=PluginKind.PACKAGE, package='alpha')
         a_runtime = _make_action(kind=PluginKind.RUNTIME, package='python')
 
-        # Populate in unsorted order
+        # Populate in porringer's execution order
         card_list.populate([a_pkg_b, a_tool, a_pkg_a, a_runtime])
 
-        # Execution-phase order: RUNTIME(0) → PACKAGE(1) → TOOL(2)
-        expected = ['python', 'alpha', 'beta', 'ruff']
+        # Grouped by phase: RUNTIME(0) → PACKAGE(1) → TOOL(2)
+        # Within PACKAGE group, original (porringer) order is preserved:
+        # beta came before alpha in the input list.
+        expected = ['python', 'beta', 'alpha', 'ruff']
         assert card_list.card_count() == len(expected)
         for i, name in enumerate(expected):
             card = card_list.card_at(i)

{synodic_client-0.0.1.dev28 → synodic_client-0.0.1.dev30}/tests/unit/qt/test_install_preview.py

@@ -842,6 +842,158 @@ class TestNormalizeManifestKey:
         assert Path(result).is_absolute()
 
 
+class TestPreviewWorkerProjectDirectory:
+    """Tests for project_directory forwarding to the dry-run."""
+
+    @staticmethod
+    def test_file_path_forwards_parent_as_project_directory(tmp_path: Path) -> None:
+        """When a manifest *file* is selected, its parent dir is forwarded."""
+        manifest = tmp_path / 'porringer.json'
+        manifest.write_text('{}')
+
+        porringer = MagicMock()
+        preview = SetupResults(actions=[])
+        manifest_event = ProgressEvent(kind=ProgressEventKind.MANIFEST_LOADED, manifest=preview)
+
+        captured_params: list[Any] = []
+
+        async def mock_stream(params: Any) -> Any:
+            captured_params.append(params)
+            yield manifest_event
+
+        porringer.sync.execute_stream = mock_stream
+
+        worker = PreviewWorker(
+            porringer,
+            str(manifest),
+            project_directory=manifest.parent,
+        )
+        worker.run()
+
+        assert len(captured_params) == 1
+        assert captured_params[0].project_directory == tmp_path
+
+    @staticmethod
+    def test_directory_path_forwarded_directly(tmp_path: Path) -> None:
+        """When a directory is selected its path is forwarded as-is."""
+        manifest = tmp_path / 'porringer.json'
+        manifest.write_text('{}')
+
+        porringer = MagicMock()
+        preview = SetupResults(actions=[])
+        manifest_event = ProgressEvent(kind=ProgressEventKind.MANIFEST_LOADED, manifest=preview)
+
+        captured_params: list[Any] = []
+
+        async def mock_stream(params: Any) -> Any:
+            captured_params.append(params)
+            yield manifest_event
+
+        porringer.sync.execute_stream = mock_stream
+
+        worker = PreviewWorker(
+            porringer,
+            str(tmp_path),
+            project_directory=tmp_path,
+        )
+        worker.run()
+
+        assert len(captured_params) == 1
+        assert captured_params[0].project_directory == tmp_path
+
+
+class TestSCMPreviewActions:
+    """Tests for SCM (git clone) actions in the preview dry-run flow."""
+
+    @staticmethod
+    def _make_scm_action(description: str = 'Clone repo') -> MagicMock:
+        action = MagicMock()
+        action.kind = PluginKind.SCM
+        action.description = description
+        action.installer = 'git'
+        action.package = None
+        action.command = None
+        action.cli_command = None
+        return action
+
+    def test_scm_already_installed_emits_correct_result(self, tmp_path: Path) -> None:
+        """An SCM action with ALREADY_INSTALLED is surfaced via action_checked."""
+        manifest = tmp_path / 'porringer.json'
+        manifest.write_text('{}')
+
+        porringer = MagicMock()
+        action = self._make_scm_action()
+        preview = SetupResults(actions=[action])
+
+        manifest_event = ProgressEvent(kind=ProgressEventKind.MANIFEST_LOADED, manifest=preview)
+        result = SetupActionResult(
+            action=action,
+            success=True,
+            skipped=True,
+            skip_reason=SkipReason.ALREADY_INSTALLED,
+        )
+        completed_event = ProgressEvent(
+            kind=ProgressEventKind.ACTION_COMPLETED,
+            action=action,
+            result=result,
+        )
+
+        async def mock_stream(*args: Any, **kwargs: Any) -> Any:
+            yield manifest_event
+            yield completed_event
+
+        porringer.sync.execute_stream = mock_stream
+
+        worker = PreviewWorker(porringer, str(manifest), project_directory=tmp_path)
+
+        checked: list[tuple[int, SetupActionResult]] = []
+        worker.action_checked.connect(lambda row, r: checked.append((row, r)))
+        worker.run()
+
+        assert len(checked) == 1
+        assert checked[0] == (0, result)
+        assert checked[0][1].skipped is True
+        assert checked[0][1].skip_reason == SkipReason.ALREADY_INSTALLED
+
+    def test_scm_needed_emits_correct_result(self, tmp_path: Path) -> None:
+        """An SCM action that is *not* installed is surfaced as Needed."""
+        manifest = tmp_path / 'porringer.json'
+        manifest.write_text('{}')
+
+        porringer = MagicMock()
+        action = self._make_scm_action()
+        preview = SetupResults(actions=[action])
+
+        manifest_event = ProgressEvent(kind=ProgressEventKind.MANIFEST_LOADED, manifest=preview)
+        result = SetupActionResult(
+            action=action,
+            success=True,
+            skipped=False,
+            skip_reason=None,
+        )
+        completed_event = ProgressEvent(
+            kind=ProgressEventKind.ACTION_COMPLETED,
+            action=action,
+            result=result,
+        )
+
+        async def mock_stream(*args: Any, **kwargs: Any) -> Any:
+            yield manifest_event
+            yield completed_event
+
+        porringer.sync.execute_stream = mock_stream
+
+        worker = PreviewWorker(porringer, str(manifest), project_directory=tmp_path)
+
+        checked: list[tuple[int, SetupActionResult]] = []
+        worker.action_checked.connect(lambda row, r: checked.append((row, r)))
+        worker.run()
+
+        assert len(checked) == 1
+        assert checked[0][1].skipped is False
+        assert checked[0][1].skip_reason is None
+
+
 class TestPrereleaseCheckboxLock:
     """Tests for the pre-release checkbox lock/unlock decision logic.
 

{synodic_client-0.0.1.dev28 → synodic_client-0.0.1.dev30}/tests/unit/test_config.py

@@ -165,6 +165,20 @@ class TestSaveConfig:
         assert data['update_source'] == '/my/releases'
         assert data['update_channel'] == 'stable'
 
+    @staticmethod
+    def test_sparse_serialization(tmp_path: Path) -> None:
+        """Verify save_config only writes user-set fields (exclude_unset)."""
+        config = GlobalConfiguration(update_channel='dev')
+
+        with patch('synodic_client.config.config_dir', return_value=tmp_path):
+            save_config(config)
+
+        data = json.loads((tmp_path / 'config.json').read_text(encoding='utf-8'))
+        # Only 'update_channel' should be in the file
+        assert data == {'update_channel': 'dev'}
+        assert 'update_source' not in data
+        assert 'auto_update_interval_minutes' not in data
+
     @staticmethod
     def test_creates_directory(tmp_path: Path) -> None:
         """Verify save_config creates the directory if missing."""
@@ -189,3 +203,19 @@ class TestSaveConfig:
 
         data = json.loads(config_path.read_text(encoding='utf-8'))
         assert data['update_source'] == 'http://new-source'
+
+    @staticmethod
+    def test_save_load_round_trip(tmp_path: Path) -> None:
+        """Verify saved config can be loaded back with correct fields_set."""
+        original = GlobalConfiguration(update_channel='dev', auto_start=False)
+
+        with patch('synodic_client.config.config_dir', return_value=tmp_path):
+            save_config(original)
+
+        data = json.loads((tmp_path / 'config.json').read_text(encoding='utf-8'))
+        loaded = GlobalConfiguration.model_validate(data)
+        assert loaded.update_channel == 'dev'
+        assert loaded.auto_start is False
+        # Only saved fields should be in model_fields_set
+        assert loaded.model_fields_set == {'update_channel', 'auto_start'}
+        assert loaded.update_source is None

{synodic_client-0.0.1.dev28 → synodic_client-0.0.1.dev30}/tests/unit/test_resolution.py

@@ -34,8 +34,8 @@ class TestMergeConfig:
 
     @staticmethod
     def test_local_overrides_global() -> None:
-        """Verify local fields override global values."""
-        global_cfg = GlobalConfiguration(update_source='/system', update_channel='stable')
+        """Verify local fields fill in values the user hasn't set."""
+        global_cfg = GlobalConfiguration(update_channel='stable')
         local_cfg = LocalConfiguration(update_source='/local')
         result = merge_config(global_cfg, local_cfg)
         assert result.update_source == '/local'
@@ -52,21 +52,57 @@ class TestMergeConfig:
 
     @staticmethod
     def test_full_override() -> None:
-        """Verify all local fields override when set."""
+        """Verify local fields are ignored when the user has saved both."""
         global_cfg = GlobalConfiguration(update_source='/system', update_channel='stable')
         local_cfg = LocalConfiguration(update_source='/local', update_channel='dev')
         result = merge_config(global_cfg, local_cfg)
-        assert result.update_source == '/local'
+        assert result.update_source == '/system'
+        assert result.update_channel == 'stable'
+
+    @staticmethod
+    def test_user_saved_wins_over_local() -> None:
+        """Verify a user-saved field takes priority over local config."""
+        global_cfg = GlobalConfiguration(update_channel='dev')
+        local_cfg = LocalConfiguration(update_channel='stable')
+        result = merge_config(global_cfg, local_cfg)
+        assert result.update_channel == 'dev'
+
+    @staticmethod
+    def test_local_fills_unsaved_fields() -> None:
+        """Verify local config fills in fields the user hasn't saved."""
+        global_cfg = GlobalConfiguration(update_channel='dev')
+        local_cfg = LocalConfiguration(update_source='/local/releases')
+        result = merge_config(global_cfg, local_cfg)
         assert result.update_channel == 'dev'
+        assert result.update_source == '/local/releases'
+
+    @staticmethod
+    def test_preserves_model_fields_set() -> None:
+        """Verify merge preserves the global config's model_fields_set."""
+        global_cfg = GlobalConfiguration(update_channel='dev')
+        local_cfg = LocalConfiguration(update_source='/local')
+        result = merge_config(global_cfg, local_cfg)
+        # Only 'update_channel' was in the user's config file
+        assert result.model_fields_set == {'update_channel'}
+        # But the runtime value from local config is available
+        assert result.update_source == '/local'
 
     @staticmethod
     def test_local_overrides_plugin_auto_update() -> None:
-        """Verify local plugin_auto_update overrides global."""
-        global_cfg = GlobalConfiguration(plugin_auto_update={'pip': False})
+        """Verify local plugin_auto_update fills in when user hasn't set it."""
+        global_cfg = GlobalConfiguration()
         local_cfg = LocalConfiguration(plugin_auto_update={'pip': True, 'pipx': False})
         result = merge_config(global_cfg, local_cfg)
         assert result.plugin_auto_update == {'pip': True, 'pipx': False}
 
+    @staticmethod
+    def test_user_plugin_auto_update_wins() -> None:
+        """Verify user-saved plugin_auto_update wins over local."""
+        global_cfg = GlobalConfiguration(plugin_auto_update={'pip': False})
+        local_cfg = LocalConfiguration(plugin_auto_update={'pip': True, 'pipx': False})
+        result = merge_config(global_cfg, local_cfg)
+        assert result.plugin_auto_update == {'pip': False}
+
 
 class TestResolveAutoStart:
     """Tests for resolve_auto_start."""
@@ -169,7 +205,7 @@ class TestResolveConfig:
 
     @staticmethod
     def test_local_overrides_global_per_field(tmp_path: Path) -> None:
-        """Verify local config overrides global on a per-field basis."""
+        """Verify local config fills in fields the user hasn't saved."""
         local_data = {'update_source': '/local/releases'}
         local_path = tmp_path / 'local' / 'config.json'
         local_path.parent.mkdir()
@@ -177,7 +213,8 @@ class TestResolveConfig:
 
         system_dir = tmp_path / 'system'
         system_dir.mkdir()
-        system_data = {'update_source': '/system/releases', 'update_channel': 'stable'}
+        # User has only saved update_channel, not update_source
+        system_data = {'update_channel': 'stable'}
         (system_dir / 'config.json').write_text(json.dumps(system_data), encoding='utf-8')
 
         with (
@@ -186,7 +223,9 @@ class TestResolveConfig:
         ):
             config = resolve_config()
 
+        # Local fills in update_source since user didn't set it
         assert config.update_source == '/local/releases'
+        # User's saved update_channel is preserved
         assert config.update_channel == 'stable'
 
     @staticmethod
@@ -226,15 +265,15 @@ class TestResolveConfig:
 
     @staticmethod
     def test_portable_takes_precedence(tmp_path: Path) -> None:
-        """Verify portable config values override system config."""
+        """Verify portable config fills in fields user hasn't saved."""
         portable_data = {'update_source': '/portable/releases', 'update_channel': 'dev'}
         portable_path = tmp_path / 'config.json'
         portable_path.write_text(json.dumps(portable_data), encoding='utf-8')
 
         system_dir = tmp_path / 'system'
         system_dir.mkdir()
-        system_data = {'update_source': '/system/releases', 'update_channel': 'stable'}
-        (system_dir / 'config.json').write_text(json.dumps(system_data), encoding='utf-8')
+        # User has NOT saved any config (empty file or missing)
+        (system_dir / 'config.json').write_text('{}', encoding='utf-8')
 
         with (
             patch('synodic_client.config._portable_config_path', return_value=portable_path),
@@ -245,6 +284,27 @@ class TestResolveConfig:
         assert config.update_source == '/portable/releases'
         assert config.update_channel == 'dev'
 
+    @staticmethod
+    def test_user_saved_wins_over_portable(tmp_path: Path) -> None:
+        """Verify user-saved values in global config win over portable."""
+        portable_data = {'update_source': '/portable/releases', 'update_channel': 'dev'}
+        portable_path = tmp_path / 'config.json'
+        portable_path.write_text(json.dumps(portable_data), encoding='utf-8')
+
+        system_dir = tmp_path / 'system'
+        system_dir.mkdir()
+        system_data = {'update_source': '/system/releases', 'update_channel': 'stable'}
+        (system_dir / 'config.json').write_text(json.dumps(system_data), encoding='utf-8')
+
+        with (
+            patch('synodic_client.config._portable_config_path', return_value=portable_path),
+            patch('synodic_client.config.config_dir', return_value=system_dir),
+        ):
+            config = resolve_config()
+
+        assert config.update_source == '/system/releases'
+        assert config.update_channel == 'stable'
+
 
 class TestResolveUpdateConfig:
     """Tests for resolve_update_config."""
@@ -339,7 +399,9 @@ class TestUpdateAndResolve:
         assert result.channel == UpdateChannel.DEVELOPMENT
         assert result.repo_url == '/my/source'
 
-        # Verify file was saved
+        # Verify file was saved (sparse — only user-set fields)
         saved = json.loads((tmp_path / 'config.json').read_text(encoding='utf-8'))
         assert saved['update_source'] == '/my/source'
         assert saved['update_channel'] == 'dev'
+        # Unset fields should not appear in the sparse output
+        assert 'auto_update_interval_minutes' not in saved

{synodic_client-0.0.1.dev28 → synodic_client-0.0.1.dev30}/tests/unit/test_updater.py

@@ -150,6 +150,34 @@ class TestUpdaterCheckForUpdate:
         assert info.error == 'Network error'
         assert updater.state == UpdateState.FAILED
 
+    @staticmethod
+    def test_check_404_returns_friendly_message(updater: Updater) -> None:
+        """Verify a 404 from GitHub returns a friendly no-releases message."""
+        mock_manager = MagicMock()
+        mock_manager.check_for_updates.side_effect = RuntimeError('Network error: Http error: http status: 404')
+
+        with patch.object(updater, '_get_velopack_manager', return_value=mock_manager):
+            info = updater.check_for_update()
+
+        assert info.available is False
+        assert info.error is not None
+        assert 'No releases found' in info.error
+        assert updater._config.channel_name in info.error
+        # A missing channel is informational, not a hard failure
+        assert updater.state == UpdateState.NO_UPDATE
+
+    @staticmethod
+    def test_check_non_404_http_error_is_failed(updater: Updater) -> None:
+        """Verify non-404 HTTP errors still produce FAILED state."""
+        mock_manager = MagicMock()
+        mock_manager.check_for_updates.side_effect = RuntimeError('Network error: Http error: http status: 500')
+
+        with patch.object(updater, '_get_velopack_manager', return_value=mock_manager):
+            info = updater.check_for_update()
+
+        assert info.available is False
+        assert updater.state == UpdateState.FAILED
+
 
 class TestUpdaterDownloadUpdate:
     """Tests for download_update method."""

{synodic_client-0.0.1.dev28 → synodic_client-0.0.1.dev30}/tests/unit/windows/test_startup.py

@@ -3,8 +3,6 @@
 import winreg
 from unittest.mock import MagicMock, patch
 
-import pytest
-
 from synodic_client.startup import (
     RUN_KEY_PATH,
     STARTUP_VALUE_NAME,
@@ -13,9 +11,6 @@ from synodic_client.startup import (
     remove_startup,
 )
 
-_TEST_VALUE_NAME = f'{STARTUP_VALUE_NAME}_test'
-"""Temporary value name used by integration tests to avoid clobbering the real registration."""
-
 
 class TestRegisterStartup:
     """Tests for register_startup."""
@@ -123,70 +118,4 @@ class TestIsStartupRegistered:
             patch.object(winreg, 'QueryValueEx', side_effect=FileNotFoundError),
         ):
             assert is_startup_registered() is False
-
-
-class TestStartupIntegration:
-    """Integration tests that read/write real registry values under a test name."""
-
-    @staticmethod
-    def test_register_creates_valid_entry() -> None:
-        """Register under a test value name, verify, then clean up."""
-        test_exe = r'C:\test\synodic_test.exe'
-
-        try:
-            with patch('synodic_client.startup.STARTUP_VALUE_NAME', _TEST_VALUE_NAME):
-                register_startup(test_exe)
-
-            with winreg.OpenKey(winreg.HKEY_CURRENT_USER, RUN_KEY_PATH, 0, winreg.KEY_QUERY_VALUE) as key:
-                value, reg_type = winreg.QueryValueEx(key, _TEST_VALUE_NAME)
-                assert reg_type == winreg.REG_SZ
-                assert test_exe in value
-
-        finally:
-            with patch('synodic_client.startup.STARTUP_VALUE_NAME', _TEST_VALUE_NAME):
-                remove_startup()
-
-    @staticmethod
-    def test_remove_deletes_entry() -> None:
-        """Register then remove under a test value name, verify it is gone."""
-        with patch('synodic_client.startup.STARTUP_VALUE_NAME', _TEST_VALUE_NAME):
-            register_startup(r'C:\test\synodic_test.exe')
-            remove_startup()
-
-        with (
-            winreg.OpenKey(winreg.HKEY_CURRENT_USER, RUN_KEY_PATH, 0, winreg.KEY_QUERY_VALUE) as key,
-            pytest.raises(FileNotFoundError),
-        ):
-            winreg.QueryValueEx(key, _TEST_VALUE_NAME)
-
-    @staticmethod
-    def test_register_is_idempotent() -> None:
-        """Calling register twice with a different exe updates the value."""
-        exe_v1 = r'C:\test\v1\synodic.exe'
-        exe_v2 = r'C:\test\v2\synodic.exe'
-
-        try:
-            with patch('synodic_client.startup.STARTUP_VALUE_NAME', _TEST_VALUE_NAME):
-                register_startup(exe_v1)
-                register_startup(exe_v2)
-
-            with winreg.OpenKey(winreg.HKEY_CURRENT_USER, RUN_KEY_PATH, 0, winreg.KEY_QUERY_VALUE) as key:
-                value, _ = winreg.QueryValueEx(key, _TEST_VALUE_NAME)
-                assert exe_v2 in value
-                assert exe_v1 not in value
-
-        finally:
-            with patch('synodic_client.startup.STARTUP_VALUE_NAME', _TEST_VALUE_NAME):
-                remove_startup()
-
-    @staticmethod
-    def test_is_startup_registered_reflects_state() -> None:
-        """Verify is_startup_registered returns the correct state."""
-        with patch('synodic_client.startup.STARTUP_VALUE_NAME', _TEST_VALUE_NAME):
-            assert is_startup_registered() is False
-
-            register_startup(r'C:\test\synodic_test.exe')
-            assert is_startup_registered() is True
-
-            remove_startup()
             assert is_startup_registered() is False

synodic_client-0.0.1.dev28/synodic_client/_version.py

@@ -1 +0,0 @@
-__version__ = '0.0.1.dev28'