msdev 0.15.0__tar.gz → 0.15.2__tar.gz

{msdev-0.15.0 → msdev-0.15.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: msdev
-Version: 0.15.0
+Version: 0.15.2
 Summary: Portable nodes and execution environments for msModelSlim development
 Author: msModelSlim Agent Contributors
 License-Expression: MulanPSL-2.0
@@ -44,6 +44,7 @@ git clone https://gitcode.com/rookie_hongchuan/msdev.git
 cd msdev
 python3 -m pip install -e .
 msdev --help
+msdev --version
 ```
 
 The package installs the `msdev` CLI.
@@ -115,13 +116,20 @@ Connect atomically creates a same-named host Env on first use. There is no
 remote agent binary to deploy. Use **`msdev node bootstrap NODE`** only to
 re-check SSH readiness after connect problems.
 
-Build optional static helpers before release or local testing:
+Inspect connectivity for one node or for every registered node (probes run in
+parallel; partial failures exit non-zero):
 
 ```bash
-bash file-helper/build-static.sh
+msdev node status
+msdev node status dev-122
 ```
 
-Packaged artifacts live under `src/msdev/helpers/` (gitignored until built).
+Rename a node together with its same-named host Env, guide files, and SSH
+`Host` alias:
+
+```bash
+msdev node rename dev-122 lab-122
+```
 
 Persistent OpenSSH masters are optional. All SSH from msdev is
 non-interactive: host keys use `accept-new`, and password/passphrase prompts
@@ -171,11 +179,11 @@ msdev env add dev-122-root \
 msdev env open dev-122-root
 ```
 
-Open a human-operated interactive shell in an Env:
+Open an interactive shell in an env. Docker envs enter the container:
 
 ```bash
 msdev env shell dev-122
-msdev env shell dev-122 --cwd /srv/project
+msdev env shell dev-122-docker --cwd /srv/project
 ```
 
 Agent automation should use `msdev exec`, not `env shell`.

{msdev-0.15.0 → msdev-0.15.2}/README.md

@@ -19,6 +19,7 @@ git clone https://gitcode.com/rookie_hongchuan/msdev.git
 cd msdev
 python3 -m pip install -e .
 msdev --help
+msdev --version
 ```
 
 The package installs the `msdev` CLI.
@@ -90,13 +91,20 @@ Connect atomically creates a same-named host Env on first use. There is no
 remote agent binary to deploy. Use **`msdev node bootstrap NODE`** only to
 re-check SSH readiness after connect problems.
 
-Build optional static helpers before release or local testing:
+Inspect connectivity for one node or for every registered node (probes run in
+parallel; partial failures exit non-zero):
 
 ```bash
-bash file-helper/build-static.sh
+msdev node status
+msdev node status dev-122
 ```
 
-Packaged artifacts live under `src/msdev/helpers/` (gitignored until built).
+Rename a node together with its same-named host Env, guide files, and SSH
+`Host` alias:
+
+```bash
+msdev node rename dev-122 lab-122
+```
 
 Persistent OpenSSH masters are optional. All SSH from msdev is
 non-interactive: host keys use `accept-new`, and password/passphrase prompts
@@ -146,11 +154,11 @@ msdev env add dev-122-root \
 msdev env open dev-122-root
 ```
 
-Open a human-operated interactive shell in an Env:
+Open an interactive shell in an env. Docker envs enter the container:
 
 ```bash
 msdev env shell dev-122
-msdev env shell dev-122 --cwd /srv/project
+msdev env shell dev-122-docker --cwd /srv/project
 ```
 
 Agent automation should use `msdev exec`, not `env shell`.

{msdev-0.15.0 → msdev-0.15.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "msdev"
-version = "0.15.0"
+version = "0.15.2"
 description = "Portable nodes and execution environments for msModelSlim development"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -35,7 +35,6 @@ Repository = "https://gitcode.com/rookie_hongchuan/msdev"
 
 [project.scripts]
 msdev = "msdev.cli:main"
-msdevd = "msdev.daemon:main"
 
 [tool.setuptools]
 package-dir = { "" = "src" }
@@ -45,8 +44,6 @@ where = ["src"]
 
 [tool.setuptools.package-data]
 msdev = [
-  "helpers/msdev-file-helper-*",
-  "helpers/msdevd-linux-*",
   "skills/msdev-cli/SKILL.md",
 ]
 

{msdev-0.15.0 → msdev-0.15.2}/src/msdev/__init__.py

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

{msdev-0.15.0 → msdev-0.15.2}/src/msdev/cli.py

@@ -154,8 +154,6 @@ def _provision_request_for_connect(
         if ssh_host_defined(args.name):
             return NodeAddRequest(
                 name=args.name,
-                remote_bin=args.remote_bin,
-                auto_bootstrap=not args.no_auto_bootstrap,
                 force=args.force,
             )
         raise ValueError(
@@ -169,8 +167,6 @@ def _provision_request_for_connect(
         port=args.port,
         identity_file=args.identity_file,
         ssh_host=args.ssh_host,
-        remote_bin=args.remote_bin,
-        auto_bootstrap=not args.no_auto_bootstrap,
         force=bool(
             args.force or has_params
         ),
@@ -204,9 +200,7 @@ def command_node(
         print("local\tregistered\t-")
         for node in service.list().nodes:
             print(
-                f"{node.name}\tregistered\tssh={node.ssh_host}\t"
-                f"auto-bootstrap={'on' if node.auto_bootstrap else 'off'}\t"
-                f"bin={node.remote_bin}"
+                f"{node.name}\tregistered\tssh={node.ssh_host}"
             )
         if args.ssh:
             for host in service.list_ssh_hosts():
@@ -236,12 +230,39 @@ def command_node(
         if removed:
             print("removed environments: " + ", ".join(removed))
         return 0
-    if action == "status":
-        print(f"node: {args.name}")
-        _print_json(service.status(args.name))
+    if action == "rename":
+        node = service.rename(args.name, args.new_name)
+        print(f"renamed node {args.name} -> {node.name} (ssh={node.ssh_host})")
         return 0
+    if action == "status":
+        if args.name:
+            print(f"node: {args.name}")
+            _print_json(service.status(args.name))
+            return 0
+        result = service.status_all()
+        for item in result.items:
+            if item.error is not None:
+                print(
+                    f"{item.node} ({item.ssh_host}): unreachable: {item.error}",
+                    file=sys.stderr,
+                )
+            else:
+                info = item.info if isinstance(item.info, dict) else {}
+                parts: list[str] = []
+                hostname = str(info.get("hostname") or "")
+                ip = str(info.get("ip") or "")
+                target = str(info.get("target") or "")
+                if hostname:
+                    parts.append(f"hostname={hostname}")
+                if ip:
+                    parts.append(f"ip={ip}")
+                if target and target not in {hostname, ip, item.ssh_host}:
+                    parts.append(f"target={target}")
+                detail = (" " + " ".join(parts)) if parts else ""
+                print(f"{item.node} ({item.ssh_host}): reachable{detail}")
+        return result.exit_code
     if action == "bootstrap":
-        result = service.bootstrap(args.name, package_path=args.package)
+        result = service.bootstrap(args.name)
         _print_json(result)
         return 0
     if action in {"connect", "disconnect"}:
@@ -281,8 +302,8 @@ def command_node(
                 key = getattr(item, "key", None)
                 if key:
                     suffix = f"(persist={item.persist}, key={key})"
-                if item.agent_ready:
-                    suffix = suffix[:-1] + ", agent=ready)"
+                if item.ssh_ready:
+                    suffix = suffix[:-1] + ", ssh=ready)"
                 print(
                     f"{item.node}: {item.state} to {item.ssh_host} "
                     f"{suffix}"
@@ -573,6 +594,12 @@ def build_parser() -> argparse.ArgumentParser:
         default=None,
         help="override local node/environment registry path",
     )
+    parser.add_argument(
+        "--version",
+        action="version",
+        version=f"%(prog)s {__version__}",
+        help="print the msdev version and exit",
+    )
     sub = parser.add_subparsers(dest="command", required=True)
 
     node = sub.add_parser("node", help="manage SSH connection nodes")
@@ -615,19 +642,26 @@ def build_parser() -> argparse.ArgumentParser:
         action="store_true",
         help="also remove every environment on this node",
     )
-    node_status = node_sub.add_parser("status")
-    node_status.add_argument("name")
+    node_rename = node_sub.add_parser(
+        "rename",
+        help="rename a node, its host environment, and a matching SSH Host alias",
+    )
+    node_rename.add_argument("name")
+    node_rename.add_argument("new_name")
+    node_status = node_sub.add_parser(
+        "status",
+        help="check node connectivity (every registered SSH node by default)",
+    )
+    node_status.add_argument(
+        "name",
+        nargs="?",
+        help="check one node; omit to check every registered SSH node",
+    )
     node_bootstrap = node_sub.add_parser(
         "bootstrap",
         help="ensure SSH reachability / ControlMaster for the node",
     )
     node_bootstrap.add_argument("name")
-    node_bootstrap.add_argument(
-        "--package",
-        type=Path,
-        default=None,
-        help="ignored (kept for compatibility; remote msdevd is no longer deployed)",
-    )
     node_connect = node_sub.add_parser(
         "connect",
         help=(
@@ -659,17 +693,11 @@ def build_parser() -> argparse.ArgumentParser:
         "--ssh-host",
         help="legacy shorthand for user@hostname when writing ~/.ssh/config",
     )
-    node_connect.add_argument("--remote-bin", default="~/.local/bin/msdevd")
     node_connect.add_argument(
         "--force",
         action="store_true",
         help="replace an existing node and its same-named host environment",
     )
-    node_connect.add_argument(
-        "--no-auto-bootstrap",
-        action="store_true",
-        help="ignored (kept for compatibility; no remote agent deploy)",
-    )
     node_connect.add_argument(
         "--password",
         default=None,
@@ -749,7 +777,7 @@ def build_parser() -> argparse.ArgumentParser:
     environment_inspect.add_argument("name")
     environment_open = environment_sub.add_parser(
         "open",
-        help="establish the shared environment session (runs setup once)",
+        help="check that the environment is ready (setup runs on each exec)",
     )
     environment_open.add_argument("name")
     environment_guide = environment_sub.add_parser("guide")
@@ -757,7 +785,10 @@ def build_parser() -> argparse.ArgumentParser:
     environment_guide_action = environment_guide.add_mutually_exclusive_group()
     environment_guide_action.add_argument("--write", metavar="FILE")
     environment_guide_action.add_argument("--delete", action="store_true")
-    environment_shell = environment_sub.add_parser("shell")
+    environment_shell = environment_sub.add_parser(
+        "shell",
+        help="open an interactive shell in the environment (including Docker)",
+    )
     environment_shell.add_argument("name")
     environment_shell.add_argument("--cwd")
     environment_put = environment_sub.add_parser(

{msdev-0.15.0 → msdev-0.15.2}/src/msdev/core/config.py

@@ -354,20 +354,3 @@ def config_home() -> Path:
         return Path(override).expanduser()
     base = os.environ.get("XDG_CONFIG_HOME")
     return Path(base).expanduser() / "msdev" if base else Path.home() / ".config" / "msdev"
-
-
-def data_home() -> Path:
-    override = os.environ.get("MSDEV_DATA_HOME")
-    if override:
-        return Path(override).expanduser()
-    base = os.environ.get("XDG_DATA_HOME")
-    return Path(base).expanduser() / "msdevd" if base else Path.home() / ".local" / "share" / "msdevd"
-
-
-def default_socket_path() -> Path:
-    override = os.environ.get("MSDEVD_SOCKET")
-    if override:
-        return Path(override).expanduser()
-    # SSH sessions frequently lack XDG_RUNTIME_DIR while systemd user services
-    # set it to /run/user/<uid>. A stable per-user path keeps both sides aligned.
-    return data_home() / "msdevd.sock"

{msdev-0.15.0 → msdev-0.15.2}/src/msdev/core/guides.py

@@ -89,6 +89,18 @@ class ResourceGuideStore:
         except FileNotFoundError:
             return False
 
+    def rename(self, old: str, new: str) -> bool:
+        """Move a guide file. Return whether one existed."""
+        source = self.path(old)
+        if not source.exists():
+            return False
+        destination = self.path(new)
+        if destination.exists():
+            raise ValueError(f"guide already exists for {new!r}")
+        destination.parent.mkdir(parents=True, exist_ok=True)
+        os.replace(source, destination)
+        return True
+
 
 class NodeGuideStore(ResourceGuideStore):
     def __init__(self, root: Path | None = None):

{msdev-0.15.0 → msdev-0.15.2}/src/msdev/core/inventory.py

@@ -44,7 +44,7 @@ def _utc_now() -> str:
 
 
 class Inventory:
-    """SQLite inventory owned by one user-level daemon."""
+    """SQLite inventory for model artifacts and replicas."""
 
     def __init__(self, data_dir: Path):
         self.data_dir = data_dir.expanduser()

{msdev-0.15.0 → msdev-0.15.2}/src/msdev/core/limits.py

@@ -10,9 +10,15 @@ MAX_RPC_RESPONSE_BYTES = 32 * 1024 * 1024
 MAX_RPC_ERROR_BYTES = 1 * 1024 * 1024
 
 DEFAULT_EXEC_TIMEOUT_SECONDS = -1.0
-EXEC_RPC_COMPLETION_GRACE_SECONDS = 10.0
 RPC_PROCESS_CLEANUP_GRACE_SECONDS = 2.0
 
+# Infrastructure budget for ControlMaster probe / discard / (re)connect.
+# Separate from exec command deadline (DEFAULT_EXEC_TIMEOUT_SECONDS = -1).
+DEFAULT_SSH_SETUP_TIMEOUT_SECONDS = 15.0
+DEFAULT_SSH_MUX_PROBE_TIMEOUT_SECONDS = 5.0
+# Per-node budget for ``msdev node status`` (parallel; no ControlMaster setup).
+DEFAULT_SSH_STATUS_TIMEOUT_SECONDS = 3.0
+
 
 def validate_exec_timeout_seconds(value: Any) -> float:
     if (
@@ -26,6 +32,18 @@ def validate_exec_timeout_seconds(value: Any) -> float:
         )
     return float(value)
 
+
+def validate_positive_timeout_seconds(value: Any, *, label: str) -> float:
+    if (
+        isinstance(value, bool)
+        or not isinstance(value, (int, float))
+        or not math.isfinite(value)
+        or value <= 0
+    ):
+        raise ValueError(f"{label} must be a positive finite number")
+    return float(value)
+
+
 # Budget for conservative six-byte JSON escaping:
 # 8 MiB content * 6 + 64 maps * 2 paths * 4 KiB * 6 = 51 MiB.
 # The remaining 13 MiB covers the JSON-RPC envelope and structural overhead.

{msdev-0.15.0 → msdev-0.15.2}/src/msdev/core/resources.py

@@ -21,19 +21,17 @@ def _required(value: str, label: str) -> str:
     return value
 
 
+_NODE_LEGACY_FIELDS = frozenset({"remote_bin", "auto_bootstrap"})
+
+
 @dataclass(frozen=True)
 class Node:
     name: str
     ssh_host: str
-    remote_bin: str = "~/.local/bin/msdevd"
-    auto_bootstrap: bool = True
 
     def __post_init__(self) -> None:
         _required(self.name, "node name")
         _required(self.ssh_host, "SSH host")
-        _required(self.remote_bin, "remote binary")
-        if type(self.auto_bootstrap) is not bool:
-            raise ValueError("auto_bootstrap must be a boolean")
 
 
 @dataclass(frozen=True)
@@ -124,7 +122,12 @@ class _ResourceStore:
         environments: dict[str, dict[str, Any]] = {}
         try:
             for name, raw in value["nodes"].items():
-                node = Node(**raw)
+                node_raw = {
+                    key: item
+                    for key, item in dict(raw).items()
+                    if key not in _NODE_LEGACY_FIELDS
+                }
+                node = Node(**node_raw)
                 if node.name != name:
                     raise ValueError(f"node key {name!r} does not match its name")
                 nodes[name] = asdict(node)
@@ -248,6 +251,47 @@ class NodeStore(_ResourceStore):
             self._save(self._normalize_saved(value))
             return references
 
+    def rename(self, old: str, new: str) -> Node:
+        """Rename a node and retarget environments that reference it.
+
+        The same-named host environment is renamed with the node. ``ssh_host``
+        is updated only when it was the old node name.
+        """
+        if old == "local" or new == "local":
+            raise ValueError("node name 'local' is reserved")
+        _required(old, "node name")
+        _required(new, "node name")
+        if old == new:
+            return self.get(old)
+        with _exclusive_file_lock(self.lock_path):
+            value = self._load_unlocked()
+            if old not in value["nodes"]:
+                raise KeyError(f"unknown node: {old}")
+            if new in value["nodes"]:
+                raise ValueError(f"node {new!r} already exists")
+            environments = value["environments"]
+            if old in environments and new in environments:
+                raise ValueError(f"environment {new!r} already exists")
+            raw = dict(value["nodes"].pop(old))
+            ssh_host = raw["ssh_host"]
+            if ssh_host == old:
+                ssh_host = new
+            node = Node(name=new, ssh_host=ssh_host)
+            value["nodes"][new] = asdict(node)
+            rewritten: dict[str, Any] = {}
+            for name, environment in environments.items():
+                updated = dict(environment)
+                if updated.get("node") == old:
+                    updated["node"] = new
+                if name == old:
+                    updated["name"] = new
+                    rewritten[new] = updated
+                else:
+                    rewritten[name] = updated
+            value["environments"] = rewritten
+            self._save(self._normalize_saved(value))
+            return node
+
 
 class EnvironmentStore(_ResourceStore):
     def add(self, environment: Environment, *, force: bool = False) -> None:

{msdev-0.15.0 → msdev-0.15.2}/src/msdev/core/services/context.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from pathlib import Path
 from typing import Any, Protocol
 
 from ..resources import Environment, EnvironmentStore, Node, NodeStore
@@ -24,11 +23,7 @@ class TransportFactory(Protocol):
 
 
 class BootstrapNode(Protocol):
-    def __call__(
-        self,
-        node: Node,
-        package_path: Path | None = None,
-    ) -> dict[str, Any]: ...
+    def __call__(self, node: Node) -> dict[str, Any]: ...
 
 
 def create_default_transport(

{msdev-0.15.0 → msdev-0.15.2}/src/msdev/core/services/environment.py

@@ -189,13 +189,12 @@ class EnvironmentService:
     def open(self, name: str) -> dict[str, Any]:
         environment = self._environment(name)
         transport = self.context.transport_for_environment(environment.name)
-        open_env = getattr(transport, "_ensure_env_open", None)
-        if open_env is None:
-            raise TypeError("environment transport does not support env.open")
-        open_env()
-        result = transport.call("env.status", {"_env": environment.to_agent_spec()})
+        connect = getattr(transport, "connect", None)
+        if connect is not None:
+            connect()
+        result = transport.call("env.open", {"_env": environment.to_agent_spec()})
         if not isinstance(result, dict):
-            raise RuntimeError("env.status returned a non-object result")
+            raise RuntimeError("env.open returned a non-object result")
         return result
 
     def remove(self, name: str) -> str: