gravity-cli 0.2.0__tar.gz → 0.3.1__tar.gz

{gravity_cli-0.2.0 → gravity_cli-0.3.1}/.env.example

@@ -3,19 +3,20 @@
 # What each variable does: README.md, "Environment variables".
 
 # --- gravity run / schedule / adapt -------------------------------------
-# Your gateway dev token. Required to run an agent. A local gateway prints
-# one at startup, or uses its LOCAL_DEV_TOKEN.
+# Your gateway dev token. Required to run an agent. Issued by the Gravity team;
+# a local gateway prints one at startup, or uses its LOCAL_DEV_TOKEN.
 GRAVITY_DEV_TOKEN=
 
-# The gateway's MCP endpoint. Leave unset for a local gateway on port 8000.
-# GRAVITY_GATEWAY_URL=https://<hosted gateway host>/mcp
+# The gateway's MCP endpoint. Leave unset: the CLI asks Gravity where the gateway is.
+# Set it only for a local gateway.
+# GRAVITY_GATEWAY_URL=http://127.0.0.1:8000/mcp
 
 # The model endpoint. Leave unset: it follows the gateway (<gateway>/v1).
 # GRAVITY_LLM_URL=
 
 # --- push / tools / agents / runs / logs / whoami ------------------------
-# The control plane. Leave unset for a local one at http://localhost:3010.
-# GRAVITY_API_URL=https://<control plane host>
+# The control plane. Leave unset for Gravity's; set it only for a local one.
+# GRAVITY_API_URL=http://localhost:3010
 
 # Development only: the control plane's dev token, instead of `gravity login`.
 # GRAVITY_API_TOKEN=

{gravity_cli-0.2.0 → gravity_cli-0.3.1}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.5
 Name: gravity-cli
-Version: 0.2.0
+Version: 0.3.1
 Summary: gravity cli — init, run, and push python agents to the Gravity marketplace
 License-Expression: Apache-2.0
 License-File: LICENSE
 License-File: NOTICE
 Requires-Python: >=3.12
-Requires-Dist: gravity-schema==0.2.0
+Requires-Dist: gravity-schema==0.3.1
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: keyring>=25.0.0
 Requires-Dist: python-dotenv>=1.0.0
@@ -69,7 +69,7 @@ pipx install gravity-cli
 gravity init my-agent
 ```
 
-> **Status: 0.1.0 preview.** `init`, `validate` and `build` work anywhere. `run`, `login` and `push` talk to Gravity services, and the built-in addresses still point at a local development setup. Until the hosted addresses ship as defaults, set them yourself as shown in [Configuration](#configuration).
+> **Status.** `login`, `push` and the tool catalog work out of the box against Gravity's hosted services. `gravity run` also needs a gateway dev token, issued by the Gravity team until per-builder tokens ship.
 
 ## Contents
 
@@ -469,10 +469,10 @@ Put them in `~/.gravity/.env` (on Windows, `%USERPROFILE%\.gravity\.env`). Every
 ```bash
 # ~/.gravity/.env
 GRAVITY_DEV_TOKEN=<your gateway dev token>
-GRAVITY_GATEWAY_URL=https://<gateway host>/mcp
-GRAVITY_API_URL=https://<control plane host>
 ```
 
+That is the only setting most builders ever need. The CLI knows where Gravity's control plane is, and asks it where the gateway is.
+
 When a setting is given in more than one place, the first match wins:
 
 1. a variable exported in your shell
@@ -487,17 +487,19 @@ Never commit a `.env` file. The `.gitignore` in every template keeps `.env` and
 | You want to | Commands | Required | Usually also set |
 |---|---|---|---|
 | Create, check and package an agent | `init`, `validate`, `build` | nothing | nothing |
-| Run an agent locally | `run`, `schedule`, `adapt` | `GRAVITY_DEV_TOKEN` | `GRAVITY_GATEWAY_URL` |
-| Publish and inspect agents | `push`, `tools`, `agents`, `runs`, `logs`, `whoami` | `gravity login` | `GRAVITY_API_URL` |
+| Run an agent locally | `run`, `schedule`, `adapt` | `GRAVITY_DEV_TOKEN` | nothing |
+| Publish and inspect agents | `push`, `tools`, `agents`, `runs`, `logs`, `whoami` | `gravity login` | nothing |
+
+Set `GRAVITY_API_URL` and `GRAVITY_GATEWAY_URL` only to work against services you run yourself; see [Running a local gateway](#running-a-local-gateway).
 
 ### Environment variables
 
 | Variable | What it is | Default |
 |---|---|---|
 | `GRAVITY_DEV_TOKEN` | Your gateway dev token. `gravity run` trades it for a run token scoped to the manifest's tools. Required for `run`, `schedule` and `adapt`. | none |
-| `GRAVITY_GATEWAY_URL` | The gateway's MCP endpoint, ending in `/mcp` | `http://127.0.0.1:8000/mcp` |
+| `GRAVITY_GATEWAY_URL` | The gateway's MCP endpoint, ending in `/mcp` | the gateway the control plane names in `GET /api/cli/config` |
 | `GRAVITY_LLM_URL` | The OpenAI-compatible model endpoint | the gateway's address + `/v1` |
-| `GRAVITY_API_URL` | The control plane's address | `http://localhost:3010` |
+| `GRAVITY_API_URL` | The control plane's address | `https://agents.dev.gravity.fast` |
 | `GRAVITY_API_TOKEN` | A control-plane dev token, used instead of `gravity login`. For development only. | none |
 | `GRAVITY_CONFIG_DIR` | Moves `~/.gravity` elsewhere. Useful for tests and CI. | `~/.gravity` |
 | `GRAVITY_UNATTENDED` | When `1`, calls that need approval are rejected without asking. `gravity schedule` sets it for you. | unset |
@@ -701,6 +703,7 @@ A fully local setup, in `~/.gravity/.env`:
 
 ```bash
 GRAVITY_DEV_TOKEN=<the gateway's LOCAL_DEV_TOKEN>
+GRAVITY_GATEWAY_URL=http://127.0.0.1:8000/mcp
 GRAVITY_API_URL=http://localhost:3010
 GRAVITY_API_TOKEN=<the control plane's PLATFORM_DEV_TOKEN>
 ```

{gravity_cli-0.2.0 → gravity_cli-0.3.1}/README.md

@@ -52,7 +52,7 @@ pipx install gravity-cli
 gravity init my-agent
 ```
 
-> **Status: 0.1.0 preview.** `init`, `validate` and `build` work anywhere. `run`, `login` and `push` talk to Gravity services, and the built-in addresses still point at a local development setup. Until the hosted addresses ship as defaults, set them yourself as shown in [Configuration](#configuration).
+> **Status.** `login`, `push` and the tool catalog work out of the box against Gravity's hosted services. `gravity run` also needs a gateway dev token, issued by the Gravity team until per-builder tokens ship.
 
 ## Contents
 
@@ -452,10 +452,10 @@ Put them in `~/.gravity/.env` (on Windows, `%USERPROFILE%\.gravity\.env`). Every
 ```bash
 # ~/.gravity/.env
 GRAVITY_DEV_TOKEN=<your gateway dev token>
