fusion-cli 1.2.1__tar.gz → 1.3.2__tar.gz

{fusion_cli-1.2.1 → fusion_cli-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fusion-cli
-Version: 1.2.1
+Version: 1.3.2
 Summary: The Fusion reference CLI — the notary of the Fusion Convention.
 Author: Bluewaves Boutique
 License-Expression: MIT
@@ -38,7 +38,7 @@ uv tool install ./fusion/cli
 fusion --version
 ```
 
-## The nine commands (there is no tenth)
+## The ten commands (there is no eleventh)
 
 | Command | Does |
 |---|---|
@@ -51,8 +51,11 @@ fusion --version
 | `fusion today` | The composed day, across every bucket in the hub |
 | `fusion agenda` | The wider horizon — dated and active, across the hub |
 | `fusion setup` | Install the skills to `~/.agents/skills` and serve every detected agent (links only where needed) — the installer's brain. `--remove` undoes it |
+| `fusion update` | Bring the whole system current: upgrade fusion-cli through uv, then re-run setup from the new binary so the skills refresh everywhere. Equivalent to `uv tool upgrade fusion-cli && fusion setup` |
 
-Every command takes `--json` (agents parse, never scrape). `log`, `new`,
+Every command takes `--json` (agents parse, never scrape) — except
+`update`, which composes two processes (uv, then setup) that own
+stdout in turn. `log`, `new`,
 and `index` take `--as <actor>`; the pen defaults to `FUSION_ACTOR`, then
 the OS username. `status` and `log` take `--since <date|last-reflection>`.
 `log` also takes `--bucket` (resolves the ledger; default: walk up from the current directory).

{fusion_cli-1.2.1 → fusion_cli-1.3.2}/README.md

@@ -28,7 +28,7 @@ uv tool install ./fusion/cli
 fusion --version
 ```
 
-## The nine commands (there is no tenth)
+## The ten commands (there is no eleventh)
 
 | Command | Does |
 |---|---|
@@ -41,8 +41,11 @@ fusion --version
 | `fusion today` | The composed day, across every bucket in the hub |
 | `fusion agenda` | The wider horizon — dated and active, across the hub |
 | `fusion setup` | Install the skills to `~/.agents/skills` and serve every detected agent (links only where needed) — the installer's brain. `--remove` undoes it |
+| `fusion update` | Bring the whole system current: upgrade fusion-cli through uv, then re-run setup from the new binary so the skills refresh everywhere. Equivalent to `uv tool upgrade fusion-cli && fusion setup` |
 
-Every command takes `--json` (agents parse, never scrape). `log`, `new`,
+Every command takes `--json` (agents parse, never scrape) — except
+`update`, which composes two processes (uv, then setup) that own
+stdout in turn. `log`, `new`,
 and `index` take `--as <actor>`; the pen defaults to `FUSION_ACTOR`, then
 the OS username. `status` and `log` take `--since <date|last-reflection>`.
 `log` also takes `--bucket` (resolves the ledger; default: walk up from the current directory).

{fusion_cli-1.2.1 → fusion_cli-1.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fusion-cli"
-version = "1.2.1"
+version = "1.3.2"
 description = "The Fusion reference CLI — the notary of the Fusion Convention."
 readme = "README.md"
 requires-python = ">=3.11"

{fusion_cli-1.2.1 → fusion_cli-1.3.2}/src/fusion/cli.py

@@ -319,6 +319,21 @@ def _render_setup(report: dict) -> list[str]:
     return lines
 
 
+def cmd_update(args) -> int:
+    from fusion import update as update_mod
+    setup_args = []
+    if args.force:
+        setup_args.append("--force")
+    if args.skills_dir:
+        setup_args += ["--skills-dir", args.skills_dir]
+    if args.no_agents:
+        setup_args.append("--no-agents")
+    try:
+        return update_mod.run_update(Path.home(), setup_args)
+    except update_mod.UpdateError as exc:
+        return _fail(str(exc))
+
+
 # ── parser ───────────────────────────────────────────────────────────────
 
 def build_parser() -> argparse.ArgumentParser:
@@ -418,6 +433,20 @@ def build_parser() -> argparse.ArgumentParser:
     flag_json(p)
     p.set_defaults(func=cmd_setup)
 
+    p = sub.add_parser("update", help="upgrade fusion-cli and refresh the skills",
+                       description="Bring the whole system current: upgrade "
+                       "fusion-cli through uv, then re-run `fusion setup` "
+                       "from the new binary so the bundled skills refresh "
+                       "everywhere setup put them. Equivalent to: "
+                       "uv tool upgrade fusion-cli && fusion setup.")
+    p.add_argument("--force", action="store_true",
+                   help="forwarded to setup: replace foreign entries")
+    p.add_argument("--skills-dir",
+                   help="forwarded to setup: canonical destination")
+    p.add_argument("--no-agents", action="store_true",
+                   help="forwarded to setup: skip agent fan-out")
+    p.set_defaults(func=cmd_update)
+
     return parser
 
 

fusion_cli-1.3.2/src/fusion/update.py

@@ -0,0 +1,85 @@
+"""fusion update — one verb to bring the whole system current.
+
+Upgrades fusion-cli through uv, then re-runs `fusion setup` from the
+NEW binary: this process keeps the old skills payload in memory, so
+setup must run in a child for the refreshed payload to land. Every
+decision is testable without a real subprocess — the runner is a seam.
+"""
+from __future__ import annotations
+
+import os
+import shutil
+import subprocess
+import sys
+from pathlib import Path
+
+from .setup import payload_version
+
+
+class UpdateError(Exception):
+    """An update step that cannot proceed."""
+
+
+def _runner():
+    return subprocess.run
+
+
+def find_uv(home: Path) -> Path | None:
+    found = shutil.which("uv")
+    if found:
+        return Path(found)
+    # install.sh's landing spot, for shells whose PATH never learned it
+    for name in ("uv.exe", "uv") if os.name == "nt" else ("uv",):
+        candidate = home / ".local" / "bin" / name
+        if candidate.is_file() and os.access(candidate, os.X_OK):
+            return candidate
+    return None
+
+
+def uv_owns_install(uv: Path, run) -> bool:
+    proc = run([str(uv), "tool", "list"], capture_output=True, text=True)
+    if proc.returncode != 0:
+        return False
+    return any(line.split()[:1] == ["fusion-cli"]
+               for line in proc.stdout.splitlines())
+
+
+def fusion_binary(uv: Path, run) -> Path:
+    proc = run([str(uv), "tool", "dir", "--bin"],
+               capture_output=True, text=True)
+    if proc.returncode != 0 or not proc.stdout.strip():
+        raise UpdateError(
+            "could not resolve uv's tool bin dir — finish by hand: "
+            "uv tool dir --bin, then <that dir>/fusion setup")
+    bin_dir = Path(proc.stdout.strip())
+    for name in ("fusion", "fusion.exe"):
+        candidate = bin_dir / name
+        if candidate.is_file():
+            return candidate
+    raise UpdateError(
+        f"fusion not found in {bin_dir} after the upgrade — "
+        f"check: uv tool list")
+
+
+def run_update(home: Path, setup_args: list[str]) -> int:
+    run = _runner()
+    uv = find_uv(home)
+    if uv is None:
+        raise UpdateError(
+            "uv not found — fusion updates through uv "
+            "(https://docs.astral.sh/uv/). Install it, or upgrade "
+            "fusion-cli with whatever installed it, then run: fusion setup")
+    if not uv_owns_install(uv, run):
+        raise UpdateError(
+            "this fusion-cli is not managed by uv — upgrade it with "
+            "whatever installed it (pip, pipx, a checkout), then run: "
+            "fusion setup")
+    print(f"fusion-cli {payload_version()} — asking uv for newer…")
+    sys.stdout.flush()  # keep our line ahead of uv's inherited stdio
+    if run([str(uv), "tool", "upgrade", "fusion-cli"]).returncode != 0:
+        raise UpdateError(
+            "uv tool upgrade failed — on Windows the running fusion.exe "
+            "can hold the lock. Exit this process, then run: "
+            "uv tool upgrade fusion-cli && fusion setup")
+    child = run([str(fusion_binary(uv, run)), "setup", *setup_args])
+    return child.returncode

fusion_cli-1.3.2/tests/test_cli_update.py

@@ -0,0 +1,140 @@
+"""fusion update end to end through the CLI surface.
+
+Same isolation contract as test_cli_setup.py: no real subprocess is
+ever reached; a fake runner records the exact command sequence.
+"""
+import subprocess
+from pathlib import Path
+from types import SimpleNamespace
+
+import pytest
+
+from fusion import update
+from fusion.cli import build_parser, main
+
+# find_uv wraps which()'s answer in Path, so the argv the runner sees is
+# the platform's rendering of this stub ("\\stub\\uv" on Windows).
+STUB_UV = str(Path("/stub/uv"))
+
+
+class FakeRunner:
+    """Answers uv/fusion invocations from a script of canned results."""
+
+    def __init__(self, bin_dir: Path, *, list_stdout="fusion-cli v1.2.1\n- fusion\n",
+                 list_rc=0, upgrade_rc=0, setup_rc=0):
+        self.bin_dir = bin_dir
+        self.list_stdout = list_stdout
+        self.list_rc = list_rc
+        self.upgrade_rc = upgrade_rc
+        self.setup_rc = setup_rc
+        self.calls = []
+
+    def __call__(self, argv, **kwargs):
+        self.calls.append([str(a) for a in argv])
+        prog, rest = Path(argv[0]).name, [str(a) for a in argv[1:]]
+        if prog.startswith("uv") and rest == ["tool", "list"]:
+            return SimpleNamespace(returncode=self.list_rc,
+                                   stdout=self.list_stdout, stderr="")
+        if prog.startswith("uv") and rest == ["tool", "upgrade", "fusion-cli"]:
+            return SimpleNamespace(returncode=self.upgrade_rc, stdout="", stderr="")
+        if prog.startswith("uv") and rest == ["tool", "dir", "--bin"]:
+            return SimpleNamespace(returncode=0, stdout=f"{self.bin_dir}\n", stderr="")
+        if prog.startswith("fusion") and rest[:1] == ["setup"]:
+            return SimpleNamespace(returncode=self.setup_rc, stdout="", stderr="")
+        raise AssertionError(f"unexpected command: {argv}")
+
+
+@pytest.fixture
+def sandbox(tmp_path, monkeypatch):
+    home = tmp_path / "home"
+    home.mkdir()
+    monkeypatch.setenv("HOME", str(home))
+    monkeypatch.setenv("USERPROFILE", str(home))          # windows
+    monkeypatch.setattr(Path, "home", classmethod(lambda cls: home))
+    monkeypatch.setattr(update.shutil, "which",
+                        lambda name, *a, **kw: "/stub/uv" if name == "uv" else None)
+    monkeypatch.setattr(subprocess, "run",
+                        lambda *a, **kw: pytest.fail("real subprocess reached"))
+    bin_dir = tmp_path / "toolbin"
+    bin_dir.mkdir()
+    (bin_dir / "fusion").write_text("")
+    return SimpleNamespace(home=home, bin_dir=bin_dir)
+
+
+def _install_runner(monkeypatch, runner):
+    monkeypatch.setattr(update, "_runner", lambda: runner)
+
+
+def test_update_happy_path_runs_upgrade_then_setup(sandbox, monkeypatch, capsys):
+    runner = FakeRunner(sandbox.bin_dir)
+    _install_runner(monkeypatch, runner)
+    assert main(["update"]) == 0
+    assert runner.calls == [
+        [STUB_UV, "tool", "list"],
+        [STUB_UV, "tool", "upgrade", "fusion-cli"],
+        [STUB_UV, "tool", "dir", "--bin"],
+        [str(sandbox.bin_dir / "fusion"), "setup"],
+    ]
+
+
+def test_update_forwards_setup_flags(sandbox, monkeypatch):
+    runner = FakeRunner(sandbox.bin_dir)
+    _install_runner(monkeypatch, runner)
+    custom = str(sandbox.home / "custom-skills")
+    assert main(["update", "--force", "--skills-dir", custom,
+                 "--no-agents"]) == 0
+    assert runner.calls[-1] == [str(sandbox.bin_dir / "fusion"), "setup",
+                                "--force", "--skills-dir", custom,
+                                "--no-agents"]
+
+
+def test_update_propagates_setup_exit_code(sandbox, monkeypatch):
+    runner = FakeRunner(sandbox.bin_dir, setup_rc=3)
+    _install_runner(monkeypatch, runner)
+    assert main(["update"]) == 3
+
+
+def test_update_without_uv_fails_with_manual_path(sandbox, monkeypatch, capsys):
+    monkeypatch.setattr(update.shutil, "which", lambda name, *a, **kw: None)
+    _install_runner(monkeypatch, FakeRunner(sandbox.bin_dir))
+    assert main(["update"]) == 1
+    err = capsys.readouterr().err
+    assert "uv" in err and "fusion setup" in err
+
+
+def test_update_finds_uv_at_install_sh_fallback(sandbox, monkeypatch):
+    monkeypatch.setattr(update.shutil, "which", lambda name, *a, **kw: None)
+    fallback = sandbox.home / ".local" / "bin" / "uv"
+    fallback.parent.mkdir(parents=True)
+    fallback.write_text("")
+    fallback.chmod(0o755)
+    runner = FakeRunner(sandbox.bin_dir)
+    _install_runner(monkeypatch, runner)
+    assert main(["update"]) == 0
+    assert runner.calls[0][0] == str(fallback)
+
+
+def test_update_refuses_non_uv_install(sandbox, monkeypatch, capsys):
+    runner = FakeRunner(sandbox.bin_dir, list_stdout="black v24.0.0\n- black\n")
+    _install_runner(monkeypatch, runner)
+    assert main(["update"]) == 1
+    err = capsys.readouterr().err
+    assert "not managed by uv" in err and "fusion setup" in err
+    # never got as far as upgrading
+    assert [STUB_UV, "tool", "upgrade", "fusion-cli"] not in runner.calls
+    assert runner.calls == [[STUB_UV, "tool", "list"]]
+
+
+def test_update_reports_failed_upgrade_with_retry_ritual(sandbox, monkeypatch,
+                                                         capsys):
+    runner = FakeRunner(sandbox.bin_dir, upgrade_rc=1)
+    _install_runner(monkeypatch, runner)
+    assert main(["update"]) == 1
+    err = capsys.readouterr().err
+    assert "uv tool upgrade fusion-cli && fusion setup" in err
+    # setup never ran on a failed upgrade
+    assert all(c[1:2] != ["setup"] for c in runner.calls)
+
+
+def test_update_appears_in_help(sandbox):
+    assert "update" in build_parser().format_help()

{fusion_cli-1.2.1 → fusion_cli-1.3.2}/uv.lock

@@ -13,7 +13,7 @@ wheels = [
 
 [[package]]
 name = "fusion-cli"
-version = "1.2.1"
+version = "1.3.2"
 source = { editable = "." }
 dependencies = [
     { name = "pyyaml" },