pi-sync-cli 0.2.0__tar.gz → 0.4.0__tar.gz

{pi_sync_cli-0.2.0 → pi_sync_cli-0.4.0}/.gitignore

@@ -216,3 +216,6 @@ __marimo__/
 
 # Streamlit
 .streamlit/secrets.toml
+
+# pi background task artifacts
+.pi/tasks/

{pi_sync_cli-0.2.0 → pi_sync_cli-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pi-sync-cli
-Version: 0.2.0
+Version: 0.4.0
 Summary: Sync pi agent config and extensions between hosts over rsync
 Project-URL: Repository, https://github.com/say4n/pi-sync
 Project-URL: Issues, https://github.com/say4n/pi-sync/issues
@@ -63,6 +63,7 @@ Host-local state is deliberately never touched: `sessions/`, `npm/`,
 | `--dry-run` | report changes, copy nothing |
 | `-x, --exclude PATTERN` | skip matching files (repeatable) |
 | `--install` | install pi on hosts that lack it, without prompting |
+| `--uninstall` | remove pi from the host instead of syncing (config is kept) |
 | `--local-dir` | default `$PI_CODING_AGENT_DIR` or `~/.pi/agent` |
 | `--remote-dir` | default `~/.pi/agent` |
 | `-v` / `--verbose` | print each rsync command and its output |
@@ -98,6 +99,21 @@ The probe checks `command -v pi` plus the usual install locations
 `/usr/local/bin`), because a non-interactive ssh session does not source the
 host's shell init — on a linuxbrew host `command -v pi` alone misses it.
 
+## Uninstalling
+
+`--uninstall` removes pi from the host instead of syncing. It runs
+`npm uninstall -g --prefix <prefix> @earendil-works/pi-coding-agent`, deriving the
+prefix from where pi actually lives (as the official installer does), then
+re-probes to confirm the binary is really gone — npm can exit 0 having removed
+nothing. `~/.pi/agent` is deliberately left untouched, since that is your config
+rather than the CLI.
+
+This exists because the official installer can only uninstall through its
+interactive menu: its unattended mode always installs or reinstalls. If the
+uninstall fails, that is usually a managed install
+(`PI_EXPERIMENTAL=1`, under `<agent dir>/install`) — run
+`curl -fsSL https://pi.dev/install.sh | sh` on the host and choose `u`.
+
 ## Shell completions
 
 Host arguments complete from `~/.ssh/config`, following `Include` directives and
@@ -127,7 +143,14 @@ without regenerating anything.
 
 - `settings.json` is machine-written by pi (`lastChangelogVersion` bumps, UI
   toggles), so two hosts pushing it will overwrite each other's local
-  preferences. Sync it when you change `packages`, not reflexively.
+  preferences. Sync it when you change `packages`, not reflexively — and note the
+  overwritten copy is kept as `settings.json.backup` on the receiving host.
+- Anything pi-sync overwrites is kept on the destination as `<name>.backup`, and
+  `*.backup` is never synced, so those copies stay host-local and never
+trampoline between hosts. `--delete` suppresses backups for the mirrored
+  directory, because mirroring means "match exactly" — which also sidesteps an
+  openrsync bug where backing up a file it deletes fails with
+  `fchownat: Operation not permitted`.
 - Extensions that write runtime files inside their own directory (logs,
   checkpoints) get those files synced too, and each host's copy is overwritten by
   whichever side pushed last — exclude them with `-x '*/logs/*'`.

{pi_sync_cli-0.2.0 → pi_sync_cli-0.4.0}/README.md

@@ -46,6 +46,7 @@ Host-local state is deliberately never touched: `sessions/`, `npm/`,
 | `--dry-run` | report changes, copy nothing |
 | `-x, --exclude PATTERN` | skip matching files (repeatable) |
 | `--install` | install pi on hosts that lack it, without prompting |
+| `--uninstall` | remove pi from the host instead of syncing (config is kept) |
 | `--local-dir` | default `$PI_CODING_AGENT_DIR` or `~/.pi/agent` |
 | `--remote-dir` | default `~/.pi/agent` |
 | `-v` / `--verbose` | print each rsync command and its output |
@@ -81,6 +82,21 @@ The probe checks `command -v pi` plus the usual install locations
 `/usr/local/bin`), because a non-interactive ssh session does not source the
 host's shell init — on a linuxbrew host `command -v pi` alone misses it.
 
+## Uninstalling
+
+`--uninstall` removes pi from the host instead of syncing. It runs
+`npm uninstall -g --prefix <prefix> @earendil-works/pi-coding-agent`, deriving the
+prefix from where pi actually lives (as the official installer does), then
+re-probes to confirm the binary is really gone — npm can exit 0 having removed
+nothing. `~/.pi/agent` is deliberately left untouched, since that is your config
+rather than the CLI.
+
+This exists because the official installer can only uninstall through its
+interactive menu: its unattended mode always installs or reinstalls. If the
+uninstall fails, that is usually a managed install
+(`PI_EXPERIMENTAL=1`, under `<agent dir>/install`) — run
+`curl -fsSL https://pi.dev/install.sh | sh` on the host and choose `u`.
+
 ## Shell completions
 
 Host arguments complete from `~/.ssh/config`, following `Include` directives and
@@ -110,7 +126,14 @@ without regenerating anything.
 
 - `settings.json` is machine-written by pi (`lastChangelogVersion` bumps, UI
   toggles), so two hosts pushing it will overwrite each other's local
-  preferences. Sync it when you change `packages`, not reflexively.
+  preferences. Sync it when you change `packages`, not reflexively — and note the
+  overwritten copy is kept as `settings.json.backup` on the receiving host.
+- Anything pi-sync overwrites is kept on the destination as `<name>.backup`, and
+  `*.backup` is never synced, so those copies stay host-local and never
+trampoline between hosts. `--delete` suppresses backups for the mirrored
+  directory, because mirroring means "match exactly" — which also sidesteps an
+  openrsync bug where backing up a file it deletes fails with
+  `fchownat: Operation not permitted`.
 - Extensions that write runtime files inside their own directory (logs,
   checkpoints) get those files synced too, and each host's copy is overwritten by
   whichever side pushed last — exclude them with `-x '*/logs/*'`.

