msdev 0.14.0__tar.gz → 0.14.1__tar.gz

{msdev-0.14.0 → msdev-0.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: msdev
-Version: 0.14.0
+Version: 0.14.1
 Summary: Portable nodes and execution environments for msModelSlim development
 Author: msModelSlim Agent Contributors
 License-Expression: MulanPSL-2.0

{msdev-0.14.0 → msdev-0.14.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "msdev"
-version = "0.14.0"
+version = "0.14.1"
 description = "Portable nodes and execution environments for msModelSlim development"
 readme = "README.md"
 requires-python = ">=3.10"

{msdev-0.14.0 → msdev-0.14.1}/src/msdev/__init__.py

@@ -1,3 +1,3 @@
 """Portable node and execution-environment tooling for msModelSlim."""
 
-__version__ = "0.14.0"
+__version__ = "0.14.1"

msdev-0.14.1/src/msdev/core/daemon_version.py

@@ -0,0 +1,26 @@
+"""Helpers for comparing local CLI and remote msdevd versions."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from .. import __version__
+
+
+def remote_daemon_version_matches(
+    ping: Any,
+    *,
+    expected: str | None = None,
+) -> bool:
+    """Return True when ping reports the same msdevd version as the local CLI."""
+    target = expected if expected is not None else __version__
+    if not isinstance(ping, dict):
+        return False
+    remote = ping.get("version")
+    return isinstance(remote, str) and remote == target
+
+
+def is_incompatible_daemon_rpc_error(exc: BaseException) -> bool:
+    """True when the remote daemon rejected a method the current CLI requires."""
+    text = str(exc).lower()
+    return "unknown rpc method" in text

{msdev-0.14.0 → msdev-0.14.1}/src/msdev/core/services/node.py

@@ -6,8 +6,8 @@ from dataclasses import asdict, dataclass
 from pathlib import Path
 from typing import Any
 
-from ... import __version__
 from ..resources import Node
+from ..daemon_version import remote_daemon_version_matches
 from ..ssh_config import (
     SshHostSpec,
     list_ssh_config_hosts,
@@ -19,19 +19,6 @@ from ..transport import DaemonUnavailableError, RpcError
 from .context import ServiceContext
 
 
-def remote_daemon_version_matches(
-    ping: Any,
-    *,
-    expected: str | None = None,
-) -> bool:
-    """Return True when ping reports the same msdevd version as the local CLI."""
-    target = expected if expected is not None else __version__
-    if not isinstance(ping, dict):
-        return False
-    remote = ping.get("version")
-    return isinstance(remote, str) and remote == target
-
-
 @dataclass(frozen=True)
 class NodeAddRequest:
     name: str

{msdev-0.14.0 → msdev-0.14.1}/src/msdev/core/transport.py

@@ -19,6 +19,7 @@ import uuid
 from pathlib import Path
 from typing import Any, Callable, Protocol
 
+from .. import __version__
 from .compat import (
     kill_popen_tree,
     popen_kwargs,
@@ -50,6 +51,10 @@ from .env_transfer import (
     transfer_timeout_seconds,
 )
 from .daemon_deploy import select_daemon_binary
+from .daemon_version import (
+    is_incompatible_daemon_rpc_error,
+    remote_daemon_version_matches,
+)
 from .local_rpc import connect_local_rpc
 from .resources import Environment, Node
 from .sftp_transfer import sftp_put_file
@@ -649,6 +654,53 @@ class SshRpcTransport:
         self.control_persist = os.environ.get("MSDEV_SSH_CONTROL_PERSIST", "yes")
         self._control_master = ssh_control_master_enabled()
         self._tunnel = LocalForwardTunnel(self)
+        self._compatible_daemon = False
+
+    def _bootstrap_remote_daemon(self, reason: str) -> None:
+        print(
+            f"[msdev] node {self.node.name!r} msdevd needs update "
+            f"({reason}); bootstrapping user daemon...",
+            file=sys.stderr,
+        )
+        try:
+            bootstrap_node(self.node)
+        except Exception as bootstrap_exc:
+            raise RpcError(
+                f"automatic bootstrap failed for node {self.node.name!r}: "
+                f"{bootstrap_exc}. Retry with `msdev node bootstrap "
+                f"{self.node.name}` for detailed diagnostics."
+            ) from bootstrap_exc
+        self._compatible_daemon = True
+        print(
+            f"[msdev] msdevd is ready on node {self.node.name!r}; "
+            "retrying request.",
+            file=sys.stderr,
+        )
+
+    def _ensure_compatible_daemon(self) -> None:
+        """Redeploy when remote ping version does not match this CLI."""
+        if self._compatible_daemon:
+            return
+        try:
+            ping = self._call_once("ping")
+        except DaemonUnavailableError:
+            if not self.auto_bootstrap:
+                raise
+            self._bootstrap_remote_daemon("unavailable")
+            ping = self._call_once("ping")
+        if remote_daemon_version_matches(ping):
+            self._compatible_daemon = True
+            return
+        remote = ping.get("version") if isinstance(ping, dict) else None
+        if not self.auto_bootstrap:
+            raise RpcError(
+                f"msdevd version mismatch on node {self.node.name!r}: "
+                f"remote={remote!r} local={__version__!r}; "
+                f"run `msdev node bootstrap {self.node.name}`"
+            )
+        self._bootstrap_remote_daemon(
+            f"version mismatch remote={remote!r} local={__version__!r}"
+        )
 
     def _rpc_target_label(self) -> str:
         if self.environment is not None:
@@ -1143,56 +1195,43 @@ esac
         return values
 
     def call(self, method: str, params: dict[str, Any] | None = None) -> Any:
+        if method != "ping":
+            self._ensure_compatible_daemon()
         try:
             return self._call_once(method, params)
-        except DaemonUnavailableError as exc:
+        except DaemonUnavailableError:
             if not self.auto_bootstrap:
                 raise
-            print(
-                f"[msdev] node {self.node.name!r} is reachable but msdevd "
-                "is unavailable; bootstrapping user daemon...",
-                file=sys.stderr,
-            )
-            try:
-                bootstrap_node(self.node)
-            except Exception as bootstrap_exc:
-                raise RpcError(
-                    f"automatic bootstrap failed for node {self.node.name!r}: "
-                    f"{bootstrap_exc}. Retry with `msdev node bootstrap "
-                    f"{self.node.name}` for detailed diagnostics."
-                ) from bootstrap_exc
-            print(
-                f"[msdev] msdevd is ready on node {self.node.name!r}; "
-                "retrying request.",
-                file=sys.stderr,
-            )
+            self._bootstrap_remote_daemon("unavailable")
             return self._call_once(method, params)
+        except RpcError as exc:
+            if (
+                method != "ping"
+                and self.auto_bootstrap
+                and is_incompatible_daemon_rpc_error(exc)
+            ):
+                self._bootstrap_remote_daemon(str(exc))
+                return self._call_once(method, params)
+            raise
 
     def stream_exec(
         self,
         params: dict[str, Any],
         on_output: Callable[[str, bytes], None],
     ) -> dict[str, Any]:
+        self._ensure_compatible_daemon()
         try:
             return self._stream_exec_once(params, on_output)
-        except DaemonUnavailableError as exc:
+        except DaemonUnavailableError:
             if not self.auto_bootstrap:
                 raise
-            print(
-                f"[msdev] node {self.node.name!r} is reachable but msdevd "
-                "is unavailable; bootstrapping user daemon...",
-                file=sys.stderr,
-            )
-            try:
-                bootstrap_node(self.node)
-            except Exception as bootstrap_exc:
-                raise RpcError(
-                    f"automatic bootstrap failed for node "
-                    f"{self.node.name!r}: {bootstrap_exc}. Retry with "
-                    f"`msdev node connect {self.node.name}` for "
-                    "detailed diagnostics."
-                ) from bootstrap_exc
+            self._bootstrap_remote_daemon("unavailable")
             return self._stream_exec_once(params, on_output)
+        except RpcError as exc:
+            if self.auto_bootstrap and is_incompatible_daemon_rpc_error(exc):
+                self._bootstrap_remote_daemon(str(exc))
+                return self._stream_exec_once(params, on_output)
+            raise
 
     def _stream_exec_once(
         self,

msdev-0.14.1/src/msdev/helpers/msdevd-linux-amd64.sha256

@@ -0,0 +1 @@
+e397d2c3621ad047df7bc181b2fa7637694fb533fa559a39e3495130d3fbf5fa  msdevd-linux-amd64

msdev-0.14.1/src/msdev/helpers/msdevd-linux-arm64.sha256

@@ -0,0 +1 @@
+86aa45ed2e836e359cc65fe341c39aa84c61bde4f522f086fdecac7026695627  msdevd-linux-arm64

{msdev-0.14.0 → msdev-0.14.1}/src/msdev/skills/msdev-cli/SKILL.md

@@ -181,6 +181,8 @@ captures one result. Local cancellation terminates the remote process group.
 
 - Ask before destructive or externally visible changes unless authorized.
 - Track temporary resources and remove only those created by the task.
-- If `msdevd` is missing or its version mismatches the local CLI, run
-  `msdev node bootstrap NODE` (or `msdev node connect NODE`), then retry.
+- If `msdevd` is missing, version-mismatched, or returns
+  `unknown RPC method` (for example `env.open`), run
+  `msdev node bootstrap NODE` (or retry the command — exec/connect now
+  auto-redeploy when `auto_bootstrap` is on), then retry.
 - If connect fails, report the error; do not bypass msdev with another transport.

{msdev-0.14.0 → msdev-0.14.1}/src/msdev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: msdev
-Version: 0.14.0
+Version: 0.14.1
 Summary: Portable nodes and execution environments for msModelSlim development
 Author: msModelSlim Agent Contributors
 License-Expression: MulanPSL-2.0

{msdev-0.14.0 → msdev-0.14.1}/src/msdev.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ src/msdev/core/config.py
 src/msdev/core/config_bundle.py
 src/msdev/core/container_helper.py
 src/msdev/core/daemon_deploy.py
+src/msdev/core/daemon_version.py
 src/msdev/core/env_transfer.py
 src/msdev/core/exec_argv.py
 src/msdev/core/guides.py
@@ -92,6 +93,7 @@ tests/test_sftp_transfer_scenario.py
 tests/test_ssh_auth.py
 tests/test_ssh_config.py
 tests/test_ssh_tunnel.py
+tests/test_stale_daemon_autobootstrap_scenario.py
 tests/test_stream_server.py
 tests/test_stream_transport.py
 tests/test_streamproto.py

{msdev-0.14.0 → msdev-0.14.1}/tests/test_cli.py

@@ -314,14 +314,14 @@ class CliParserTest(unittest.TestCase):
                     "ready": True,
                     "bootstrapped": True,
                     "reason": "forced",
-                    "daemon": {"ok": True, "version": "0.14.0"},
+                    "daemon": {"ok": True, "version": "0.14.1"},
                 },
                 (
                     "{\n"
                     '  "bootstrapped": true,\n'
                     '  "daemon": {\n'
                     '    "ok": true,\n'
-                    '    "version": "0.14.0"\n'
+                    '    "version": "0.14.1"\n'
                     "  },\n"
                     '  "ready": true,\n'
                     '  "reason": "forced"\n'

{msdev-0.14.0 → msdev-0.14.1}/tests/test_config_bundle.py

@@ -56,7 +56,7 @@ class ConfigBundleTests(unittest.TestCase):
             summary = export_bundle(
                 export_dir,
                 config_path=resources,
-                msdev_version="0.14.0",
+                msdev_version="0.14.1",
             )
             self.assertFalse(summary["archive"])
             self.assertTrue((export_dir / BUNDLE_MANIFEST).is_file())
@@ -100,7 +100,7 @@ class ConfigBundleTests(unittest.TestCase):
             )
 
             archive = root / "msdev-config.tar.gz"
-            export_bundle(archive, config_path=resources, msdev_version="0.14.0")
+            export_bundle(archive, config_path=resources, msdev_version="0.14.1")
             self.assertTrue(archive.is_file())
 
             target_resources = root / "imported" / "resources.json"
@@ -126,7 +126,7 @@ class ConfigBundleTests(unittest.TestCase):
             )
 
             bundle_dir = root / "bundle"
-            export_bundle(bundle_dir, config_path=source_resources, msdev_version="0.14.0")
+            export_bundle(bundle_dir, config_path=source_resources, msdev_version="0.14.1")
             result = import_bundle(bundle_dir, config_path=target_resources)
             self.assertEqual(result["imported_nodes"], 0)
             self.assertIn("node:worker", result["skipped"])

{msdev-0.14.0 → msdev-0.14.1}/tests/test_go_msdevd_scenario.py

@@ -104,7 +104,7 @@ class GoMsdevdScenarioTests(unittest.TestCase):
         self.assertNotIn("error", response)
         result = response["result"]
         self.assertTrue(result["ok"])
-        self.assertEqual(result["version"], "0.14.0")
+        self.assertEqual(result["version"], "0.14.1")
         self.assertIn("node_id", result)
 
     def test_exec(self):

{msdev-0.14.0 → msdev-0.14.1}/tests/test_node_bootstrap_version_scenario.py

@@ -11,10 +11,11 @@ from pathlib import Path
 from unittest.mock import Mock, patch
 
 from msdev import __version__
+from msdev.core.daemon_version import remote_daemon_version_matches
 from msdev.cli import build_parser, command_node
 from msdev.core.resources import EnvironmentStore, Node, NodeStore
 from msdev.core.services.context import ServiceContext
-from msdev.core.services.node import NodeService, remote_daemon_version_matches
+from msdev.core.services.node import NodeService
 
 
 class NodeBootstrapVersionScenarioTests(unittest.TestCase):

msdev-0.14.1/tests/test_stale_daemon_autobootstrap_scenario.py

@@ -0,0 +1,100 @@
+#!/usr/bin/env python3
+"""Scenario: exec against a stale remote msdevd auto-bootstraps.
+
+Covers the failure mode where ping still works but required RPCs such as
+``env.open`` return ``unknown RPC method``.
+"""
+
+from __future__ import annotations
+
+import unittest
+from unittest.mock import patch
+
+from msdev import __version__
+from msdev.core.resources import Environment, Node
+from msdev.core.transport import RpcError, SshRpcTransport
+
+
+class StaleDaemonAutoBootstrapScenarioTests(unittest.TestCase):
+    def test_env_open_unknown_method_triggers_bootstrap_then_retry(self) -> None:
+        node = Node(name="worker", ssh_host="worker.example")
+        env = Environment(name="worker", node="worker")
+        transport = SshRpcTransport(node, env, auto_bootstrap=True)
+        calls: list[str] = []
+
+        def fake_once(method, params=None):
+            calls.append(method)
+            if method == "ping":
+                # Version already matches — old binary still lacks env.open.
+                return {"ok": True, "version": __version__, "node_id": "n1"}
+            if method == "env.open":
+                if calls.count("env.open") == 1:
+                    raise RpcError("KeyError: unknown RPC method: env.open")
+                return {"open": True, "ready": True, "name": "worker"}
+            raise AssertionError(f"unexpected method {method}")
+
+        with patch(
+            "msdev.core.transport.bootstrap_node",
+            return_value={"layout": "static"},
+        ) as bootstrap:
+            with patch.object(transport, "_call_once", side_effect=fake_once):
+                with patch.object(transport, "_ensure_mux"):
+                    result = transport.call(
+                        "env.open",
+                        {"_env": env.to_agent_spec()},
+                    )
+
+        self.assertEqual(result["ready"], True)
+        bootstrap.assert_called_once_with(node)
+        self.assertGreaterEqual(calls.count("env.open"), 2)
+
+    def test_exec_path_bootstraps_on_version_mismatch_before_env_open(self) -> None:
+        node = Node(name="worker", ssh_host="worker.example")
+        env = Environment(name="worker", node="worker")
+        transport = SshRpcTransport(node, env, auto_bootstrap=True)
+        calls: list[str] = []
+
+        def fake_once(method, params=None):
+            calls.append(method)
+            if method == "ping":
+                return {"ok": True, "version": "0.12.0", "node_id": "old"}
+            if method == "env.open":
+                return {"open": True, "ready": True, "name": "worker"}
+            raise AssertionError(f"unexpected method {method}")
+
+        with patch(
+            "msdev.core.transport.bootstrap_node",
+            return_value={"layout": "static"},
+        ) as bootstrap:
+            with patch.object(transport, "_call_once", side_effect=fake_once):
+                with patch.object(transport, "_ensure_mux"):
+                    transport._ensure_compatible_daemon()
+                    result = transport.call(
+                        "env.open",
+                        {"_env": env.to_agent_spec()},
+                    )
+
+        self.assertTrue(result["ready"])
+        bootstrap.assert_called_once_with(node)
+        self.assertIn("ping", calls)
+        self.assertIn("env.open", calls)
+
+    def test_version_mismatch_without_auto_bootstrap_is_actionable(self) -> None:
+        node = Node(
+            name="worker",
+            ssh_host="worker.example",
+            auto_bootstrap=False,
+        )
+        transport = SshRpcTransport(node, auto_bootstrap=False)
+
+        with patch.object(
+            transport,
+            "_call_once",
+            return_value={"ok": True, "version": "0.12.0"},
+        ):
+            with self.assertRaisesRegex(RpcError, "version mismatch"):
+                transport._ensure_compatible_daemon()
+
+
+if __name__ == "__main__":
+    unittest.main()

{msdev-0.14.0 → msdev-0.14.1}/tests/test_transport.py

@@ -298,6 +298,7 @@ class PackageSourceTest(unittest.TestCase):
         node = Node(name="worker", ssh_host="worker")
         transport = SshRpcTransport(node, auto_bootstrap=False)
         transport._control_master = False
+        transport._compatible_daemon = True
         transport._tunnel._local_port = 18080
         chunks = []
 
@@ -392,6 +393,7 @@ class PackageSourceTest(unittest.TestCase):
     def test_ssh_transport_streams_exec_events_and_returns_result(self):
         node = Node(name="worker", ssh_host="worker")
         transport = SshRpcTransport(node, auto_bootstrap=False)
+        transport._compatible_daemon = True
         chunks = []
         captured = {}
 
@@ -453,6 +455,7 @@ class PackageSourceTest(unittest.TestCase):
             environment=environment,
             auto_bootstrap=False,
         )
+        transport._compatible_daemon = True
 
         def fake_stream(args, **kwargs):
             return subprocess.CompletedProcess(args, 2, b"", b"")
@@ -478,6 +481,7 @@ class PackageSourceTest(unittest.TestCase):
     def test_streaming_rpc_rc_127_reports_daemon_unavailable(self):
         node = Node(name="worker", ssh_host="worker")
         transport = SshRpcTransport(node, auto_bootstrap=False)
+        transport._compatible_daemon = True
 
         def fake_stream(args, **kwargs):
             return subprocess.CompletedProcess(args, 127, b"", b"")

msdev-0.14.0/src/msdev/helpers/msdevd-linux-amd64.sha256

@@ -1 +0,0 @@
-7b3d2dcd31cc752b44289c5b0936569be7df1aef162d07c1b3c00e886cfea884  msdevd-linux-amd64

msdev-0.14.0/src/msdev/helpers/msdevd-linux-arm64.sha256

@@ -1 +0,0 @@
-aeb5721e49746058e286ed14621208823ee092372c0a7d772cfdd9924d5b71e1  msdevd-linux-arm64