-GRAVITY_GATEWAY_URL=https://<gateway host>/mcp
-GRAVITY_API_URL=https://<control plane host>
 ```
 
+That is the only setting most builders ever need. The CLI knows where Gravity's control plane is, and asks it where the gateway is.
+
 When a setting is given in more than one place, the first match wins:
 
 1. a variable exported in your shell
@@ -470,17 +470,19 @@ Never commit a `.env` file. The `.gitignore` in every template keeps `.env` and
 | You want to | Commands | Required | Usually also set |
 |---|---|---|---|
 | Create, check and package an agent | `init`, `validate`, `build` | nothing | nothing |
-| Run an agent locally | `run`, `schedule`, `adapt` | `GRAVITY_DEV_TOKEN` | `GRAVITY_GATEWAY_URL` |
-| Publish and inspect agents | `push`, `tools`, `agents`, `runs`, `logs`, `whoami` | `gravity login` | `GRAVITY_API_URL` |
+| Run an agent locally | `run`, `schedule`, `adapt` | `GRAVITY_DEV_TOKEN` | nothing |
+| Publish and inspect agents | `push`, `tools`, `agents`, `runs`, `logs`, `whoami` | `gravity login` | nothing |
+
+Set `GRAVITY_API_URL` and `GRAVITY_GATEWAY_URL` only to work against services you run yourself; see [Running a local gateway](#running-a-local-gateway).
 
 ### Environment variables
 
 | Variable | What it is | Default |
 |---|---|---|
 | `GRAVITY_DEV_TOKEN` | Your gateway dev token. `gravity run` trades it for a run token scoped to the manifest's tools. Required for `run`, `schedule` and `adapt`. | none |
-| `GRAVITY_GATEWAY_URL` | The gateway's MCP endpoint, ending in `/mcp` | `http://127.0.0.1:8000/mcp` |
+| `GRAVITY_GATEWAY_URL` | The gateway's MCP endpoint, ending in `/mcp` | the gateway the control plane names in `GET /api/cli/config` |
 | `GRAVITY_LLM_URL` | The OpenAI-compatible model endpoint | the gateway's address + `/v1` |
-| `GRAVITY_API_URL` | The control plane's address | `http://localhost:3010` |
+| `GRAVITY_API_URL` | The control plane's address | `https://agents.dev.gravity.fast` |
 | `GRAVITY_API_TOKEN` | A control-plane dev token, used instead of `gravity login`. For development only. | none |
 | `GRAVITY_CONFIG_DIR` | Moves `~/.gravity` elsewhere. Useful for tests and CI. | `~/.gravity` |
 | `GRAVITY_UNATTENDED` | When `1`, calls that need approval are rejected without asking. `gravity schedule` sets it for you. | unset |
@@ -684,6 +686,7 @@ A fully local setup, in `~/.gravity/.env`:
 
 ```bash
 GRAVITY_DEV_TOKEN=<the gateway's LOCAL_DEV_TOKEN>
+GRAVITY_GATEWAY_URL=http://127.0.0.1:8000/mcp
 GRAVITY_API_URL=http://localhost:3010
 GRAVITY_API_TOKEN=<the control plane's PLATFORM_DEV_TOKEN>
 ```

{gravity_cli-0.2.0 → gravity_cli-0.3.1}/packages/gravity-schema/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "gravity-schema"
-version = "0.2.0"
+version = "0.3.1"
 description = "Gravity agent manifest contract — models, validation, and JSON Schema export"
 readme = "README.md"
 license = "Apache-2.0"