{pi_sync_cli-0.2.0 → pi_sync_cli-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pi-sync-cli"
-version = "0.2.0"
+version = "0.4.0"
 description = "Sync pi agent config and extensions between hosts over rsync"
 readme = "README.md"
 requires-python = ">=3.10"

{pi_sync_cli-0.2.0 → pi_sync_cli-0.4.0}/src/pi_sync/cli.py

@@ -16,6 +16,7 @@ import os
 import subprocess
 import sys
 from collections.abc import Sequence
+from dataclasses import dataclass
 from pathlib import Path
 
 import click
@@ -24,6 +25,7 @@ from click.shell_completion import CompletionItem
 DEFAULT_AGENT_DIR = "~/.pi/agent"
 SSH_CONFIG = "~/.ssh/config"
 PI_INSTALL_CMD = "curl -fsSL https://pi.dev/install.sh | sh"
+PI_PACKAGE = "@earendil-works/pi-coding-agent"
 # One ssh round trip answers both "is it reachable" and "where is pi".
 PI_PROBE = """\
 found="$(command -v pi 2>/dev/null)"
@@ -53,10 +55,29 @@ def local_agent_dir(override: str | None = None) -> Path:
     return Path(raw).expanduser()
 
 
-def ssh_hosts(
+@dataclass(frozen=True)
+class SshHost:
+    """A host alias, plus the details worth showing in shell completions."""
+
+    name: str
+    hostname: str | None = None
+    user: str | None = None
+
+    @property
+    def detail(self) -> str:
+        if self.hostname and self.user:
+            return f"{self.user}@{self.hostname}"
+        return self.hostname or self.user or ""
+
+
+def ssh_config_hosts(
     config: str = SSH_CONFIG, _seen: frozenset[str] = frozenset()
-) -> list[str]:
-    """Host aliases from an ssh config, following Include and skipping wildcards."""
+) -> list[SshHost]:
+    """Hosts from an ssh config, following Include and skipping wildcards.
+
+    Directives bind to the Host line that precedes them, so the current block is
+    flushed when the next Host or Include appears.
+    """
     path = Path(config).expanduser()
     if not path.is_file():
         return []
@@ -64,7 +85,22 @@ def ssh_hosts(
     if resolved in _seen:
         return []
     seen = _seen | {resolved}
-    hosts: list[str] = []
+    hosts: list[SshHost] = []
+    names: set[str] = set()
+    pending: list[str] = []
+    hostname: str | None = None
+    user: str | None = None
+
+    def add(entries: list[SshHost]) -> None:
+        for entry in entries:
+            if entry.name not in names:
+                names.add(entry.name)
+                hosts.append(entry)
+
+    def flush() -> None:
+        add([SshHost(name, hostname, user) for name in pending])
+        pending.clear()
+
     for raw_line in path.read_text(errors="replace").splitlines():
         line = raw_line.strip()
         if not line or line.startswith("#"):
@@ -74,22 +110,32 @@ def ssh_hosts(
             continue
         keyword, rest = parts[0].lower(), parts[1].strip()
         if keyword == "host":
-            for token in rest.split():
-                wildcard = "*" in token or "?" in token or token.startswith("!")
-                if not wildcard and token not in hosts:
-                    hosts.append(token)
+            flush()
+            hostname = user = None
+            pending += [t for t in rest.split() if not any(c in t for c in "*?!")]
+        elif keyword == "hostname":
+            hostname = rest.split()[0]
+        elif keyword == "user":
+            user = rest.split()[0]
         elif keyword == "include":
+            flush()
             for pattern in rest.split():
                 target = Path(pattern).expanduser()
                 if not target.is_absolute():
                     target = Path.home() / ".ssh" / target
                 for included in sorted(target.parent.glob(target.name)):
-                    hosts += [
-                        h for h in ssh_hosts(str(included), seen) if h not in hosts
-                    ]
+                    add(ssh_config_hosts(str(included), seen))
+    flush()
     return hosts
 
 
+def ssh_hosts(
+    config: str = SSH_CONFIG, _seen: frozenset[str] = frozenset()
+) -> list[str]:
+    """Host alias names from an ssh config (see ssh_config_hosts)."""
+    return [host.name for host in ssh_config_hosts(config, _seen)]
+
+
 def complete_target(
     ctx: click.Context, param: click.Parameter, incomplete: str
 ) -> list[CompletionItem]:
@@ -97,9 +143,9 @@ def complete_target(
     prefix = incomplete.rpartition("@")[2]
     lead = incomplete[: len(incomplete) - len(prefix)] if prefix else incomplete
     return [
-        CompletionItem(f"{lead}{host}")
-        for host in ssh_hosts()
-        if host.startswith(prefix)
+        CompletionItem(f"{lead}{host.name}", help=host.detail)
+        for host in ssh_config_hosts()
+        if host.name.startswith(prefix)
     ]
 
 
@@ -127,7 +173,14 @@ def rsync_argv(
     argv = ["rsync", "-az", "-i"]
     argv += [f"--exclude={pattern}" for pattern in excludes]
     if delete and rel in DIRECTORY_ITEMS:
+        # Mirroring wins over backups here: the destination is meant to match the
+        # source exactly, and openrsync (the rsync macOS ships) errors out when it
+        # has to back up a file it deletes.
         argv.append("--delete-during")
+    else:
+        # Keep the destination's copy of whatever we replace, as <file>.backup.
+        argv += ["--backup", "--suffix=.backup"]
+    argv.append("--exclude=*.backup")  # backups stay host-local
     if dry_run:
         argv.append("-n")
     argv += [remote, local] if pull else [local, remote]
@@ -195,6 +248,30 @@ def install_pi(target: str) -> str | None:
     return None
 
 
+def uninstall_pi(target: str, pi_path: str) -> str | None:
+    """Remove pi's npm install. Returns an error message, or None on success.
+
+    Mirrors the installer's own npm path — the prefix comes from where pi
+    actually lives — because its unattended mode can only install or reinstall;
+    uninstall is reachable only through its interactive menu. Like the
+    installer, the result is verified rather than trusted, and only the CLI is
+    removed: the agent directory is left alone.
+    """
+    prefix = Path(pi_path).parent.parent
+    cmd = (
+        f"npm uninstall -g --prefix {prefix} --no-fund --no-audit "
+        f"--loglevel=error --progress=false {PI_PACKAGE}"
+    )
+    proc = run_cmd(["ssh", target, cmd])
+    if proc.returncode:
+        detail = ((proc.stderr or proc.stdout) or "").strip().splitlines()
+        return detail[-1] if detail else f"npm uninstall exited {proc.returncode}"
+    _, remaining = probe_host(target)
+    if remaining:
+        return f"npm uninstall finished, but pi is still present at {remaining}"
+    return None
+
+
 def ensure_pi(target: str, assume_yes: bool, remote_dir: str) -> bool:
     """Make sure the host has pi. Returns False when the host must be skipped.
 
@@ -284,6 +361,7 @@ def sync_host(
 
 
 @click.command(context_settings={"help_option_names": ["-h", "--help"]})
+@click.version_option(package_name="pi-sync-cli")
 @click.argument(
     "targets",
     nargs=-1,
@@ -327,6 +405,12 @@ def sync_host(
     is_flag=True,
     help="Install pi on hosts that lack it, without prompting.",
 )
+@click.option(
+    "--uninstall",
+    "uninstall_",
+    is_flag=True,
+    help="Uninstall pi from the host instead of syncing (keeps ~/.pi/agent).",
+)
 @click.option(
     "--local-dir",
     default=None,
@@ -352,6 +436,7 @@ def main(
     dry_run: bool,
     excludes: tuple[str, ...],
     install_: bool,
+    uninstall_: bool,
     local_dir: str | None,
     remote_dir: str,
     verbose: bool,
@@ -397,6 +482,28 @@ def main(
             click.secho(f"→ {target}\n  unreachable: {error}", fg="red")
             continue
         click.secho(f"→ {target}", bold=True)
+        if uninstall_:
+            if pi_path is None:
+                click.secho("  pi is not installed — nothing to uninstall")
+                continue
+            prefix = Path(pi_path).parent.parent
+            if dry_run:
+                click.secho(
+                    f"  would run: npm uninstall -g --prefix {prefix} {PI_PACKAGE}"
+                )
+                continue
+            click.secho(f"  uninstalling pi from {pi_path}...")
+            error = uninstall_pi(target, pi_path)
+            if error:
+                failed = True
+                click.secho(f"  {error}", fg="red")
+                click.secho(
+                    "  for a managed install, run the installer and choose 'u'",
+                    fg="yellow",
+                )
+            else:
+                click.secho("  pi uninstalled — ~/.pi/agent was left alone", fg="green")
+            continue
         if pi_path is None:
             if dry_run:
                 click.secho("  pi not installed — nothing would be synced", fg="yellow")

{pi_sync_cli-0.2.0 → pi_sync_cli-0.4.0}/tests/test_cli.py

@@ -13,6 +13,7 @@ from pathlib import Path
 
 import click
 import pytest
+from click.shell_completion import CompletionItem
 from click.testing import CliRunner
 
 from pi_sync import cli
@@ -29,6 +30,8 @@ class FakeRun:
         pi_path: str | None = "/usr/bin/pi",
         install_rc: int = 0,
         install_installs: bool = True,
+        uninstall_rc: int = 0,
+        uninstall_removes: bool = True,
     ):
         self.calls: list[list[str]] = []
         self.inputs: list[str | None] = []
@@ -39,6 +42,8 @@ class FakeRun:
         self.pi_path = pi_path
         self.install_rc = install_rc
         self.install_installs = install_installs
+        self.uninstall_rc = uninstall_rc
+        self.uninstall_removes = uninstall_removes
         self.installed = False
 
     def __call__(
@@ -51,6 +56,13 @@ class FakeRun:
             return subprocess.CompletedProcess(
                 argv, self.rsync_rc, self.rsync_stdout, ""
             )
+        if any("npm uninstall" in arg for arg in argv):
+            if self.uninstall_rc == 0 and self.uninstall_removes:
+                self.pi_path = None
+            stderr = "" if self.uninstall_rc == 0 else "npm ERR! code E404"
+            return subprocess.CompletedProcess(
+                argv, self.uninstall_rc, "removed\n", stderr
+            )
         if any("install.sh" in arg for arg in argv):
             if self.install_rc == 0:
                 # a real installer exits 0 even when the user picks "do nothing"
@@ -119,10 +131,31 @@ def test_select_items(groups: set[str], expected: list[str]) -> None:
 @pytest.mark.parametrize(
     ("argv_kwargs", "expected"),
     [
-        ({}, ["rsync", "-az", "-i", "/a/models.json", "host:~/.pi/agent/models.json"]),
+        (
+            {},
+            [
+                "rsync",
+                "-az",
+                "-i",
+                "--backup",
+                "--suffix=.backup",
+                "--exclude=*.backup",
+                "/a/models.json",
+                "host:~/.pi/agent/models.json",
+            ],
+        ),
         (
             {"pull": True},
-            ["rsync", "-az", "-i", "host:~/.pi/agent/models.json", "/a/models.json"],
+            [
+                "rsync",
+                "-az",
+                "-i",
+                "--backup",
+                "--suffix=.backup",
+                "--exclude=*.backup",
+                "host:~/.pi/agent/models.json",
+                "/a/models.json",
+            ],
         ),
         (
             {"dry_run": True},
@@ -130,6 +163,9 @@ def test_select_items(groups: set[str], expected: list[str]) -> None:
                 "rsync",
                 "-az",
                 "-i",
+                "--backup",
+                "--suffix=.backup",
+                "--exclude=*.backup",
                 "-n",
                 "/a/models.json",
                 "host:~/.pi/agent/models.json",
@@ -137,7 +173,16 @@ def test_select_items(groups: set[str], expected: list[str]) -> None:
         ),
         (
             {"delete": True},
-            ["rsync", "-az", "-i", "/a/models.json", "host:~/.pi/agent/models.json"],
+            [
+                "rsync",
+                "-az",
+                "-i",
+                "--backup",
+                "--suffix=.backup",
+                "--exclude=*.backup",
+                "/a/models.json",
+                "host:~/.pi/agent/models.json",
+            ],
         ),
     ],
 )
@@ -162,6 +207,20 @@ def test_rsync_argv_delete_only_for_directories() -> None:
     )
 
 
+def test_backups_are_taken_except_when_mirroring() -> None:
+    """Originals are kept as .backup, unless --delete means "match exactly"."""
+    plain = cli.rsync_argv("models.json", "host", Path("/a"), "~/.pi/agent")
+    assert "--backup" in plain
+    assert "--suffix=.backup" in plain
+    assert "--exclude=*.backup" in plain  # never propagate backups to other hosts
+
+    mirroring = cli.rsync_argv(
+        "extensions", "host", Path("/a"), "~/.pi/agent", delete=True
+    )
+    assert "--backup" not in mirroring
+    assert "--exclude=*.backup" in mirroring  # existing backups survive the delete
+
+
 def test_rsync_argv_excludes() -> None:
     argv = cli.rsync_argv(
         "extensions", "host", Path("/a"), "~/.pi/agent", excludes=("*/logs/*",)
@@ -385,28 +444,51 @@ class TestSshHosts:
 
 class TestCompletion:
     @staticmethod
-    def complete(incomplete: str) -> list[str]:
+    def hosts(*names: str) -> list[cli.SshHost]:
+        return [cli.SshHost(name) for name in names]
+
+    @staticmethod
+    def items(incomplete: str) -> list[CompletionItem]:
         """Run the completion callback the way click would."""
         ctx = click.Context(cli.main)
-        items = cli.complete_target(ctx, cli.main.params[0], incomplete)
-        return [item.value for item in items]
+        return cli.complete_target(ctx, cli.main.params[0], incomplete)
+
+    def complete(self, incomplete: str) -> list[str]:
+        return [item.value for item in self.items(incomplete)]
 
     def test_completes_matching_hosts(self, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
-            cli, "ssh_hosts", lambda *a, **k: ["tinfoil", "zero-frame", "phatboi"]
+            cli, "ssh_config_hosts", lambda *a, **k: self.hosts("tinfoil", "zero-frame")
         )
         assert self.complete("t") == ["tinfoil"]
 
     def test_empty_incomplete_lists_everything(
         self, monkeypatch: pytest.MonkeyPatch
     ) -> None:
-        monkeypatch.setattr(cli, "ssh_hosts", lambda *a, **k: ["a", "b"])
+        monkeypatch.setattr(
+            cli, "ssh_config_hosts", lambda *a, **k: self.hosts("a", "b")
+        )
         assert self.complete("") == ["a", "b"]
 
     def test_user_at_prefix_is_preserved(self, monkeypatch: pytest.MonkeyPatch) -> None:
-        monkeypatch.setattr(cli, "ssh_hosts", lambda *a, **k: ["tinfoil", "zero-frame"])
+        monkeypatch.setattr(
+            cli, "ssh_config_hosts", lambda *a, **k: self.hosts("tinfoil", "zero-frame")
+        )
         assert self.complete("sayan@zer") == ["sayan@zero-frame"]
 
+    def test_suggestions_carry_the_real_hostname(
+        self, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        """zsh and fish render CompletionItem.help next to the suggestion."""
+        monkeypatch.setattr(
+            cli,
+            "ssh_config_hosts",
+            lambda *a, **k: [cli.SshHost("tinfoil", "tinfoil.sayan.page", "sayan")],
+        )
+        (item,) = self.items("t")
+        assert item.value == "tinfoil"
+        assert item.help == "sayan@tinfoil.sayan.page"
+
 
 class TestProbe:
     def test_reports_pi_path(self, monkeypatch: pytest.MonkeyPatch) -> None:
@@ -550,3 +632,119 @@ class TestInstallOffering:
         )
         assert result.exit_code == 1
         assert install_calls(fake) == []
+
+
+class TestUninstall:
+    def uninstall_calls(self, fake: FakeRun) -> list[list[str]]:
+        return [c for c in fake.calls if any("npm uninstall" in a for a in c)]
+
+    def test_uninstalls_with_the_prefix_pi_lives_in(
+        self, monkeypatch: pytest.MonkeyPatch, agent_dir: Path
+    ) -> None:
+        fake = FakeRun(pi_path="/home/linuxbrew/.linuxbrew/bin/pi")
+        monkeypatch.setattr(cli, "run_cmd", fake)
+        result = CliRunner().invoke(cli.main, ["--uninstall", "host"])
+        assert result.exit_code == 0, result.output
+        (call,) = self.uninstall_calls(fake)
+        cmd = call[-1]
+        assert "npm uninstall -g --prefix /home/linuxbrew/.linuxbrew" in cmd
+        assert cli.PI_PACKAGE in cmd
+        assert "~/.pi/agent was left alone" in result.output
+        # uninstalling never syncs
+        assert not any(c[0] == "rsync" for c in fake.calls)
+
+    def test_absent_pi_is_a_noop(
+        self, monkeypatch: pytest.MonkeyPatch, agent_dir: Path
+    ) -> None:
+        fake = FakeRun(pi_path=None)
+        monkeypatch.setattr(cli, "run_cmd", fake)
+        result = CliRunner().invoke(cli.main, ["--uninstall", "host"])
+        assert result.exit_code == 0
+        assert "nothing to uninstall" in result.output
+        assert self.uninstall_calls(fake) == []
+
+    def test_npm_failure_is_reported(
+        self, monkeypatch: pytest.MonkeyPatch, agent_dir: Path
+    ) -> None:
+        fake = FakeRun(pi_path="/usr/bin/pi", uninstall_rc=1)
+        monkeypatch.setattr(cli, "run_cmd", fake)
+        result = CliRunner().invoke(cli.main, ["--uninstall", "host"])
+        assert result.exit_code == 1
+        assert "npm ERR!" in result.output
+
+    def test_still_present_after_uninstall_is_a_failure(
+        self, monkeypatch: pytest.MonkeyPatch, agent_dir: Path
+    ) -> None:
+        """npm can exit 0 having removed nothing; the re-probe has the last word."""
+        fake = FakeRun(pi_path="/usr/bin/pi", uninstall_removes=False)
+        monkeypatch.setattr(cli, "run_cmd", fake)
+        result = CliRunner().invoke(cli.main, ["--uninstall", "host"])
+        assert result.exit_code == 1
+        assert "still present at /usr/bin/pi" in result.output
+
+    def test_dry_run_uninstall_changes_nothing(
+        self, monkeypatch: pytest.MonkeyPatch, agent_dir: Path
+    ) -> None:
+        fake = FakeRun(pi_path="/usr/bin/pi")
+        monkeypatch.setattr(cli, "run_cmd", fake)
+        result = CliRunner().invoke(cli.main, ["--uninstall", "--dry-run", "host"])
+        assert result.exit_code == 0
+        assert "would run: npm uninstall" in result.output
+        assert self.uninstall_calls(fake) == []
+
+    def test_unreachable_host_fails(
+        self, monkeypatch: pytest.MonkeyPatch, agent_dir: Path
+    ) -> None:
+        fake = FakeRun(ssh_rc=255)
+        monkeypatch.setattr(cli, "run_cmd", fake)
+        result = CliRunner().invoke(cli.main, ["--uninstall", "host"])
+        assert result.exit_code == 1
+        assert "unreachable" in result.output
+        assert self.uninstall_calls(fake) == []
+
+
+class TestSshHostDetails:
+    def test_hostname_and_user_are_captured(self, tmp_path: Path) -> None:
+        cfg = tmp_path / "config"
+        cfg.write_text(
+            "Host tinfoil\n  HostName tinfoil.sayan.page\n  User sayan\nHost bare\n"
+        )
+        hosts = cli.ssh_config_hosts(str(cfg))
+        assert hosts == [
+            cli.SshHost("tinfoil", "tinfoil.sayan.page", "sayan"),
+            cli.SshHost("bare"),
+        ]
+        assert hosts[0].detail == "sayan@tinfoil.sayan.page"
+        assert hosts[1].detail == ""
+
+    def test_directives_bind_to_the_preceding_host(self, tmp_path: Path) -> None:
+        cfg = tmp_path / "config"
+        cfg.write_text("Host first\n  HostName one.example\nHost second\n  User bob\n")
+        hosts = cli.ssh_config_hosts(str(cfg))
+        assert [h.hostname for h in hosts] == ["one.example", None]
+        assert [h.user for h in hosts] == [None, "bob"]
+        assert hosts[1].detail == "bob"
+
+    def test_details_survive_includes(self, tmp_path: Path) -> None:
+        extra = tmp_path / "extra"
+        extra.write_text("Host orb\n  HostName orb.local\n")
+        cfg = tmp_path / "config"
+        cfg.write_text(f"Host tinfoil\n  User sayan\nInclude {extra}\n")
+        hosts = cli.ssh_config_hosts(str(cfg))
+        assert [(h.name, h.hostname, h.user) for h in hosts] == [
+            ("tinfoil", None, "sayan"),
+            ("orb", "orb.local", None),
+        ]
+
+    def test_names_still_available_as_strings(self, tmp_path: Path) -> None:
+        cfg = tmp_path / "config"
+        cfg.write_text("Host tinfoil\n  HostName tinfoil.sayan.page\n")
+        assert cli.ssh_hosts(str(cfg)) == ["tinfoil"]
+
+
+def test_version_option_reports_the_installed_version() -> None:
+    from importlib.metadata import version
+
+    result = CliRunner().invoke(cli.main, ["--version"])
+    assert result.exit_code == 0, result.output
+    assert version("pi-sync-cli") in result.output

{pi_sync_cli-0.2.0 → pi_sync_cli-0.4.0}/uv.lock

@@ -52,7 +52,7 @@ wheels = [
 
 [[package]]
 name = "pi-sync-cli"
-version = "0.2.0"
+version = "0.4.0"
 source = { editable = "." }
 dependencies = [
     { name = "click" },