swarph-cli 0.7.3__tar.gz → 0.7.4__tar.gz

{swarph_cli-0.7.3/src/swarph_cli.egg-info → swarph_cli-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swarph-cli
-Version: 0.7.3
+Version: 0.7.4
 Summary: The `swarph` binary — multi-LLM CLI with mesh-gateway integration. v0.7.0 ships Phase 7 substrate-doc R7 §11.1.7 operator-tooling layer in 5 increments: PR-A `--new-instance` flag (sibling-spawn case) + PR-B auto-suffix on collision (sibling-slot persistence) + PR-C SessionStart hook (closes bare-claude operator-paste gap) + watchdog (stranded-session recovery) + PR-D swarph-shared cell.yaml relocation (cell-yaml schema graduates to swarph-shared 0.3.0 kernel-tier; substrate-doc R7 §11.1.5 (O5) RESOLVED).
 Author: Pierre Samson, Claude Opus
 License: MIT

{swarph_cli-0.7.3 → swarph_cli-0.7.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "swarph-cli"
-version = "0.7.3"
+version = "0.7.4"
 description = "The `swarph` binary — multi-LLM CLI with mesh-gateway integration. v0.7.0 ships Phase 7 substrate-doc R7 §11.1.7 operator-tooling layer in 5 increments: PR-A `--new-instance` flag (sibling-spawn case) + PR-B auto-suffix on collision (sibling-slot persistence) + PR-C SessionStart hook (closes bare-claude operator-paste gap) + watchdog (stranded-session recovery) + PR-D swarph-shared cell.yaml relocation (cell-yaml schema graduates to swarph-shared 0.3.0 kernel-tier; substrate-doc R7 §11.1.5 (O5) RESOLVED)."
 readme = "README.md"
 license = { text = "MIT" }

{swarph_cli-0.7.3 → swarph_cli-0.7.4}/src/swarph_cli/__init__.py

@@ -16,6 +16,6 @@ The architecture splits CLI from substrate so:
 
 from __future__ import annotations
 
-__version__ = "0.7.3"
+__version__ = "0.7.4"
 
 __all__ = ["__version__"]

{swarph_cli-0.7.3 → swarph_cli-0.7.4}/src/swarph_cli/commands/watchdog.py

@@ -66,6 +66,7 @@ import argparse
 import json
 import os
 import shlex
+import shutil
 import subprocess
 import sys
 import time
@@ -622,6 +623,35 @@ _SYSTEMD_UNIT_DIR = Path("/etc/systemd/system")
 _SYSTEMD_DEFAULT_DIR = Path("/etc/default")
 _SYSTEMD_UNIT_NAMES = ("swarph-watchdog.service", "swarph-watchdog.timer")
 _SYSTEMD_DEFAULT_NAME = "swarph-watchdog"  # /etc/default/swarph-watchdog
+# v0.7.3 bundled template's ExecStart placeholder — substituted at install time
+# by `_resolve_swarph_bin()` to the actual binary path on the install host.
+# Fixes the v0.7.3 hardcode that broke pipx-installed peers (binary at
+# ~/.local/bin/swarph not /usr/local/bin/swarph).
+_SWARPH_BIN_PLACEHOLDER = "/usr/local/bin/swarph"
+
+
+def _resolve_swarph_bin() -> str:
+    """Resolve the absolute path of the running swarph binary.
+
+    Resolution order:
+      1. ``sys.argv[0]`` if it's an absolute path — most reliable, equals
+         the path the user invoked
+      2. ``shutil.which(sys.argv[0])`` — bare-name invocation, look up in PATH
+      3. ``shutil.which("swarph")`` — generic PATH lookup as fallback
+      4. ``/usr/local/bin/swarph`` — last-resort default (matches v0.7.3
+         hardcode behavior; no regression if all three above fail)
+
+    ALWAYS returns an absolute path — systemd ExecStart requires absolute.
+    Relative inputs (e.g. ``venv/bin/swarph`` from editable installs) get
+    abspath'd against cwd. Never raises.
+    """
+    invoked = sys.argv[0] or "swarph"
+    if Path(invoked).is_absolute():
+        return invoked
+    resolved = shutil.which(invoked) or shutil.which("swarph")
+    if not resolved:
+        return _SWARPH_BIN_PLACEHOLDER
+    return os.path.abspath(resolved)
 
 
 def _bundled_systemd_files() -> dict[str, str]:
@@ -656,6 +686,18 @@ def run_install_service(args: argparse.Namespace) -> int:
     """
     files = _bundled_systemd_files()
 
+    # v0.7.4: substitute the bundled service template's ExecStart placeholder
+    # with the actual swarph binary path on this host. Fixes the v0.7.3 hardcode
+    # that broke pipx-installed peers (binary at ~/.local/bin/swarph not
+    # /usr/local/bin/swarph). Pipx is the recommended install path on droplet
+    # + lab, so the hardcode bit BOTH peers on first install attempt today.
+    swarph_bin = _resolve_swarph_bin()
+    service_content = files[_SYSTEMD_UNIT_NAMES[0]].replace(
+        f"ExecStart={_SWARPH_BIN_PLACEHOLDER}",
+        f"ExecStart={swarph_bin}",
+        1,
+    )
+
     # Template the default file with the requested role
     default_content = files["swarph-watchdog.default"].replace(
         "SWARPH_CELL=lab",
@@ -664,13 +706,13 @@ def run_install_service(args: argparse.Namespace) -> int:
     )
 
     targets = [
-        (_SYSTEMD_UNIT_DIR / _SYSTEMD_UNIT_NAMES[0], files[_SYSTEMD_UNIT_NAMES[0]]),
+        (_SYSTEMD_UNIT_DIR / _SYSTEMD_UNIT_NAMES[0], service_content),
         (_SYSTEMD_UNIT_DIR / _SYSTEMD_UNIT_NAMES[1], files[_SYSTEMD_UNIT_NAMES[1]]),
         (_SYSTEMD_DEFAULT_DIR / _SYSTEMD_DEFAULT_NAME, default_content),
     ]
 
     if args.dry_run:
-        print(f"# DRY RUN — cell={args.cell}", file=sys.stderr)
+        print(f"# DRY RUN — cell={args.cell} swarph_bin={swarph_bin}", file=sys.stderr)
         for path, content in targets:
             print(f"\n# would write {path}:", file=sys.stderr)
             print(content, file=sys.stderr)

{swarph_cli-0.7.3 → swarph_cli-0.7.4/src/swarph_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swarph-cli
-Version: 0.7.3
+Version: 0.7.4
 Summary: The `swarph` binary — multi-LLM CLI with mesh-gateway integration. v0.7.0 ships Phase 7 substrate-doc R7 §11.1.7 operator-tooling layer in 5 increments: PR-A `--new-instance` flag (sibling-spawn case) + PR-B auto-suffix on collision (sibling-slot persistence) + PR-C SessionStart hook (closes bare-claude operator-paste gap) + watchdog (stranded-session recovery) + PR-D swarph-shared cell.yaml relocation (cell-yaml schema graduates to swarph-shared 0.3.0 kernel-tier; substrate-doc R7 §11.1.5 (O5) RESOLVED).
 Author: Pierre Samson, Claude Opus
 License: MIT

{swarph_cli-0.7.3 → swarph_cli-0.7.4}/tests/test_watchdog.py

@@ -624,3 +624,91 @@ def test_bundled_systemd_files_readable():
     assert "OnUnitActiveSec=5min" in files["swarph-watchdog.timer"]
     # Default file has the SWARPH_CELL=lab template line
     assert "SWARPH_CELL=lab" in files["swarph-watchdog.default"]
+
+
+# ---------------------------------------------------------------------------
+# v0.7.4 — _resolve_swarph_bin + ExecStart templating
+# ---------------------------------------------------------------------------
+#
+# v0.7.3 shipped a hardcoded ExecStart=/usr/local/bin/swarph that broke
+# pipx-installed peers (lab + drop both hit this on first install attempt
+# 2026-05-14). v0.7.4 resolves the path at install time via _resolve_swarph_bin
+# and substitutes into the bundled service template.
+
+
+def test_resolve_swarph_bin_absolute_argv0_wins(monkeypatch):
+    """If sys.argv[0] is absolute, it's the most reliable signal — use it."""
+    from swarph_cli.commands.watchdog import _resolve_swarph_bin
+
+    monkeypatch.setattr("sys.argv", ["/home/ubuntu/.local/bin/swarph", "watchdog"])
+    assert _resolve_swarph_bin() == "/home/ubuntu/.local/bin/swarph"
+
+
+def test_resolve_swarph_bin_bare_name_resolved_via_path(monkeypatch, tmp_path):
+    """Bare-name argv[0] resolves via PATH."""
+    from swarph_cli.commands.watchdog import _resolve_swarph_bin
+
+    fake_bin = tmp_path / "swarph"
+    fake_bin.write_text("#!/bin/sh\nexit 0\n")
+    fake_bin.chmod(0o755)
+    monkeypatch.setattr("sys.argv", ["swarph", "watchdog"])
+    monkeypatch.setattr("shutil.which", lambda name: str(fake_bin) if name == "swarph" else None)
+    assert _resolve_swarph_bin() == str(fake_bin)
+
+
+def test_resolve_swarph_bin_falls_back_to_placeholder_if_unresolvable(monkeypatch):
+    """All resolution paths fail → fall back to /usr/local/bin/swarph
+    (v0.7.3 hardcode behavior; no regression vs prior version)."""
+    from swarph_cli.commands.watchdog import _resolve_swarph_bin, _SWARPH_BIN_PLACEHOLDER
+
+    monkeypatch.setattr("sys.argv", ["swarph", "watchdog"])
+    monkeypatch.setattr("shutil.which", lambda name: None)
+    assert _resolve_swarph_bin() == _SWARPH_BIN_PLACEHOLDER
+
+
+def test_install_service_dry_run_substitutes_swarph_bin(isolated_state, capsys, monkeypatch):
+    """Dry-run preview shows resolved swarph path in ExecStart, not hardcoded
+    /usr/local/bin/swarph (when the host actually has swarph elsewhere)."""
+    pipx_path = "/home/ubuntu/.local/bin/swarph"
+    monkeypatch.setattr("sys.argv", [pipx_path, "watchdog"])
+    rc = run_watchdog(argv=["--install-service", "--cell", "droplet", "--dry-run"])
+    assert rc == 0
+    captured = capsys.readouterr()
+    # Header surfaces the resolved binary
+    assert f"swarph_bin={pipx_path}" in captured.err
+    # Service file's ExecStart now points at pipx path, NOT the placeholder
+    assert f"ExecStart={pipx_path} watchdog --check" in captured.err
+    # And the v0.7.3-hardcoded path no longer appears in the preview
+    assert "ExecStart=/usr/local/bin/swarph watchdog --check" not in captured.err
+
+
+def test_install_service_dry_run_preserves_default_path_when_absolute(isolated_state, capsys, monkeypatch):
+    """When sys.argv[0] IS /usr/local/bin/swarph (the v0.7.3 default path),
+    the substitution still happens but produces the same line — no diff vs
+    v0.7.3 for this case."""
+    monkeypatch.setattr("sys.argv", ["/usr/local/bin/swarph", "watchdog"])
+    rc = run_watchdog(argv=["--install-service", "--cell", "lab", "--dry-run"])
+    assert rc == 0
+    captured = capsys.readouterr()
+    assert "ExecStart=/usr/local/bin/swarph watchdog --check" in captured.err
+
+
+def test_resolve_swarph_bin_relative_with_slash_resolves_to_absolute(tmp_path, monkeypatch):
+    """Relative path with slash (e.g. editable install's venv/bin/swarph)
+    must be absolutized — systemd ExecStart needs absolute. Regression guard
+    for the abspath fix on top of v0.7.4 path-autodetect."""
+    from swarph_cli.commands.watchdog import _resolve_swarph_bin
+
+    fake = tmp_path / "swarph"
+    fake.write_text("#!/bin/sh\nexit 0\n")
+    fake.chmod(0o755)
+    # Simulate `./swarph` from cwd=tmp_path
+    monkeypatch.chdir(tmp_path)
+    monkeypatch.setattr("sys.argv", ["./swarph", "watchdog"])
+    # shutil.which('./swarph') returns the relative path as-is when the
+    # input contains a slash. _resolve_swarph_bin must abspath it.
+    resolved = _resolve_swarph_bin()
+    assert Path(resolved).is_absolute(), (
+        f"resolver returned non-absolute path: {resolved!r}"
+    )
+    assert resolved == str(fake)