{gravity_cli-0.2.0 → gravity_cli-0.3.1}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "gravity-cli"
-version = "0.2.0"
+version = "0.3.1"
 description = "gravity cli — init, run, and push python agents to the Gravity marketplace"
 readme = "README.md"
 license = "Apache-2.0"
 license-files = ["LICENSE", "NOTICE"]
 requires-python = ">=3.12"
 dependencies = [
-    "gravity-schema==0.2.0",  # released in lockstep: always the same version as this package
+    "gravity-schema==0.3.1",  # released in lockstep: always the same version as this package
     "typer>=0.15.0",
     "httpx>=0.27.0",
     "rich>=13.9.0",

{gravity_cli-0.2.0 → gravity_cli-0.3.1}/src/gravity_cli/api.py

@@ -23,16 +23,22 @@ def _token() -> str:
     return token
 
 
-def _request(method: str, path: str, *, auth: bool = True, timeout: int = 60, headers: dict | None = None, **kw) -> Any:
+def _request(method: str, path: str, *, auth: bool = True, timeout: int = 60, headers: dict | None = None, retry: bool = True, **kw) -> Any:
     """The JSON body. A refused connection or an error status becomes a Problem."""
-    headers = {**({"Authorization": f"Bearer {_token()}"} if auth else {}), **(headers or {})}
+    extra = headers or {}
+    sent = {**({"Authorization": f"Bearer {_token()}"} if auth else {}), **extra}
     try:
-        with httpx.Client(base_url=config.api_url(), timeout=timeout, headers=headers) as client:
+        with httpx.Client(base_url=config.api_url(), timeout=timeout, headers=sent) as client:
             resp = client.request(method, path, **kw)
     except httpx.TransportError as e:
         raise Problem(
             f"Can't reach Gravity at {config.api_url()}", str(e), "Check GRAVITY_API_URL in ~/.gravity/.env"
         ) from e
+    if resp.status_code == 401 and auth and not os.environ.get("GRAVITY_API_TOKEN"):
+        # A session's access token lasts an hour. Renew it once; if that can't be done, say so plainly.
+        if retry and _refresh():
+            return _request(method, path, auth=auth, timeout=timeout, headers=extra, retry=False, **kw)
+        raise Problem("Your sign-in has expired", fix="Run gravity login again.")
     if resp.status_code >= 400:
         try:
             body = resp.json()
@@ -47,6 +53,35 @@ def _request(method: str, path: str, *, auth: bool = True, timeout: int = 60, he
     return resp.json()
 
 
+def _refresh() -> bool:
+    """A new session from the stored refresh token. Needs Gravity's config to name Supabase and its anon key."""
+    session = config.load_session()
+    settings = service_config()
+    url, key = settings.get("supabase_url"), settings.get("supabase_anon_key")
+    if not (session and url and key):
+        return False
+    try:
+        resp = httpx.post(
+            f"{url.rstrip('/')}/auth/v1/token",
+            params={"grant_type": "refresh_token"},
+            json={"refresh_token": session.refresh_token},
+            headers={"apikey": key},
+            timeout=15,
+        )
+    except httpx.TransportError:
+        return False
+    if resp.status_code != 200:
+        return False
+    data = resp.json()
+    config.save_session(config.Session(data["access_token"], data["refresh_token"]))
+    return True
+
+
+def service_config() -> dict:
+    """Where Gravity's services are: api_url, gateway_url, min_cli_version. No sign-in needed."""
+    return _request("GET", "/api/cli/config", auth=False, timeout=15)
+
+
 def device_start() -> dict:
     return _request("POST", "/api/cli/device/start", auth=False, timeout=15)
 

{gravity_cli-0.2.0 → gravity_cli-0.3.1}/src/gravity_cli/commands/run.py

@@ -2,15 +2,17 @@ from __future__ import annotations
 
 import json
 import os
+import re
 import subprocess
 import sys
 import time
+from importlib.metadata import version
 from pathlib import Path
 
 import httpx
 import typer
 
-from .. import Problem, project, ui
+from .. import Problem, api, project, ui
 from ..manifest import load_manifest
 from ..timeline import EVENT_PREFIX, Timeline
 
@@ -20,11 +22,23 @@ BUILDER_TOKENS = ("GRAVITY_DEV_TOKEN", "GRAVITY_API_TOKEN")
 
 
 def gateway_urls() -> tuple[str, str]:
-    """(MCP url, host base). Defaults to `gravity-gateway serve`'s own port."""
-    url = os.environ.get("GRAVITY_GATEWAY_URL") or "http://127.0.0.1:8000/mcp"
+    """(MCP url, host base): GRAVITY_GATEWAY_URL, else the gateway Gravity's control plane names."""
+    url = os.environ.get("GRAVITY_GATEWAY_URL")
+    if not url:
+        settings = api.service_config()
+        _check_version(settings.get("min_cli_version"))
+        url = settings["gateway_url"].rstrip("/") + "/mcp"
     return url, url.rstrip("/").removesuffix("/mcp")
 
 
+def _check_version(minimum: str | None) -> None:
+    """Gravity says which CLI it still supports; an older one gets a warning, not a refusal."""
+    mine = version("gravity-cli")
+    parts = lambda v: tuple(int(x) for x in re.findall(r"\d+", v)[:3])
+    if minimum and parts(minimum) > parts(mine):
+        ui.warn("Update gravity", f"Gravity needs {minimum} or newer; this is {mine}.", "uv tool install --force --refresh gravity-cli")
+
+
 def _mint_run_token(gateway_base: str, tools: list[str], approvals: list[str] = ()) -> dict:
     """Dev token -> a run token scoped to the manifest's tools, as a hosted run gets."""
     dev_token = os.environ.get("GRAVITY_DEV_TOKEN")

{gravity_cli-0.2.0 → gravity_cli-0.3.1}/src/gravity_cli/commands/validate.py

@@ -8,7 +8,7 @@ import time
 from pathlib import Path
 
 import typer
-from gravity_schema import LOCKFILE_PLATFORM
+from gravity_schema import DEV_TOOL_NAMES, LOCKFILE_PLATFORM
 from gravity_schema.contract import TOOL_NAME_RE as _TOOL_NAME_RE
 
 from .. import ui
@@ -111,7 +111,9 @@ def _scan_drift(project_dir: Path, declared_tools: list[str]) -> list[tuple[str,
             f"{', '.join(sorted(imported_network_libs))} imported, but permissions.tools is empty: hosted agents can only reach the gateway.",
             "Declare the tools you need under permissions.tools, or drop the import.",
         ))
-    if undeclared := sorted(referenced_tool_names - set(declared_tools)):
+    # Only names under an app the catalog knows: "package.json" is a file, not a tool.
+    apps = {name.split(".")[0] for name in DEV_TOOL_NAMES}
+    if undeclared := sorted(n for n in referenced_tool_names - set(declared_tools) if n.split(".")[0] in apps):
         warnings.append((
             "Undeclared tool",
             f"{', '.join(undeclared)} appears in your code",

{gravity_cli-0.2.0 → gravity_cli-0.3.1}/src/gravity_cli/config.py

@@ -24,8 +24,7 @@ ENV_FILE = CONFIG_DIR / ".env"
 CONFIG_DIR.mkdir(parents=True, exist_ok=True)
 load_dotenv(ENV_FILE)  # no-op if the file doesn't exist yet
 
-# The local control plane; the published CLI needs the production URL.
-DEFAULT_API_URL = "http://localhost:3010"
+DEFAULT_API_URL = "https://agents.dev.gravity.fast"
 
 
 def _read_config() -> dict:

{gravity_cli-0.2.0 → gravity_cli-0.3.1}/src/gravity_cli/ui.py

@@ -156,7 +156,7 @@ def table(headers: list[str], rows: list[list[str]], footer: str = "") -> None:
         if len(row) == 1:
             grid.add_row(Text(f"\n{row[0]}", style="bold"))
         else:
-            grid.add_row(*(Text(str(cell)) for cell in row))
+            grid.add_row(*(Text("" if cell is None else str(cell)) for cell in row))
     if any(headers):
         say()
     say(Padding(grid, (0, 0, 0, 2)))

gravity_cli-0.3.1/tests/conftest.py

@@ -0,0 +1,8 @@
+import pytest
+
+
+@pytest.fixture(autouse=True)
+def no_network_for_addresses(monkeypatch):
+    """Without GRAVITY_GATEWAY_URL the CLI asks the real control plane where the gateway is.
+    Tests point at a local address instead; a test that wants the lookup deletes it."""
+    monkeypatch.setenv("GRAVITY_GATEWAY_URL", "http://127.0.0.1:8000/mcp")

{gravity_cli-0.2.0 → gravity_cli-0.3.1}/tests/test_api.py

@@ -63,3 +63,38 @@ def test_whoami_works_with_only_the_env_token(control_plane, monkeypatch, capsys
     whoami_command()
     assert control_plane["auth"] == "Bearer cp_dev"
     assert "local-builder (dev token)" in capsys.readouterr().out
+
+
+def test_an_expired_session_is_renewed_once_when_gravity_names_supabase(monkeypatch):
+    """A 401 with a stored session: refresh against Supabase, then retry with the new token."""
+    saved: list = []
+    monkeypatch.delenv("GRAVITY_API_TOKEN", raising=False)
+    monkeypatch.setattr(config, "load_session", lambda: saved[-1] if saved else SESSION)
+    monkeypatch.setattr(config, "save_session", saved.append)
+    monkeypatch.setattr(api, "service_config", lambda: {"supabase_url": "https://sb.example", "supabase_anon_key": "anon"})
+    calls: list = []
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        calls.append((request.url.host, request.headers.get("Authorization") or request.headers.get("apikey")))
+        if request.url.host == "sb.example":
+            return httpx.Response(200, json={"access_token": "fresh", "refresh_token": "r2"})
+        if request.headers["Authorization"] == "Bearer fresh":
+            return httpx.Response(200, json=[{"name": "demo"}])
+        return httpx.Response(401, json={"message": "Unauthorized"})
+
+    real = httpx.Client
+    monkeypatch.setattr(api.httpx, "Client", lambda **kw: real(transport=httpx.MockTransport(handler), **kw))
+    monkeypatch.setattr(api.httpx, "post", lambda url, **kw: real(transport=httpx.MockTransport(handler)).post(url, **kw))
+    assert api.get("/api/cli/agents") == [{"name": "demo"}]
+    assert saved[-1].access_token == "fresh" and [c[0] for c in calls].count("sb.example") == 1
+
+
+def test_an_expired_session_without_refresh_says_sign_in_again(monkeypatch):
+    monkeypatch.delenv("GRAVITY_API_TOKEN", raising=False)
+    monkeypatch.setattr(config, "load_session", lambda: SESSION)
+    monkeypatch.setattr(api, "service_config", dict)  # no Supabase details yet
+    real = httpx.Client
+    monkeypatch.setattr(api.httpx, "Client", lambda **kw: real(transport=httpx.MockTransport(lambda r: httpx.Response(401)), **kw))
+    with pytest.raises(typer.Exit) as e:
+        api.get("/api/cli/agents")
+    assert "sign-in has expired" in str(e.value) and "gravity login" in str(e.value)

{gravity_cli-0.2.0 → gravity_cli-0.3.1}/tests/test_run.py

@@ -87,18 +87,27 @@ captured_popen: dict = {}
 
 def test_run_mints_a_token_for_the_manifests_tools(project, gateway, child, monkeypatch):
     monkeypatch.setenv("GRAVITY_DEV_TOKEN", "grt_dev")
-    monkeypatch.delenv("GRAVITY_GATEWAY_URL", raising=False)
+    monkeypatch.delenv("GRAVITY_GATEWAY_URL", raising=False)  # so the gateway comes from Gravity's config
+    monkeypatch.setattr(run_mod.api, "service_config", lambda: {"gateway_url": "https://gw.example", "min_cli_version": "0.1.0"})
     with pytest.raises(typer.Exit) as e:
         run_mod.run_command(project, input=[], llm_url=None, reply=None)
     assert e.value.exit_code == 0
 
     assert gateway == {
-        "url": "http://127.0.0.1:8000/runs",
+        "url": "https://gw.example/runs",
         "json": {"tools": ["example.echo"], "approvals": []},
         "auth": "Bearer grt_dev",
     }
+    assert child["GRAVITY_GATEWAY_URL"] == "https://gw.example/mcp"
     assert child["GRAVITY_RUN_TOKEN"] == "grt_run"
-    assert child["GRAVITY_LLM_URL"] == "http://127.0.0.1:8000/v1"
+    assert child["GRAVITY_LLM_URL"] == "https://gw.example/v1"
+
+
+def test_an_old_cli_is_told_to_update(capsys):
+    run_mod._check_version("99.0.0")
+    assert "Update gravity" in capsys.readouterr().out
+    run_mod._check_version("0.1.0")
+    assert capsys.readouterr().out == ""
 
 
 def test_the_builders_tokens_never_reach_the_agent(project, gateway, child, monkeypatch):

{gravity_cli-0.2.0 → gravity_cli-0.3.1}/uv.lock

@@ -164,7 +164,7 @@ wheels = [
 
 [[package]]
 name = "gravity-cli"
-version = "0.2.0"
+version = "0.3.1"
 source = { editable = "." }
 dependencies = [
     { name = "gravity-schema" },
@@ -201,7 +201,7 @@ dev = [
 
 [[package]]
 name = "gravity-schema"
-version = "0.2.0"
+version = "0.3.1"
 source = { editable = "packages/gravity-schema" }
 dependencies = [
     { name = "pydantic" },