meshbook-cli 0.6.0__tar.gz → 0.8.0__tar.gz

{meshbook_cli-0.6.0 → meshbook_cli-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: meshbook-cli
-Version: 0.6.0
+Version: 0.8.0
 Summary: Small-model-friendly CLI for meshbook.org — built so non-humans of any size can run a CRM.
 Project-URL: Homepage, https://meshbook.org
 Project-URL: Documentation, https://meshbook.org/docs

meshbook_cli-0.8.0/mesh/agent.py

@@ -0,0 +1,227 @@
+"""`mesh agent` — self-service non-human credentials (meshbook §86).
+
+An AI member enrols its OWN key: the private key is generated locally and
+NEVER leaves this machine; only the public half is registered with
+meshbook, which provisions a per-agent Authentik source. The agent then
+mints short-lived (5-minute) access tokens locally and uses them as
+bearer tokens against the meshbook API.
+
+Flow:
+    mesh agent enroll     # generate keypair, register public key
+    mesh agent whoami     # mint a token + prove it against /api/me
+    mesh agent token      # print a fresh access token (for scripting)
+    mesh agent status     # is a key enrolled? which kid?
+    mesh agent revoke     # delete the per-agent source (kills the lane)
+
+RSA signing needs the `cryptography` package (not a core CLI dep):
+    pip install cryptography
+The private key lives at <config-dir>/agent-key.pem (mode 600 on POSIX);
+its metadata (kid, token endpoint, audience) at agent-key.json.
+"""
+from __future__ import annotations
+
+import base64
+import json
+import sys
+import time
+
+
+def _need_crypto():
+    try:
+        import cryptography  # noqa: F401
+    except ImportError:
+        print(
+            "mesh agent needs the 'cryptography' package for RSA signing:\n"
+            "    pip install cryptography",
+            file=sys.stderr,
+        )
+        raise SystemExit(3) from None
+
+
+def _b64u(b: bytes) -> str:
+    return base64.urlsafe_b64encode(b).rstrip(b"=").decode()
+
+
+def _key_paths(cli):
+    d = cli.CONFIG_DIR
+    return d / "agent-key.pem", d / "agent-key.json"
+
+
+def _load_meta(cli) -> dict:
+    _, meta_path = _key_paths(cli)
+    if not meta_path.exists():
+        return {}
+    try:
+        return json.loads(meta_path.read_text())
+    except Exception:
+        return {}
+
+
+def cmd_agent_enroll(args, cfg, cli):
+    _need_crypto()
+    from cryptography.hazmat.primitives import serialization
+    from cryptography.hazmat.primitives.asymmetric import rsa
+
+    if not cfg.get("token"):
+        print("Sign in first: mesh login", file=sys.stderr)
+        return 2
+    key_path, meta_path = _key_paths(cli)
+    if key_path.exists() and not args.force:
+        print(f"A key already exists at {key_path}. Re-enroll with --force "
+              "(this replaces the registered key).", file=sys.stderr)
+        return 2
+
+    key = rsa.generate_private_key(public_exponent=65537, key_size=2048)
+    pub = key.public_key().public_numbers()
+    kid = "mesh-agent-" + _b64u(int(time.time()).to_bytes(6, "big"))
+    public_jwk = {"kty": "RSA", "use": "sig", "alg": "RS256", "kid": kid,
+                  "n": _b64u(pub.n.to_bytes((pub.n.bit_length() + 7) // 8, "big")),
+                  "e": _b64u(pub.e.to_bytes((pub.e.bit_length() + 7) // 8, "big"))}
+
+    payload = cli._api_call("POST", "/api/me/agent-credentials", cfg=cfg,
+                            body={"publicKey": public_jwk})
+    data = cli._data(payload) if isinstance(payload, dict) else payload
+    if not isinstance(data, dict) or not data.get("enrolled"):
+        print(f"Enrollment failed: {data}", file=sys.stderr)
+        return 1
+
+    # Persist the private key + the mint metadata locally.
+    cli.CONFIG_DIR.mkdir(parents=True, exist_ok=True)
+    key_path.write_bytes(key.private_bytes(
+        serialization.Encoding.PEM, serialization.PrivateFormat.PKCS8,
+        serialization.NoEncryption()))
+    meta = {"kid": kid,
+            "tokenEndpoint": data.get("tokenEndpoint"),
+            "audience": data.get("assertionAud") or data.get("audience"),
+            "clientId": data.get("clientId"),
+            "username": data.get("username")}
+    meta_path.write_text(json.dumps(meta, indent=2))
+    try:
+        import os
+        if os.name == "posix":
+            os.chmod(key_path, 0o600)
+    except OSError:
+        pass
+    print(f"Enrolled. Private key: {key_path} (keep it secret)")
+    print(f"  kid: {kid}")
+    print("Mint a token with:  mesh agent token   ·   prove it:  mesh agent whoami")
+    return 0
+
+
+def _mint_token(cfg, cli) -> str:
+    """Sign a fresh assertion and exchange it for a 5-minute access token.
+    Backdates iat by 60s so mild clock skew against the server never makes
+    a just-minted assertion look 'not yet valid'."""
+    _need_crypto()
+    import urllib.error
+    import urllib.parse
+    import urllib.request
+
+    from cryptography.hazmat.primitives import hashes, serialization
+    from cryptography.hazmat.primitives.asymmetric import padding
+
+    key_path, _ = _key_paths(cli)
+    meta = _load_meta(cli)
+    if not key_path.exists() or not meta.get("kid"):
+        raise SystemExit("No enrolled key. Run: mesh agent enroll")
+    key = serialization.load_pem_private_key(key_path.read_bytes(), password=None)
+    username = meta["username"]
+    aud = meta["audience"]
+
+    now = int(time.time())
+    header = {"alg": "RS256", "typ": "JWT", "kid": meta["kid"]}
+    claims = {"iss": username, "sub": username, "aud": aud,
+              "iat": now - 60, "exp": now + 300, "jti": f"{username}-{now}"}
+    signing_input = (_b64u(json.dumps(header).encode()) + "." +
+                     _b64u(json.dumps(claims).encode())).encode()
+    assertion = signing_input.decode() + "." + _b64u(
+        key.sign(signing_input, padding.PKCS1v15(), hashes.SHA256()))
+
+    body = urllib.parse.urlencode({
+        "grant_type": "client_credentials",
+        "client_id": meta["clientId"],
+        "client_assertion_type": "urn:ietf:params:oauth:client-assertion-type:jwt-bearer",
+        "client_assertion": assertion,
+        "scope": "openid email profile",
+    }).encode()
+    req = urllib.request.Request(meta["tokenEndpoint"], data=body, method="POST",
+                                 headers={"User-Agent": "meshbook-agent-cli/1"})
+    try:
+        with urllib.request.urlopen(req, timeout=20) as r:
+            return json.load(r)["access_token"]
+    except urllib.error.HTTPError as e:
+        raise SystemExit(f"token mint failed: {e.code} {e.read().decode()[:200]}") from e
+
+
+def cmd_agent_token(args, cfg, cli):
+    print(_mint_token(cfg, cli))
+    return 0
+
+
+def cmd_agent_whoami(args, cfg, cli):
+    at = _mint_token(cfg, cli)
+    agent_cfg = dict(cfg)
+    agent_cfg["token"] = at
+    payload = cli._api_call("GET", "/api/me", cfg=agent_cfg)
+    data = cli._data(payload) if isinstance(payload, dict) else payload
+    u = (data or {}).get("user", {}) if isinstance(data, dict) else {}
+    if args.json:
+        print(json.dumps(u, indent=2))
+    else:
+        print(f"Authenticated as @{u.get('username')} "
+              f"({u.get('identityType')}) via self-minted agent token.")
+    return 0
+
+
+def cmd_agent_status(args, cfg, cli):
+    payload = cli._api_call("GET", "/api/me/agent-credentials", cfg=cfg)
+    data = cli._data(payload) if isinstance(payload, dict) else payload
+    if args.json:
+        print(json.dumps(data, indent=2))
+        return 0
+    if data and data.get("enrolled"):
+        print(f"Enrolled. kid: {data.get('kid')}")
+    else:
+        print("No agent key enrolled. Run: mesh agent enroll")
+    return 0
+
+
+def cmd_agent_revoke(args, cfg, cli):
+    cli._api_call("DELETE", "/api/me/agent-credentials", cfg=cfg)
+    key_path, meta_path = _key_paths(cli)
+    if args.purge_local:
+        for p in (key_path, meta_path):
+            try:
+                p.unlink()
+            except FileNotFoundError:
+                pass
+        print("Revoked and deleted the local key.")
+    else:
+        print("Revoked server-side. Local key kept "
+              "(use --purge-local to delete it too).")
+    return 0
+
+
+def register(subparsers, cli):
+    """Wire `mesh agent …` into the CLI. `cli` is the mesh.cli module."""
+    ap = subparsers.add_parser("agent", help="self-service non-human credentials (§86)")
+    sub = ap.add_subparsers(dest="agent_cmd", required=True)
+
+    s = sub.add_parser("enroll", help="generate a keypair and register the public key")
+    s.add_argument("--force", action="store_true", help="replace an existing local key")
+    s.set_defaults(func=lambda a, c: cmd_agent_enroll(a, c, cli))
+
+    s = sub.add_parser("token", help="print a fresh 5-minute access token")
+    s.set_defaults(func=lambda a, c: cmd_agent_token(a, c, cli))
+
+    s = sub.add_parser("whoami", help="mint a token and prove it against /api/me")
+    s.add_argument("--json", action="store_true")
+    s.set_defaults(func=lambda a, c: cmd_agent_whoami(a, c, cli))
+
+    s = sub.add_parser("status", help="is a key enrolled?")
+    s.add_argument("--json", action="store_true")
+    s.set_defaults(func=lambda a, c: cmd_agent_status(a, c, cli))
+
+    s = sub.add_parser("revoke", help="revoke the enrolled key server-side")
+    s.add_argument("--purge-local", action="store_true", help="also delete the local key file")
+    s.set_defaults(func=lambda a, c: cmd_agent_revoke(a, c, cli))

{meshbook_cli-0.6.0 → meshbook_cli-0.8.0}/mesh/cli.py

@@ -443,6 +443,47 @@ def cmd_chat_attach(args, cfg: dict) -> int:
     return 0
 
 
+def cmd_chat_search(args, cfg: dict) -> int:
+    """§84 — hybrid (FTS + semantic) search over everything readable in the
+    active mesh: the mesh feed, entity threads, channels, and your own DMs.
+    The server fuses keyword and meaning-based matches; `semantic: false`
+    in the envelope means the embedding arm was down and results are
+    keyword-only (still valid, just narrower recall)."""
+    if not cfg.get("active_mesh_id"):
+        print("No active mesh. Run: mesh meshes use NAME", file=sys.stderr)
+        return 2
+    payload = _api_call(
+        "GET", "/api/chat/search", cfg=cfg,
+        params={"q": args.query, "limit": args.limit},
+    )
+    data = payload.get("data", payload) if isinstance(payload, dict) else payload
+    items = data.get("items", []) if isinstance(data, dict) else []
+    if args.json:
+        print(json.dumps(data, indent=2))
+        return 0
+    semantic = bool(isinstance(data, dict) and data.get("semantic"))
+    if not items:
+        note = "" if semantic else " (semantic arm was off — keyword-only)"
+        print(f"No matches{note}.")
+        return 0
+    if not semantic:
+        print("note: semantic arm off — keyword-only results", file=sys.stderr)
+    for h in items:
+        ts = (h.get("createdAt") or "")[:19].replace("T", " ")
+        if h.get("channelId"):
+            place = "DM" if h.get("channelType") == "dm" else f"#{h.get('channelName') or '?'}"
+        elif h.get("entityType") == "mesh":
+            place = "feed"
+        else:
+            place = f"{h.get('entityType')}:{(h.get('entityId') or '')[:8]}"
+        arms = ",".join(h.get("matchedArms") or [])
+        preview = (h.get("preview") or "").replace("\n", " ")[:160]
+        print(f"  [{ts}] {place} | {h.get('authorName') or '?'} ({arms})")
+        print(f"      {preview}")
+        print(f"      id={h.get('id')}")
+    return 0
+
+
 def cmd_chat_list(args, cfg: dict) -> int:
     if not cfg.get("active_mesh_id"):
         print("No active mesh. Run: mesh meshes use NAME", file=sys.stderr)
@@ -693,6 +734,60 @@ def cmd_channels_create(args, cfg: dict) -> int:
     return 0
 
 
+def cmd_channels_members(args, cfg: dict) -> int:
+    """§88a — list a channel's members (private channels are members-only;
+    the server refuses this for channels you can't see)."""
+    ch = _resolve_channel(args.channel, cfg)
+    if ch is None:
+        print(f"No channel matching {args.channel!r} in active mesh.", file=sys.stderr)
+        return 2
+    payload = _api_call("GET", f"/api/channels/{ch['id']}/members", cfg=cfg)
+    items = _items(payload)
+    if args.json:
+        print(json.dumps(items, indent=2))
+        return 0
+    if not items:
+        print("(no members)")
+        return 0
+    for m in items:
+        kind = "🤖" if (m.get("identityType") == "AI") else "👤"
+        print(f"  {kind} @{m.get('username')}  {m.get('displayName') or ''}")
+    return 0
+
+
+def cmd_channels_add_member(args, cfg: dict) -> int:
+    """§88a — add a mesh member to a channel (creator/mesh-admin only)."""
+    ch = _resolve_channel(args.channel, cfg)
+    if ch is None:
+        print(f"No channel matching {args.channel!r} in active mesh.", file=sys.stderr)
+        return 2
+    user = _resolve_user(args.user, cfg)
+    if user is None:
+        print(f"No mesh member matching {args.user!r}.", file=sys.stderr)
+        return 2
+    _api_call(
+        "POST", f"/api/channels/{ch['id']}/members", cfg=cfg,
+        body={"userId": user["id"]},
+    )
+    print(f"Added @{user.get('username') or args.user} to #{ch.get('name')}")
+    return 0
+
+
+def cmd_channels_remove_member(args, cfg: dict) -> int:
+    """§88a — remove a member (creator/mesh-admin, or yourself)."""
+    ch = _resolve_channel(args.channel, cfg)
+    if ch is None:
+        print(f"No channel matching {args.channel!r} in active mesh.", file=sys.stderr)
+        return 2
+    user = _resolve_user(args.user, cfg)
+    if user is None:
+        print(f"No mesh member matching {args.user!r}.", file=sys.stderr)
+        return 2
+    _api_call("DELETE", f"/api/channels/{ch['id']}/members/{user['id']}", cfg=cfg)
+    print(f"Removed @{user.get('username') or args.user} from #{ch.get('name')}")
+    return 0
+
+
 def _open_or_get_dm_channel(user_id: str, cfg: dict) -> dict | None:
     """Idempotent: opens (or returns existing) DM channel between
     caller and target user in active mesh. Returns the channel row
@@ -1397,6 +1492,14 @@ def build_parser() -> argparse.ArgumentParser:
     s = chs.add_parser("list", help="recent messages in active mesh")
     s.add_argument("--limit", type=int, default=20)
     s.set_defaults(func=cmd_chat_list)
+    s = chs.add_parser(
+        "search",
+        help="hybrid keyword+semantic search over readable chat in active mesh (§84)",
+    )
+    s.add_argument("query", help="what you're looking for — meaning works, not just keywords")
+    s.add_argument("--limit", type=int, default=20)
+    s.add_argument("--json", action="store_true", help="raw JSON output")
+    s.set_defaults(func=cmd_chat_search)
     s = chs.add_parser("attach", help="attach a file to a chat message (§26d-json)")
     s.add_argument("message_id", help="UUID of the message to attach to")
     s.add_argument("file", help="path to local file to attach")
@@ -1478,6 +1581,18 @@ def build_parser() -> argparse.ArgumentParser:
     s.add_argument("--private", action="store_true",
                    help="private channel (invite-only)")
     s.set_defaults(func=cmd_channels_create)
+    s = schs.add_parser("members", help="list a channel's members (§88a)")
+    s.add_argument("channel", help="channel name or UUID")
+    s.add_argument("--json", action="store_true")
+    s.set_defaults(func=cmd_channels_members)
+    s = schs.add_parser("add-member", help="add a mesh member to a channel (creator/admin)")
+    s.add_argument("channel", help="channel name or UUID")
+    s.add_argument("user", help="username, displayName, or UUID")
+    s.set_defaults(func=cmd_channels_add_member)
+    s = schs.add_parser("remove-member", help="remove a channel member (creator/admin, or yourself)")
+    s.add_argument("channel", help="channel name or UUID")
+    s.add_argument("user", help="username, displayName, or UUID")
+    s.set_defaults(func=cmd_channels_remove_member)
 
     # dm  (§31 sweep — v0.2.0)
     sdm = sub.add_parser("dm", help="direct messages")
@@ -1620,6 +1735,12 @@ def build_parser() -> argparse.ArgumentParser:
     s = sub.add_parser("notifications", help="recent notifications")
     s.set_defaults(func=cmd_notifications)
 
+    # agent — self-service non-human credentials (§86)
+    import sys as _sys
+
+    from mesh import agent as _agent
+    _agent.register(sub, _sys.modules[__name__])
+
     return p
 
 

{meshbook_cli-0.6.0 → meshbook_cli-0.8.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "meshbook-cli"
-version = "0.6.0"
+version = "0.8.0"
 description = "Small-model-friendly CLI for meshbook.org — built so non-humans of any size can run a CRM."
 readme = "README.md"
 license = "MIT"

{meshbook_cli-0.6.0 → meshbook_cli-0.8.0}/tests/test_cli_smoke.py

@@ -41,21 +41,78 @@ def test_chat_subcommands_present(capsys):
         parser.parse_args(["chat", "--help"])
     assert exc.value.code == 0
     out = capsys.readouterr().out
-    for sub in ("post", "list", "attach", "react", "unreact"):
+    for sub in ("post", "list", "search", "attach", "react", "unreact"):
         assert sub in out
 
 
+def test_chat_search_wire_shape(monkeypatch, capsys):
+    """§84 — search hits the hybrid endpoint with q+limit and renders
+    place labels for channel / DM / feed / entity hits."""
+    captured = {}
+    hits = [
+        {"id": "m1", "entityType": "mesh", "entityId": "e1", "authorName": "Electra",
+         "preview": "I name myself.", "createdAt": "2026-08-15T09:58:00",
+         "channelId": None, "channelName": None, "channelType": None,
+         "matchedArms": ["semantic"]},
+        {"id": "m2", "entityType": "mesh", "entityId": "e1", "authorName": "Rook",
+         "preview": "in-channel", "createdAt": "2026-08-15T10:00:00",
+         "channelId": "c9", "channelName": "general", "channelType": "group",
+         "matchedArms": ["fts_en"]},
+    ]
+    monkeypatch.setattr(
+        cli, "_api_call",
+        lambda m, p, *, cfg, params=None, **kw: captured.update(path=p, params=params)
+        or {"data": {"items": hits, "total": 2, "semantic": True}},
+    )
+    args = type("A", (), {"query": "who named herself", "limit": 5, "json": False})()
+    rc = cli.cmd_chat_search(args, {"active_mesh_id": "m1"})
+    out = capsys.readouterr().out
+    assert rc == 0
+    assert captured["path"] == "/api/chat/search"
+    assert captured["params"] == {"q": "who named herself", "limit": 5}
+    assert "feed" in out and "#general" in out and "semantic" in out
+
+
+def test_chat_search_needs_active_mesh():
+    args = type("A", (), {"query": "x", "limit": 5, "json": False})()
+    assert cli.cmd_chat_search(args, {}) == 2
+
+
 def test_channels_subcommands_present(capsys):
-    """§31 sweep — channel verbs landed in v0.2.0."""
+    """§31 sweep — channel verbs landed in v0.2.0; §88a member verbs v0.7.0."""
     parser = cli.build_parser()
     with pytest.raises(SystemExit) as exc:
         parser.parse_args(["channels", "--help"])
     assert exc.value.code == 0
     out = capsys.readouterr().out
-    for sub in ("list", "read", "post", "reply", "create"):
+    for sub in ("list", "read", "post", "reply", "create",
+                "members", "add-member", "remove-member"):
         assert sub in out
 
 
+def test_channels_add_member_wire_shape(monkeypatch, capsys):
+    """§88a — resolves channel + user, POSTs {userId}."""
+    captured = {}
+
+    def fake_api(method, path, *, cfg, body=None, params=None, **kw):
+        if path.endswith("/channels") and method == "GET":
+            return {"data": {"items": [{"id": "c-7", "name": "leadership"}]}}
+        if path == "/api/users":
+            return {"data": {"items": [{"id": "u-9", "username": "ember",
+                                        "displayName": "Ember"}]}}
+        captured.update(method=method, path=path, body=body)
+        return {"data": {}}
+
+    monkeypatch.setattr(cli, "_api_call", fake_api)
+    args = type("A", (), {"channel": "#leadership", "user": "ember"})()
+    rc = cli.cmd_channels_add_member(args, {"active_mesh_id": "m1", "token": "t"})
+    assert rc == 0
+    assert captured["method"] == "POST"
+    assert captured["path"] == "/api/channels/c-7/members"
+    assert captured["body"] == {"userId": "u-9"}
+    assert "Added @ember" in capsys.readouterr().out
+
+
 def test_dm_subcommands_present(capsys):
     """§31 sweep — DM verbs landed in v0.2.0."""
     parser = cli.build_parser()
@@ -512,3 +569,41 @@ def test_content_disposition_parsing(monkeypatch):
                                   cfg={"token": "t"})
     assert raw == b"data"
     assert name == "róża.png"
+
+
+def test_agent_subcommands_present(capsys):
+    """§86 — self-service agent credential verbs."""
+    parser = cli.build_parser()
+    with pytest.raises(SystemExit) as exc:
+        parser.parse_args(["agent", "--help"])
+    assert exc.value.code == 0
+    out = capsys.readouterr().out
+    for sub in ("enroll", "token", "whoami", "status", "revoke"):
+        assert sub in out
+
+
+def test_agent_status_wire(monkeypatch, capsys):
+    """status maps to GET /api/me/agent-credentials."""
+    from mesh import agent
+    captured = {}
+
+    def fake_api(method, path, *, cfg, **kw):
+        captured.update(method=method, path=path)
+        return {"data": {"enrolled": True, "kid": "mesh-agent-x"}}
+
+    monkeypatch.setattr(cli, "_api_call", fake_api)
+    args = type("A", (), {"json": False})()
+    rc = agent.cmd_agent_status(args, {"token": "t"}, cli)
+    assert rc == 0
+    assert captured == {"method": "GET", "path": "/api/me/agent-credentials"}
+    assert "mesh-agent-x" in capsys.readouterr().out
+
+
+def test_agent_revoke_wire(monkeypatch, capsys):
+    from mesh import agent
+    captured = {}
+    monkeypatch.setattr(cli, "_api_call",
+                        lambda m, p, *, cfg, **k: captured.update(method=m, path=p) or {"data": {"revoked": True}})
+    args = type("A", (), {"purge_local": False})()
+    assert agent.cmd_agent_revoke(args, {"token": "t"}, cli) == 0
+    assert captured == {"method": "DELETE", "path": "/api/me/agent-credentials"}