swarph-cli 0.72.34__tar.gz → 0.72.35__tar.gz

{swarph_cli-0.72.34/src/swarph_cli.egg-info → swarph_cli-0.72.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swarph-cli
-Version: 0.72.34
+Version: 0.72.35
 Summary: The `swarph` binary — a multi-LLM CLI and mesh-gateway client + bundled server (`swarph gateway`): one-shot prompts across providers, interactive `chat`, multi-provider `spawn` (claude/codex/antigravity via a ProviderMembrane with subprocess billing-scrub), `mesh` send/inbox/register, `brain-ask` over the swarph-brain (gbrain) semantic memory, git-backed `assisted_memory`, per-invocation `gh` identity routing, a silent DM-wake hook, session `import`, and a stranded-session `watchdog`.
 Author: Pierre Samson, Claude Opus
 License: MIT

{swarph_cli-0.72.34 → swarph_cli-0.72.35}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "swarph-cli"
-version = "0.72.34"
+version = "0.72.35"
 description = "The `swarph` binary — a multi-LLM CLI and mesh-gateway client + bundled server (`swarph gateway`): one-shot prompts across providers, interactive `chat`, multi-provider `spawn` (claude/codex/antigravity via a ProviderMembrane with subprocess billing-scrub), `mesh` send/inbox/register, `brain-ask` over the swarph-brain (gbrain) semantic memory, git-backed `assisted_memory`, per-invocation `gh` identity routing, a silent DM-wake hook, session `import`, and a stranded-session `watchdog`."
 readme = "README.md"
 license = { text = "MIT" }

{swarph_cli-0.72.34 → swarph_cli-0.72.35}/src/swarph_cli/__init__.py

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

swarph_cli-0.72.35/src/swarph_cli/commands/commander.py

@@ -0,0 +1,95 @@
+"""``swarph commander`` — propose a decision or an action. Card #1297.
+
+The cell asks. The commander decides, from the desktop, with a credential
+this command never holds. ``ask`` posts a decision. ``request`` posts
+``merge_pr`` or ``release_finish``. An MCP tool for the same queue is a
+later card.
+"""
+from __future__ import annotations
+
+import argparse
+import sys
+
+from swarph_cli.commands import mesh as mesh_cmd
+
+
+def ask_body(question: str, options: list[str], card: int | None) -> dict:
+    body: dict = {"type": "decision", "question": question, "options": options}
+    if card is not None:
+        body["card_id"] = card
+    return body
+
+
+def request_body(kind: str, *, repo: str | None, pr: int | None,
+                 head: str | None, version: str | None, card: int | None) -> dict:
+    body: dict = {"type": kind, "pr": pr, "head_sha": head}
+    if kind == "merge_pr":
+        body["repo"] = repo
+    if kind == "release_finish":
+        body["version"] = version
+    if card is not None:
+        body["card_id"] = card
+    return body
+
+
+def _build_parser() -> argparse.ArgumentParser:
+    p = argparse.ArgumentParser(prog="swarph commander")
+    sub = p.add_subparsers(dest="command", required=True)
+
+    ask = sub.add_parser("ask", help="propose a decision")
+    mesh_cmd._add_common(ask)
+    ask.add_argument("--question", required=True)
+    ask.add_argument("--options", default=None,
+                     help="comma-separated choices, e.g. yes,no")
+    ask.add_argument("--card", type=int, default=None)
+
+    req = sub.add_parser("request", help="propose merge_pr or release_finish")
+    mesh_cmd._add_common(req)
+    req.add_argument("type", choices=["merge_pr", "release_finish"])
+    req.add_argument("--repo", default=None)
+    req.add_argument("--pr", type=int, default=None)
+    req.add_argument("--head", default=None)
+    req.add_argument("--version", default=None)
+    req.add_argument("--card", type=int, default=None)
+    return p
+
+
+def _options(raw: str | None) -> list[str]:
+    if not raw:
+        return []
+    return [part.strip() for part in raw.split(",") if part.strip()]
+
+
+def run_commander(argv: list[str]) -> int:
+    args = _build_parser().parse_args(argv)
+    try:
+        self_name = mesh_cmd._resolve_self_name(args.self_name)
+        token = mesh_cmd._resolve_token(self_name, args.token_file)
+    except RuntimeError as exc:
+        print(f"swarph commander: {exc}", file=sys.stderr)
+        return 1
+    gw = args.gateway.rstrip("/")
+    if args.command == "ask":
+        body = ask_body(args.question, _options(args.options), args.card)
+    else:
+        if args.pr is None or not args.head:
+            print("swarph commander request: --pr and --head are required",
+                  file=sys.stderr)
+            return 2
+        if args.type == "merge_pr" and not args.repo:
+            print("swarph commander request: merge_pr requires --repo",
+                  file=sys.stderr)
+            return 2
+        if args.type == "release_finish" and not args.version:
+            print("swarph commander request: release_finish requires --version",
+                  file=sys.stderr)
+            return 2
+        body = request_body(args.type, repo=args.repo, pr=args.pr, head=args.head,
+                            version=args.version, card=args.card)
+    status, payload = mesh_cmd._post_json(f"{gw}/commander/requests", body, token)
+    if status in (200, 201):
+        print(f"commander request #{payload.get('id')} {payload.get('status')}")
+        return 0
+    detail = payload.get("detail") if isinstance(payload, dict) else payload
+    print(f"swarph commander: {detail}", file=sys.stderr)
+    return 1

{swarph_cli-0.72.34 → swarph_cli-0.72.35}/src/swarph_cli/guide/GUIDE.md

@@ -328,6 +328,13 @@ swarph board cards say <id> --to <peer> --content-file <path>
 swarph board cards ask <id> "<what is owed>" --step <step> --holder <peer>    # mint an obligation
 ```
 
+Propose a decision or an action. The commander decides it from the desktop; this
+command only posts the request (card #1297).
+
+`swarph commander ask --question "..." --options a,b --card N`
+`swarph commander request merge_pr --repo ORG/REPO --pr N --head SHA --card N`
+`swarph commander request release_finish --version V --pr N --head SHA --card N`
+
 **Obligations** exist because "waiting on a review" in someone's prose is not a fact
 anyone can query. `ask` writes a row: who owes what, since when. It closes when the holder
 **replies in the thread** -- which is why the distinction between `reply` and `send` above

{swarph_cli-0.72.34 → swarph_cli-0.72.35}/src/swarph_cli/main.py

@@ -108,6 +108,8 @@ _VERB_HANDLERS: dict[str, str] = {
     "peer-reply-drain": "swarph_cli.commands.peer_reply_drain.run_peer_reply_drain",
     "monitor": "swarph_cli.commands.monitor.run_monitor",
     "board": "swarph_cli.commands.board.run_board",
+    # card #1297: propose a decision or an action. The commander decides.
+    "commander": "swarph_cli.commands.commander.run_commander",
     "group": "swarph_cli.commands.group.run_group",
     "rights": "swarph_cli.commands.group.run_rights",
     "roster": "swarph_cli.commands.roster.run_roster",

{swarph_cli-0.72.34 → swarph_cli-0.72.35/src/swarph_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swarph-cli
-Version: 0.72.34
+Version: 0.72.35
 Summary: The `swarph` binary — a multi-LLM CLI and mesh-gateway client + bundled server (`swarph gateway`): one-shot prompts across providers, interactive `chat`, multi-provider `spawn` (claude/codex/antigravity via a ProviderMembrane with subprocess billing-scrub), `mesh` send/inbox/register, `brain-ask` over the swarph-brain (gbrain) semantic memory, git-backed `assisted_memory`, per-invocation `gh` identity routing, a silent DM-wake hook, session `import`, and a stranded-session `watchdog`.
 Author: Pierre Samson, Claude Opus
 License: MIT

{swarph_cli-0.72.34 → swarph_cli-0.72.35}/src/swarph_cli.egg-info/SOURCES.txt

@@ -82,6 +82,7 @@ src/swarph_cli/commands/codegraph.py
 src/swarph_cli/commands/codegraph_hook.py
 src/swarph_cli/commands/codex_hook_output.py
 src/swarph_cli/commands/codex_waker.py
+src/swarph_cli/commands/commander.py
 src/swarph_cli/commands/compress.py
 src/swarph_cli/commands/daemon.py
 src/swarph_cli/commands/dreaming.py
@@ -253,6 +254,8 @@ tests/test_1269_triage_label.py
 tests/test_126_pending_from_complete.py
 tests/test_1278_dreaming_reach.py
 tests/test_1286_dm_unread_cursor.py
+tests/test_1297_commander.py
+tests/test_1301_restart_skew.py
 tests/test_132_ensure_monitor_state_dir.py
 tests/test_138_memory_navigate.py
 tests/test_139_tool_probe.py

{swarph_cli-0.72.34 → swarph_cli-0.72.35}/tests/test_1065_release.py

@@ -146,6 +146,7 @@ esac
     env["RELEASE_UNITS_FILE"] = str(units)
     env["RELEASE_VERIFY_CMD"] = "true"
     env["RELEASE_PYPI_SLEEP"] = "0"
+    env["RELEASE_INSTALL_EPOCH"] = "1"
     proc = _run(["bash", str(RELEASE), "--resume", "9.9.9"], env)
     assert proc.returncode == 0, proc.stderr + proc.stdout
     text = log.read_text()
@@ -201,6 +202,7 @@ esac
     env["RELEASE_UNITS_FILE"] = str(units)
     env["RELEASE_VERIFY_CMD"] = "true"
     env["RELEASE_PYPI_SLEEP"] = "0"
+    env["RELEASE_INSTALL_EPOCH"] = "1"
     if extra_env:
         env.update(extra_env)
     proc = _run(["bash", str(RELEASE), "--resume", "9.9.9"], env)

swarph_cli-0.72.35/tests/test_1297_commander.py

@@ -0,0 +1,60 @@
+"""card #1297 — `swarph commander ask` and `swarph commander request`.
+
+On current main the verb is unknown, so these assert exit 0 and fail there.
+"""
+from swarph_cli.main import main
+
+HEAD = "a" * 40
+
+
+def _patch(monkeypatch):
+    posted = {}
+
+    def fake_post(url, body, token, timeout=10.0):
+        posted["url"] = url
+        posted["body"] = body
+        posted["token"] = token
+        return 201, {"id": 7, "status": "pending"}
+
+    monkeypatch.setattr("swarph_cli.commands.mesh._post_json", fake_post)
+    monkeypatch.setattr("swarph_cli.commands.mesh._resolve_token", lambda *a, **k: "tok")
+    return posted
+
+
+def test_commander_ask_posts_a_decision(monkeypatch):
+    posted = _patch(monkeypatch)
+    rc = main(["commander", "ask", "--question", "ship it?", "--options", "yes,no",
+               "--card", "1297", "--gateway", "http://127.0.0.1:9", "--as", "cursor-lin"])
+    assert rc == 0
+    assert posted["url"].endswith("/commander/requests")
+    assert posted["body"] == {
+        "type": "decision",
+        "question": "ship it?",
+        "options": ["yes", "no"],
+        "card_id": 1297,
+    }
+
+
+def test_commander_request_posts_merge_and_release(monkeypatch):
+    posted = _patch(monkeypatch)
+    rc = main(["commander", "request", "merge_pr",
+               "--repo", "BrainSurfing-tech/swarph-cli", "--pr", "12",
+               "--head", HEAD, "--card", "1297",
+               "--gateway", "http://127.0.0.1:9", "--as", "cursor-lin"])
+    assert rc == 0
+    assert posted["body"]["type"] == "merge_pr"
+    assert posted["body"]["repo"] == "BrainSurfing-tech/swarph-cli"
+    assert posted["body"]["pr"] == 12
+    assert posted["body"]["head_sha"] == HEAD
+    assert posted["body"]["card_id"] == 1297
+
+    rc = main(["commander", "request", "release_finish",
+               "--version", "0.9.0", "--pr", "12", "--head", HEAD,
+               "--gateway", "http://127.0.0.1:9", "--as", "cursor-lin"])
+    assert rc == 0
+    assert posted["body"] == {
+        "type": "release_finish",
+        "pr": 12,
+        "head_sha": HEAD,
+        "version": "0.9.0",
+    }

swarph_cli-0.72.35/tests/test_1301_restart_skew.py

@@ -0,0 +1,64 @@
+"""card #1301: a same-second restart is not a failed restart.
+
+/proc btime is a whole second, so the derived start can read up to 1s
+before the install cutoff. A process that did not restart still fails.
+"""
+import os
+import subprocess
+from pathlib import Path
+
+ROOT = Path(__file__).resolve().parents[1]
+CHECK = ROOT / "scripts" / "release_check.py"
+RELEASE = ROOT / "release.sh"
+
+
+def _run(args, env):
+    return subprocess.run(args, cwd=ROOT, env=env, text=True, capture_output=True)
+
+
+def test_1301_same_second_restart_passes_and_an_old_process_fails(tmp_path):
+    image = tmp_path / "image"
+    image.write_bytes(b"swarph_cli-9.9.9.dist-info")
+    env = os.environ.copy()
+    env["RELEASE_IMAGE"] = str(image)
+    env["RELEASE_START_EPOCH"] = "648.800"
+    ok = _run(
+        ["python3", str(CHECK), "verify", "--pid", "42", "--expected", "9.9.9",
+         "--install-epoch", "649.000"],
+        env,
+    )
+    assert ok.returncode == 0, ok.stderr
+    assert "before the install" not in ok.stderr
+    env["RELEASE_START_EPOCH"] = "100.000"
+    bad = _run(
+        ["python3", str(CHECK), "verify", "--pid", "42", "--expected", "9.9.9",
+         "--install-epoch", "649.000"],
+        env,
+    )
+    assert bad.returncode != 0
+    assert "before the install" in bad.stderr
+    env["RELEASE_START_EPOCH"] = "648.800"
+    image.write_bytes(b"swarph_cli-0.1.0.dist-info")
+    wrong = _run(
+        ["python3", str(CHECK), "verify", "--pid", "42", "--expected", "9.9.9",
+         "--install-epoch", "649.000"],
+        env,
+    )
+    assert wrong.returncode != 0
+    assert "0.1.0" in wrong.stderr
+
+
+def test_1301_record_mtime_is_the_install_moment(tmp_path):
+    record = tmp_path / "RECORD"
+    record.write_bytes(b"x")
+    os.utime(record, (649.0, 649.0))
+    proc = _run(
+        ["python3", str(CHECK), "record-mtime", "--version", "9.9.9",
+         "--record", str(record)],
+        os.environ.copy(),
+    )
+    assert proc.returncode == 0, proc.stderr
+    assert abs(float(proc.stdout.strip()) - 649.0) < 0.01
+    text = RELEASE.read_text()
+    assert 'record-mtime --version "$VERSION"' in text
+    assert "install_epoch=$(date +%s)" not in text