rrun-cli 0.2.0__tar.gz → 0.2.2__tar.gz

{rrun_cli-0.2.0/src/rrun_cli.egg-info → rrun_cli-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rrun-cli
-Version: 0.2.0
+Version: 0.2.2
 Summary: Run local scripts on remote machines over SSH via stdin pipes — no escaping/encoding hell. Supports python/powershell/bash, with a unified remote Python 3.12 venv provisioner.
 Author: waqiju
 License-Expression: MIT
@@ -106,7 +106,7 @@ The full set of hard-won conventions and internals: [docs/remote-exec-convention
 | `rrun doctor <host\|--all>` | Health-check ssh + auth + remote python (`--all` opens real connections to every machine) |
 | `rrun close [<host>\|--all]` | Close ssh ControlMaster multiplexed connections |
 
-Useful `exec` flags: `--lang bash|powershell|python`, `--workdir`, `--env K=V`, `--timeout`, `--python <path>` (skip detection), `--no-mux`, `-q`.
+Useful `exec` flags: `--lang bash|powershell|python`, `--workdir`/`--env K=V` (not for Windows+python), `--timeout`, `--python <path>` (skip detection), `--no-mux`, `-q`.
 
 ### Exit codes
 
@@ -153,7 +153,7 @@ For `python` scripts, rrun requires a **3.12.x** interpreter on the remote, prob
 2. Standalone base: `...\python312\python.exe` / `~/.remote-machine/python312/bin/python3`
 3. Existing installs: `C:\Python\Python312\python.exe` / `python3.12` on PATH
 
-If none match, run `rrun setup <host>`. It is idempotent and non-destructive: if the machine lacks Python 3.12, a [python-build-standalone](https://github.com/astral-sh/python-build-standalone) tarball is downloaded to the local cache (`~/.cache/rrun/`) and streamed over ssh stdin — no registry, no PATH changes, no admin rights, and the remote never touches GitHub. The venv gets its own `pip.ini`/`pip.conf` (global pip config untouched) plus the standard packages from the bundled `remote-requirements.txt` (override with `~/.rrun/remote-requirements.txt`).
+If none match, run `rrun setup <host>`. It is idempotent and non-destructive: if the machine lacks a **venv-capable** Python 3.12 — none installed, or the interpreter cannot create venvs (Debian/Ubuntu split `ensurepip` into the separate `python3.12-venv` package) — a [python-build-standalone](https://github.com/astral-sh/python-build-standalone) tarball (Windows/macOS/Linux) is downloaded to the local cache (`~/.cache/rrun/`) and streamed over ssh stdin — no registry, no PATH changes, no admin rights, and the remote never touches GitHub. A half-created venv left by an interrupted earlier setup (python runs but pip is missing) is detected and recreated automatically. `rrun doctor <host>` reports all of these states before you provision. The venv gets its own `pip.ini`/`pip.conf` (global pip config untouched) plus the standard packages from the bundled `remote-requirements.txt` (override with `~/.rrun/remote-requirements.txt`).
 
 ## Security
 

{rrun_cli-0.2.0 → rrun_cli-0.2.2}/README.md

@@ -78,7 +78,7 @@ The full set of hard-won conventions and internals: [docs/remote-exec-convention
 | `rrun doctor <host\|--all>` | Health-check ssh + auth + remote python (`--all` opens real connections to every machine) |
 | `rrun close [<host>\|--all]` | Close ssh ControlMaster multiplexed connections |
 
-Useful `exec` flags: `--lang bash|powershell|python`, `--workdir`, `--env K=V`, `--timeout`, `--python <path>` (skip detection), `--no-mux`, `-q`.
+Useful `exec` flags: `--lang bash|powershell|python`, `--workdir`/`--env K=V` (not for Windows+python), `--timeout`, `--python <path>` (skip detection), `--no-mux`, `-q`.
 
 ### Exit codes
 
@@ -125,7 +125,7 @@ For `python` scripts, rrun requires a **3.12.x** interpreter on the remote, prob
 2. Standalone base: `...\python312\python.exe` / `~/.remote-machine/python312/bin/python3`
 3. Existing installs: `C:\Python\Python312\python.exe` / `python3.12` on PATH
 
-If none match, run `rrun setup <host>`. It is idempotent and non-destructive: if the machine lacks Python 3.12, a [python-build-standalone](https://github.com/astral-sh/python-build-standalone) tarball is downloaded to the local cache (`~/.cache/rrun/`) and streamed over ssh stdin — no registry, no PATH changes, no admin rights, and the remote never touches GitHub. The venv gets its own `pip.ini`/`pip.conf` (global pip config untouched) plus the standard packages from the bundled `remote-requirements.txt` (override with `~/.rrun/remote-requirements.txt`).
+If none match, run `rrun setup <host>`. It is idempotent and non-destructive: if the machine lacks a **venv-capable** Python 3.12 — none installed, or the interpreter cannot create venvs (Debian/Ubuntu split `ensurepip` into the separate `python3.12-venv` package) — a [python-build-standalone](https://github.com/astral-sh/python-build-standalone) tarball (Windows/macOS/Linux) is downloaded to the local cache (`~/.cache/rrun/`) and streamed over ssh stdin — no registry, no PATH changes, no admin rights, and the remote never touches GitHub. A half-created venv left by an interrupted earlier setup (python runs but pip is missing) is detected and recreated automatically. `rrun doctor <host>` reports all of these states before you provision. The venv gets its own `pip.ini`/`pip.conf` (global pip config untouched) plus the standard packages from the bundled `remote-requirements.txt` (override with `~/.rrun/remote-requirements.txt`).
 
 ## Security
 

{rrun_cli-0.2.0 → rrun_cli-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rrun-cli"
-version = "0.2.0"
+version = "0.2.2"
 description = "Run local scripts on remote machines over SSH via stdin pipes — no escaping/encoding hell. Supports python/powershell/bash, with a unified remote Python 3.12 venv provisioner."
 readme = "README.md"
 license = "MIT"

{rrun_cli-0.2.0 → rrun_cli-0.2.2}/src/rrun/__init__.py

@@ -11,7 +11,7 @@ try:
 
     __version__ = _pkg_version("rrun-cli")
 except Exception:  # noqa: BLE001 - 未安装（源码直跑）时回退
-    __version__ = "0.2.0"
+    __version__ = "0.2.2"
 
 from .doctor import DoctorResult, check_machine
 from .executor import (

{rrun_cli-0.2.0 → rrun_cli-0.2.2}/src/rrun/__main__.py

@@ -41,6 +41,7 @@ import sys
 import time
 from pathlib import Path
 
+from . import __version__
 from .doctor import check_machine
 from .executor import RRUN_HOME, _check_ascii, _ssh_run, close_mux, run
 from .registry import load_machines, resolve_machine, scan_sources
@@ -277,6 +278,7 @@ def main() -> None:
     ap = argparse.ArgumentParser(
         prog="rrun",
         description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
+    ap.add_argument("--version", action="version", version=f"%(prog)s {__version__}")
     sub = ap.add_subparsers(dest="subcmd", required=True)
 
     ep = sub.add_parser("exec", help="execute a local script / inline content on a remote machine")
@@ -287,9 +289,9 @@ def main() -> None:
     ep.add_argument("-c", "--content", help="inline script content (archived to ~/.rrun/drops/)")
     ep.add_argument("args", nargs="*",
                     help="script arguments (ASCII only; use -- to separate from options)")
-    ep.add_argument("--workdir", help="remote working directory (bash/powershell only)")
+    ep.add_argument("--workdir", help="remote working directory (not for Windows+python)")
     ep.add_argument("--env", action="append", metavar="KEY=VAL",
-                    help="remote environment variable (repeatable; ASCII only)")
+                    help="remote environment variable (repeatable; ASCII only; not for Windows+python)")
     ep.add_argument("--timeout", type=float, help="local timeout in seconds (exit=124 on expiry)")
     ep.add_argument("--python", dest="python", help="remote python path (skips auto-detection)")
     ep.add_argument("--no-utf8", action="store_true", help="do not pass -X utf8 to remote python")

{rrun_cli-0.2.0 → rrun_cli-0.2.2}/src/rrun/doctor.py

@@ -8,16 +8,19 @@ import time
 from dataclasses import dataclass, field
 
 from .executor import (
+    POSIX_BASE_CANDIDATES,
     POSIX_PYTHON_CANDIDATES,
     PS_REMOTE_CMD,
     VENV_PY_POSIX,
     VENV_PY_WIN,
+    WINDOWS_BASE_CANDIDATES,
     WINDOWS_PYTHON_CANDIDATES,
     _ssh_run,
     build_ps_wrapper,
+    check_remote_pip,
     probe_python,
 )
-from .registry import resolve_machine
+from .registry import Machine, resolve_machine
 
 
 @dataclass
@@ -33,6 +36,20 @@ class DoctorResult:
     message: str = ""                                   # 失败原因 / 建议
 
 
+def _venv_missing_guidance(machine: Machine, found_version: str, mux: bool) -> str:
+    """venv 缺失时的指引：审查基座资格（ensurepip），说明 setup 将会走哪条路。"""
+    base_cands = WINDOWS_BASE_CANDIDATES if machine.is_windows else POSIX_BASE_CANDIDATES
+    base = probe_python(machine, base_cands, mux, require_ensurepip=True)
+    if base:
+        head = "unified venv missing" if found_version else "no python 3.12 found"
+        return f"{head}; run: rrun setup {machine.name}"
+    hint = " (Debian/Ubuntu: sudo apt install python3.12-venv)" if not machine.is_windows else ""
+    if found_version:
+        return (f"unified venv missing; base python {found_version} lacks ensurepip{hint}; "
+                f"rrun setup {machine.name} will install a standalone python")
+    return f"no python 3.12 found; rrun setup {machine.name} will install a standalone python"
+
+
 def check_machine(host: str, mux: bool = True, timeout: float = 30.0) -> DoctorResult:
     """检查单台机器：ssh 回显 → 远端 python 探测。不抛异常，结果全部汇入 DoctorResult。"""
     try:
@@ -80,9 +97,13 @@ def check_machine(host: str, mux: bool = True, timeout: float = 30.0) -> DoctorR
                 "/.remote-machine/venv/bin/python")
         tag = "unified venv" if r.is_unified_venv else "fallback (not the unified venv)"
         r.checks.append(f"python {r.python_version} at {r.python_path} [{tag}]")
-        if not r.is_unified_venv:
-            r.message = f"unified venv missing; run: rrun setup {machine.name}"
+        if r.is_unified_venv:
+            if not check_remote_pip(machine, r.python_path, mux):
+                r.message = f"unified venv is broken (pip missing); repair: rrun setup {machine.name}"
+                return r
+        else:
+            r.message = _venv_missing_guidance(machine, r.python_version, mux)
     else:
-        r.message = f"no python 3.12 found; run: rrun setup {machine.name}"
+        r.message = _venv_missing_guidance(machine, "", mux)
     r.ok = r.ssh_ok and bool(hit) and r.is_unified_venv
     return r

{rrun_cli-0.2.0 → rrun_cli-0.2.2}/src/rrun/executor.py

@@ -205,27 +205,33 @@ _PY_VER_PRINT_CODE = "import sys;print(*sys.version_info[:3],sep=chr(46))"
 _PY_VER_CHECK_CODE = (
     _PY_VER_PRINT_CODE + f";sys.exit(0 if sys.version_info[:2]=={REQUIRED_PY_MAJOR_MINOR} else 1)"
 )
+# 基座资格加码：ensurepip 必须可 import（Debian/Ubuntu 把 ensurepip 整体拆进 python3.x-venv
+# 包，缺失时系统 python 版本对却建不了 venv——不算合格基座）。import 失败即非零退出，候选跳过。
+_PY_BASE_CHECK_CODE = "import ensurepip;" + _PY_VER_CHECK_CODE
 
 
-def _ps_probe_script(candidates) -> str:
-    """Windows 探测脚本：逐候选校验版本==3.12.x，命中输出 path|x.y.z，全灭 exit 1。"""
+def _ps_probe_script(candidates, require_ensurepip: bool = False) -> str:
+    """Windows 探测脚本：逐候选校验（版本==3.12.x，require_ensurepip 时加 ensurepip 资格），
+    命中输出 path|x.y.z，全灭 exit 1。"""
+    check = _PY_BASE_CHECK_CODE if require_ensurepip else _PY_VER_CHECK_CODE
     arr = ",".join(_ps_quote(c) for c in candidates)
     return (
         f"foreach($c in @({arr})){{"
         "if(Test-Path $c){"
-        f"$v=& $c -X utf8 -c \"{_PY_VER_CHECK_CODE}\" 2>$null;"
+        f"$v=& $c -X utf8 -c \"{check}\" 2>$null;"
         "if($LASTEXITCODE -eq 0){Write-Output ($c+'|'+($v -join ''));exit 0}"
         "}}"
     )
 
 
-def _bash_probe_script(candidates) -> str:
+def _bash_probe_script(candidates, require_ensurepip: bool = False) -> str:
     """posix 探测脚本：同 Windows 语义。候选为可信常量（$HOME 需保留展开，不可 shlex.quote）。"""
+    check = _PY_BASE_CHECK_CODE if require_ensurepip else _PY_VER_CHECK_CODE
     items = " ".join(f'"{c}"' for c in candidates)
     return (
         f"for p in {items}; do\n"
         '  command -v "$p" >/dev/null 2>&1 || continue\n'
-        f'  v=$("$p" -X utf8 -c \'{_PY_VER_CHECK_CODE}\' 2>/dev/null) || continue\n'
+        f'  v=$("$p" -X utf8 -c \'{check}\' 2>/dev/null) || continue\n'
         '  echo "$p|$v"\n'
         "  exit 0\n"
         "done\n"
@@ -233,14 +239,19 @@ def _bash_probe_script(candidates) -> str:
     )
 
 
-def probe_python(machine: Machine, candidates, mux: bool = True) -> "tuple[str, str] | None":
-    """在候选中找版本==3.12.x 的远端 python，单次往返；返回 (路径, 版本)，全灭返回 None。"""
+def probe_python(machine: Machine, candidates, mux: bool = True,
+                 require_ensurepip: bool = False) -> "tuple[str, str] | None":
+    """在候选中找版本==3.12.x 的远端 python，单次往返；返回 (路径, 版本)，全灭返回 None。
+
+    require_ensurepip=True 用于 setup/doctor 的基座资格审查：无 ensurepip 的 python
+    建不了 venv（Debian/Ubuntu 拆包 python3.x-venv 的典型场景），跳过。
+    """
     if machine.is_windows:
         rc, out, _, _ = _ssh_run(machine, PS_REMOTE_CMD,
-                                 build_ps_wrapper(_ps_probe_script(candidates)), 60, mux)
+                                 build_ps_wrapper(_ps_probe_script(candidates, require_ensurepip)), 60, mux)
     else:
         rc, out, _, _ = _ssh_run(machine, "bash -s",
-                                 _bash_probe_script(candidates).encode("utf-8"), 60, mux)
+                                 _bash_probe_script(candidates, require_ensurepip).encode("utf-8"), 60, mux)
     if rc != 0 or not out.strip():
         return None
     line = out.decode("utf-8", "replace").strip().splitlines()[-1].strip()
@@ -262,6 +273,18 @@ def probe_python_version(machine: Machine, python_path: str, mux: bool = True) -
     return out.decode("utf-8", "replace").strip().splitlines()[-1].strip()
 
 
+def check_remote_pip(machine: Machine, python_path: str, mux: bool = True) -> bool:
+    """检查指定远端 python 是否带 pip（半拉子 venv 检测：venv python 能跑，
+    但若创建时 ensurepip 失败过，venv 里就没有 pip）。"""
+    if machine.is_windows:
+        payload = build_ps_wrapper(f"& {_ps_quote(python_path)} -m pip --version *>$null")
+        rc, _, _, _ = _ssh_run(machine, PS_REMOTE_CMD, payload, 30, mux)
+    else:
+        rc, _, _, _ = _ssh_run(machine, "bash -s",
+                               f'"{python_path}" -m pip --version >/dev/null 2>&1\n'.encode(), 30, mux)
+    return rc == 0
+
+
 def detect_remote_python(machine: Machine, override: str = "", mux: bool = True) -> "tuple[str, str]":
     """解析远端 python，返回 (路径, 版本)。基线锁 3.12；machines.json "python" 字段/参数可覆盖（跳过校验）。"""
     key = (machine.ip, override or machine.python)
@@ -329,7 +352,7 @@ def run(host: str, lang: str = "", file: str = "", content: str = "", args=(),
             py_cmd += " " + " ".join(shlex.quote(a) for a in args)
         if env or workdir:
             if machine.is_windows:
-                raise ValueError("workdir/env are not supported for Windows+python yet; use os.chdir/os.environ inside the script")
+                raise ValueError("workdir/env are not supported for Windows+python (by design); use os.chdir/os.environ inside the script")
             remote_cmd = _posix_prefix(workdir, env) + py_cmd
         else:
             remote_cmd = py_cmd

{rrun_cli-0.2.0 → rrun_cli-0.2.2}/src/rrun/setup.py

@@ -38,6 +38,7 @@ from .executor import (
     _check_ascii,
     _ssh_run,
     build_ps_wrapper,
+    check_remote_pip,
     probe_python,
     probe_python_version,
 )
@@ -54,6 +55,8 @@ PBS_ASSETS = {
     ("Windows", "x86_64"): f"cpython-{PBS_VER}+{PBS_TAG}-x86_64-pc-windows-msvc-install_only.tar.gz",
     ("Mac", "arm64"): f"cpython-{PBS_VER}+{PBS_TAG}-aarch64-apple-darwin-install_only.tar.gz",
     ("Mac", "x86_64"): f"cpython-{PBS_VER}+{PBS_TAG}-x86_64-apple-darwin-install_only.tar.gz",
+    ("Linux", "x86_64"): f"cpython-{PBS_VER}+{PBS_TAG}-x86_64-unknown-linux-gnu-install_only.tar.gz",
+    ("Linux", "aarch64"): f"cpython-{PBS_VER}+{PBS_TAG}-aarch64-unknown-linux-gnu-install_only.tar.gz",
 }
 PBS_DOWNLOAD_BASE = f"https://github.com/astral-sh/python-build-standalone/releases/download/{PBS_TAG}/"
 CACHE_DIR = Path(os.environ.get("XDG_CACHE_HOME", "") or Path.home() / ".cache") / "rrun"
@@ -109,6 +112,13 @@ def _ensure_local_tarball(os_name: str, arch: str) -> Path:
     return path
 
 
+def _pbs_platform(uname_sm: str) -> "tuple[str, str]":
+    """`uname -sm` 输出 -> PBS_ASSETS 键（'Linux x86_64'->('Linux','x86_64')，'Darwin arm64'->('Mac','arm64')）。"""
+    parts = uname_sm.split()
+    sys_name, arch = (parts + ["", ""])[:2]
+    return {"Darwin": "Mac", "Linux": "Linux"}.get(sys_name, sys_name), arch
+
+
 def _install_standalone(machine: Machine, mux: bool, timeout: float) -> str:
     """推送 standalone python 到远端并解压，返回基座 python 路径。"""
     if machine.is_windows:
@@ -123,11 +133,10 @@ def _install_standalone(machine: Machine, mux: bool, timeout: float) -> str:
         )
         base_py = BASE_PY_WIN
     else:
-        rc, out, _, _ = _ssh_run(machine, "uname -m", b"", 30, mux)
-        arch = out.decode("utf-8", "replace").strip()
-        os_name = "Mac"
+        rc, out, _, _ = _ssh_run(machine, "uname -sm", b"", 30, mux)
+        os_name, arch = _pbs_platform(out.decode("utf-8", "replace"))
         if (os_name, arch) not in PBS_ASSETS:
-            raise RuntimeError(f"[{machine.name}] unsupported architecture: {arch}")
+            raise RuntimeError(f"[{machine.name}] no standalone python build for platform: {os_name} {arch}")
         extract_cmd = (
             'tools="$HOME/.remote-machine"; mkdir -p "$tools" '
             '&& rm -rf "$tools/python312" '
@@ -149,7 +158,11 @@ def _install_standalone(machine: Machine, mux: bool, timeout: float) -> str:
 
 
 def _build_ps_setup(base_py: str, pkgs: "list[str]", force: bool) -> str:
-    """Windows 一键脚本：建 venv（缺/force 时）→ pip.ini → 装依赖 → 自检。全 ASCII。"""
+    """Windows 一键脚本：建 venv（缺/坏/force 时）→ pip.ini → 装依赖 → 自检。全 ASCII。
+
+    “坏” = bin/python 在但 pip 不在：上次 venv 创建中途失败（如 ensurepip 缺失）
+    留下的半拉子 venv，直接重建（幂等自愈）。
+    """
     pkg_args = " ".join(pkgs)
     imports = ";".join(f"import {_req_import_name(p)}" for p in pkgs) or "pass"
     force_lit = "$true" if force else "$false"
@@ -159,6 +172,10 @@ $venv="$tools\\venv"
 $venvPy="$venv\\Scripts\\python.exe"
 New-Item -ItemType Directory -Force $tools | Out-Null
 if({force_lit} -and (Test-Path $venv)){{Remove-Item -Recurse -Force $venv}}
+if(Test-Path $venvPy){{
+  & $venvPy -m pip --version *>$null
+  if($LASTEXITCODE -ne 0){{Remove-Item -Recurse -Force $venv}}
+}}
 if(-not (Test-Path $venvPy)){{
   if('{base_py}' -eq ''){{Write-Error "no base python";exit 1}}
   & '{base_py}' -m venv $venv
@@ -184,6 +201,9 @@ tools="$HOME/.remote-machine"
 venv="$tools/venv"
 mkdir -p "$tools"
 if [ "{'1' if force else '0'}" = "1" ]; then rm -rf "$venv"; fi
+if [ -x "$venv/bin/python" ] && ! "$venv/bin/python" -m pip --version >/dev/null 2>&1; then
+  rm -rf "$venv"
+fi
 if [ ! -x "$venv/bin/python" ]; then
   "{base_py}" -m venv "$venv"
 fi
@@ -209,13 +229,20 @@ def setup_machine(host: str, force: bool = False, mux: bool = True,
         base_cands = WINDOWS_BASE_CANDIDATES if machine.is_windows else POSIX_BASE_CANDIDATES
 
         hit = probe_python(machine, [venv_py], mux)
-        need_create = force or not hit
+        # 半拉子 venv（python 能跑但 pip 不在——上次创建中途失败的残留）也视为待重建；
+        # 否则远端脚本删掉坏 venv 后会拿空 base_py 去重建，必然失败
+        venv_broken = bool(hit) and not check_remote_pip(machine, hit[0], mux)
+        need_create = force or not hit or venv_broken
         base_py = ""
         if need_create:
-            base_hit = probe_python(machine, base_cands, mux)
+            # 基座资格：版本 3.12 且带 ensurepip（缺 ensurepip 的系统 python 建不了 venv，
+            # Debian/Ubuntu 未装 python3.x-venv 的典型场景）——不合格则装 standalone 基座
+            base_hit = probe_python(machine, base_cands, mux, require_ensurepip=True)
             if base_hit:
                 base_py = base_hit[0]
             else:
+                print(f"[setup] [{machine.name}] no venv-capable python 3.12 base found; "
+                      f"installing standalone python ...", file=sys.stderr)
                 base_py = _install_standalone(machine, mux, timeout)
                 result.installed_standalone = True
             result.created_venv = True

{rrun_cli-0.2.0 → rrun_cli-0.2.2/src/rrun_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rrun-cli
-Version: 0.2.0
+Version: 0.2.2
 Summary: Run local scripts on remote machines over SSH via stdin pipes — no escaping/encoding hell. Supports python/powershell/bash, with a unified remote Python 3.12 venv provisioner.
 Author: waqiju
 License-Expression: MIT
@@ -106,7 +106,7 @@ The full set of hard-won conventions and internals: [docs/remote-exec-convention
 | `rrun doctor <host\|--all>` | Health-check ssh + auth + remote python (`--all` opens real connections to every machine) |
 | `rrun close [<host>\|--all]` | Close ssh ControlMaster multiplexed connections |
 
-Useful `exec` flags: `--lang bash|powershell|python`, `--workdir`, `--env K=V`, `--timeout`, `--python <path>` (skip detection), `--no-mux`, `-q`.
+Useful `exec` flags: `--lang bash|powershell|python`, `--workdir`/`--env K=V` (not for Windows+python), `--timeout`, `--python <path>` (skip detection), `--no-mux`, `-q`.
 
 ### Exit codes
 
@@ -153,7 +153,7 @@ For `python` scripts, rrun requires a **3.12.x** interpreter on the remote, prob
 2. Standalone base: `...\python312\python.exe` / `~/.remote-machine/python312/bin/python3`
 3. Existing installs: `C:\Python\Python312\python.exe` / `python3.12` on PATH
 
-If none match, run `rrun setup <host>`. It is idempotent and non-destructive: if the machine lacks Python 3.12, a [python-build-standalone](https://github.com/astral-sh/python-build-standalone) tarball is downloaded to the local cache (`~/.cache/rrun/`) and streamed over ssh stdin — no registry, no PATH changes, no admin rights, and the remote never touches GitHub. The venv gets its own `pip.ini`/`pip.conf` (global pip config untouched) plus the standard packages from the bundled `remote-requirements.txt` (override with `~/.rrun/remote-requirements.txt`).
+If none match, run `rrun setup <host>`. It is idempotent and non-destructive: if the machine lacks a **venv-capable** Python 3.12 — none installed, or the interpreter cannot create venvs (Debian/Ubuntu split `ensurepip` into the separate `python3.12-venv` package) — a [python-build-standalone](https://github.com/astral-sh/python-build-standalone) tarball (Windows/macOS/Linux) is downloaded to the local cache (`~/.cache/rrun/`) and streamed over ssh stdin — no registry, no PATH changes, no admin rights, and the remote never touches GitHub. A half-created venv left by an interrupted earlier setup (python runs but pip is missing) is detected and recreated automatically. `rrun doctor <host>` reports all of these states before you provision. The venv gets its own `pip.ini`/`pip.conf` (global pip config untouched) plus the standard packages from the bundled `remote-requirements.txt` (override with `~/.rrun/remote-requirements.txt`).
 
 ## Security
 

{rrun_cli-0.2.0 → rrun_cli-0.2.2}/tests/test_cli.py

@@ -1,7 +1,10 @@
-"""CLI 辅助函数测试：--env 解析、inline 落盘。"""
+"""CLI 辅助函数测试：--env 解析、inline 落盘、--version。"""
+
+import sys
 
 import pytest
 
+import rrun
 import rrun.__main__ as cli
 
 
@@ -27,3 +30,13 @@ class TestDropInline:
     def test_unknown_lang_txt(self, tmp_path, monkeypatch):
         monkeypatch.setattr(cli, "INLINE_DROP_DIR", tmp_path / "drops")
         assert cli._drop_inline("h", "weird", "x").suffix == ".txt"
+
+
+class TestVersion:
+    def test_version_flag(self, monkeypatch, capsys):
+        # argparse version action 打印到 stdout 并以 0 退出
+        monkeypatch.setattr(sys, "argv", ["rrun", "--version"])
+        with pytest.raises(SystemExit) as e:
+            cli.main()
+        assert e.value.code == 0
+        assert capsys.readouterr().out.strip() == f"rrun {rrun.__version__}"

{rrun_cli-0.2.0 → rrun_cli-0.2.2}/tests/test_executor.py

@@ -5,8 +5,12 @@ import base64
 import pytest
 
 from rrun.executor import (
+    _PY_BASE_CHECK_CODE,
+    _PY_VER_CHECK_CODE,
+    _bash_probe_script,
     _check_ascii,
     _posix_prefix,
+    _ps_probe_script,
     _ps_quote,
     _ssh_args,
     build_bash_command,
@@ -74,6 +78,29 @@ class TestBashCommand:
             build_bash_command(args=["中文"])
 
 
+class TestProbeScripts:
+    def test_bash_probe_default_is_version_only(self):
+        s = _bash_probe_script(["python3.12"])
+        assert "sys.version_info" in s
+        assert "ensurepip" not in s  # exec 热路径不做基座资格加码
+
+    def test_bash_probe_require_ensurepip(self):
+        s = _bash_probe_script(["python3.12", "/usr/local/bin/python3.12"], require_ensurepip=True)
+        assert "import ensurepip" in s
+
+    def test_ps_probe_require_ensurepip(self):
+        s = _ps_probe_script([r"C:\Python\Python312\python.exe"], require_ensurepip=True)
+        assert "import ensurepip" in s
+
+    def test_ps_probe_default_is_version_only(self):
+        assert "ensurepip" not in _ps_probe_script([r"C:\py\python.exe"])
+
+    def test_check_codes_contain_no_quotes(self):
+        # bash 探测用单引号包裹检查代码，代码内出现引号会破坏组装
+        for code in (_PY_VER_CHECK_CODE, _PY_BASE_CHECK_CODE):
+            assert "'" not in code and '"' not in code
+
+
 class TestPosixPrefix:
     def test_empty(self):
         assert _posix_prefix() == ""

{rrun_cli-0.2.0 → rrun_cli-0.2.2}/tests/test_setup.py

@@ -30,6 +30,26 @@ class TestLoadRequirements:
         assert load_requirements() == ["foo>=1", "bar"]
 
 
+class TestPbsAssets:
+    def test_linux_assets_present(self):
+        assert ("Linux", "x86_64") in st.PBS_ASSETS
+        assert ("Linux", "aarch64") in st.PBS_ASSETS
+
+    def test_pbs_platform_mapping(self):
+        assert st._pbs_platform("Linux x86_64") == ("Linux", "x86_64")
+        assert st._pbs_platform("Linux aarch64") == ("Linux", "aarch64")
+        assert st._pbs_platform("Darwin arm64") == ("Mac", "arm64")
+        assert st._pbs_platform("Darwin x86_64") == ("Mac", "x86_64")
+
+    def test_pbs_platform_edge(self):
+        assert st._pbs_platform("") == ("", "")
+        assert st._pbs_platform("FreeBSD") == ("FreeBSD", "")
+
+    def test_all_mapped_posix_platforms_have_assets(self):
+        for uname in ("Linux x86_64", "Linux aarch64", "Darwin arm64", "Darwin x86_64"):
+            assert st._pbs_platform(uname) in st.PBS_ASSETS
+
+
 class TestSetupScripts:
     def test_bash_setup(self):
         s = _build_bash_setup("/usr/bin/python3.12", ["requests>=2", "foo"], force=False)
@@ -41,6 +61,12 @@ class TestSetupScripts:
     def test_bash_setup_force(self):
         assert "[ \"1\" = \"1\" ]" in _build_bash_setup("p", ["requests"], force=True)
 
+    def test_bash_setup_heals_half_broken_venv(self):
+        # 上次 venv 创建中途失败（ensurepip 缺失等）留下的半拉子 venv：检测无 pip 并重建
+        s = _build_bash_setup("/usr/bin/python3.12", ["requests"], force=False)
+        assert '"$venv/bin/python" -m pip --version' in s
+        assert 'rm -rf "$venv"' in s
+
     def test_ps_setup_ascii_and_content(self):
         s = _build_ps_setup("C:\\py\\python.exe", ["requests"], force=False)
         assert "$true" not in s and "$false" in s
@@ -48,3 +74,6 @@ class TestSetupScripts:
 
     def test_ps_setup_force(self):
         assert "if($true" in _build_ps_setup("C:\\py\\python.exe", ["requests"], force=True)
+
+    def test_ps_setup_heals_half_broken_venv(self):
+        assert "-m pip --version" in _build_ps_setup("C:\\py\\python.exe", ["requests"], force=False)