assertion-cli 0.1.1__tar.gz → 0.4.0__tar.gz

{assertion_cli-0.1.1 → assertion_cli-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assertion-cli
-Version: 0.1.1
+Version: 0.4.0
 Summary: CLI for the Assertion API
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
@@ -26,14 +26,15 @@ Run locally from the workspace:
 uv run --package assertion-cli asrt --help
 ```
 
-Install from Git as a `uv` tool:
+Install as a `uv` tool from PyPI:
 
 ```bash
-uv tool install git+ssh://git@github.com/prooflayer-ai/backend.git#subdirectory=cli
+uv tool install assertion-cli              # latest
+uv tool install --reinstall assertion-cli  # upgrade in place
 ```
 
 The CLI package declares all of its direct runtime dependencies. At the moment
-that set is `httpx`, `pydantic`, and `typer`.
+that set is `httpx`, `pydantic`, `python-dotenv`, and `typer`.
 
 After installation:
 
@@ -42,7 +43,19 @@ asrt stacks
 asrt checkpoint --stack <stack-id> "Implemented X\nUpdated Y"
 asrt checkpoint --continue "Implemented Y"
 asrt decision --yes <checkpoint-id>   # optional, only after a failed checkpoint
-asrt verify
+asrt verify                            # submit final verification (non-blocking)
+asrt verify-status                     # one-shot poll; loop with your own sleep until terminal
 ```
 
-This expects the installer to already have GitHub SSH access to `prooflayer-ai/backend`.
+## Publishing a new version
+
+```bash
+# 1. Bump the version in cli/pyproject.toml.
+# 2. Build the sdist + wheel.
+uv build --package assertion-cli
+# 3. Upload (requires UV_PUBLISH_TOKEN, or `--token` on the command).
+uv publish dist/*
+# 4. Tag the release so consumers can correlate to git:
+git tag cli-v$(grep '^version = ' pyproject.toml | head -1 | cut -d'"' -f2)
+git push origin --tags
+```

assertion_cli-0.4.0/README.md

@@ -0,0 +1,47 @@
+# Assertion CLI
+
+CLI for the Assertion API.
+
+## Usage
+
+The CLI currently targets a local backend at `http://localhost:8000`.
+
+Run locally from the workspace:
+
+```bash
+uv run --package assertion-cli asrt --help
+```
+
+Install as a `uv` tool from PyPI:
+
+```bash
+uv tool install assertion-cli              # latest
+uv tool install --reinstall assertion-cli  # upgrade in place
+```
+
+The CLI package declares all of its direct runtime dependencies. At the moment
+that set is `httpx`, `pydantic`, `python-dotenv`, and `typer`.
+
+After installation:
+
+```bash
+asrt stacks
+asrt checkpoint --stack <stack-id> "Implemented X\nUpdated Y"
+asrt checkpoint --continue "Implemented Y"
+asrt decision --yes <checkpoint-id>   # optional, only after a failed checkpoint
+asrt verify                            # submit final verification (non-blocking)
+asrt verify-status                     # one-shot poll; loop with your own sleep until terminal
+```
+
+## Publishing a new version
+
+```bash
+# 1. Bump the version in cli/pyproject.toml.
+# 2. Build the sdist + wheel.
+uv build --package assertion-cli
+# 3. Upload (requires UV_PUBLISH_TOKEN, or `--token` on the command).
+uv publish dist/*
+# 4. Tag the release so consumers can correlate to git:
+git tag cli-v$(grep '^version = ' pyproject.toml | head -1 | cut -d'"' -f2)
+git push origin --tags
+```

{assertion_cli-0.1.1 → assertion_cli-0.4.0}/assertion_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assertion-cli
-Version: 0.1.1
+Version: 0.4.0
 Summary: CLI for the Assertion API
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
@@ -26,14 +26,15 @@ Run locally from the workspace:
 uv run --package assertion-cli asrt --help
 ```
 
-Install from Git as a `uv` tool:
+Install as a `uv` tool from PyPI:
 
 ```bash
-uv tool install git+ssh://git@github.com/prooflayer-ai/backend.git#subdirectory=cli
+uv tool install assertion-cli              # latest
+uv tool install --reinstall assertion-cli  # upgrade in place
 ```
 
 The CLI package declares all of its direct runtime dependencies. At the moment
-that set is `httpx`, `pydantic`, and `typer`.
+that set is `httpx`, `pydantic`, `python-dotenv`, and `typer`.
 
 After installation:
 
@@ -42,7 +43,19 @@ asrt stacks
 asrt checkpoint --stack <stack-id> "Implemented X\nUpdated Y"
 asrt checkpoint --continue "Implemented Y"
 asrt decision --yes <checkpoint-id>   # optional, only after a failed checkpoint
-asrt verify
+asrt verify                            # submit final verification (non-blocking)
+asrt verify-status                     # one-shot poll; loop with your own sleep until terminal
 ```
 
-This expects the installer to already have GitHub SSH access to `prooflayer-ai/backend`.
+## Publishing a new version
+
+```bash
+# 1. Bump the version in cli/pyproject.toml.
+# 2. Build the sdist + wheel.
+uv build --package assertion-cli
+# 3. Upload (requires UV_PUBLISH_TOKEN, or `--token` on the command).
+uv publish dist/*
+# 4. Tag the release so consumers can correlate to git:
+git tag cli-v$(grep '^version = ' pyproject.toml | head -1 | cut -d'"' -f2)
+git push origin --tags
+```

{assertion_cli-0.1.1 → assertion_cli-0.4.0}/assertion_cli.egg-info/SOURCES.txt

@@ -24,5 +24,4 @@ tests/test_init.py
 tests/test_link.py
 tests/test_main.py
 tests/test_prompt.py
-tests/test_session.py
-tests/test_stack_resolve.py
+tests/test_session.py

assertion_cli-0.4.0/bundle.py

@@ -0,0 +1,42 @@
+import io
+import json
+import zipfile
+
+from models import MetadataPayload
+
+ASSERTION_DIR_NAME = ".assertion"
+DIFF_ARCHIVE_PATH = "git.diff"
+METADATA_ARCHIVE_PATH = f"{ASSERTION_DIR_NAME}/metadata.json"
+PROMPTS_ARCHIVE_PATH = f"{ASSERTION_DIR_NAME}/prompts"
+CHECKPOINT_ARCHIVE_PATH = f"{ASSERTION_DIR_NAME}/checkpoint"
+
+
+def _metadata_wire_json(metadata: MetadataPayload) -> str:
+    """Serialize metadata for the bundle, remapping `base_sha` → `head_sha`.
+
+    The CLI stores the diff base as `base_sha` because that matches what the
+    field means from the CLI's perspective (the foundation the diff builds
+    on). The backend reads it as `head_sha` because after its `git checkout`
+    that SHA literally is the clone's HEAD. Same value, different name per
+    side; the remap lives here so neither side has to know about the other's
+    perspective.
+    """
+    payload = metadata.model_dump()
+    payload["head_sha"] = payload.pop("base_sha", None)
+    return json.dumps(payload, indent=2) + "\n"
+
+
+def build_bundle(
+    *,
+    metadata: MetadataPayload,
+    diff_text: str,
+    prompts_text: str,
+    checkpoint_text: str,
+) -> bytes:
+    buf = io.BytesIO()
+    with zipfile.ZipFile(buf, mode="w", compression=zipfile.ZIP_DEFLATED) as zf:
+        zf.writestr(METADATA_ARCHIVE_PATH, _metadata_wire_json(metadata))
+        zf.writestr(PROMPTS_ARCHIVE_PATH, prompts_text)
+        zf.writestr(CHECKPOINT_ARCHIVE_PATH, checkpoint_text)
+        zf.writestr(DIFF_ARCHIVE_PATH, diff_text)
+    return buf.getvalue()

{assertion_cli-0.1.1 → assertion_cli-0.4.0}/git.py

@@ -37,41 +37,6 @@ def find_git_root(start_path: Path) -> Path:
     return Path(completed.stdout.strip())
 
 
-def require_head_pushed(repo_root: Path) -> None:
-    try:
-        remote_refs = run_git_command(
-            repo_root, ["for-each-ref", "--format=%(refname:short)", "refs/remotes"]
-        )
-    except RuntimeError as exc:
-        exit_with_error(f"Failed to inspect remote refs: {exc}")
-
-    refs = [
-        ref for ref in remote_refs.splitlines() if ref and not ref.endswith("/HEAD")
-    ]
-    if not refs:
-        exit_with_error(
-            "Current HEAD commit is not present on any remote-tracking branch."
-        )
-
-    for ref in refs:
-        completed = subprocess.run(
-            ["git", "merge-base", "--is-ancestor", "HEAD", ref],
-            cwd=repo_root,
-            capture_output=True,
-            text=True,
-            check=False,
-        )
-        if completed.returncode == 0:
-            return
-        if completed.returncode != 1:
-            message = (
-                completed.stderr.strip() or completed.stdout.strip() or "git failed"
-            )
-            exit_with_error(f"Failed to verify remote commit state: {message}")
-
-    exit_with_error("Current HEAD commit is not present on any remote-tracking branch.")
-
-
 def get_head_sha(repo_root: Path) -> str:
     try:
         return run_git_command(repo_root, ["rev-parse", "HEAD"])
@@ -88,40 +53,6 @@ def get_head_branch(repo_root: Path) -> str | None:
     return name if name and name != "HEAD" else None
 
 
-def get_origin_github_repo(repo_root: Path) -> str | None:
-    """Return the current repo's GitHub `owner/name` from origin, or None if not parseable.
-
-    Accepts the common remote URL forms:
-      git@github.com:owner/name(.git)?
-      https://github.com/owner/name(.git)?
-      ssh://git@github.com/owner/name(.git)?
-    """
-    try:
-        url = run_git_command(repo_root, ["remote", "get-url", "origin"]).strip()
-    except RuntimeError:
-        return None
-    if not url:
-        return None
-
-    if url.startswith("git@github.com:"):
-        path = url[len("git@github.com:") :]
-    elif url.startswith("ssh://git@github.com/"):
-        path = url[len("ssh://git@github.com/") :]
-    elif url.startswith("https://github.com/"):
-        path = url[len("https://github.com/") :]
-    elif url.startswith("http://github.com/"):
-        path = url[len("http://github.com/") :]
-    else:
-        return None
-
-    path = path.rstrip("/")
-    if path.endswith(".git"):
-        path = path[: -len(".git")]
-    if path.count("/") != 1 or not all(path.split("/")):
-        return None
-    return path
-
-
 def _build_untracked_diff(repo_root: Path, rel_path: str) -> str:
     completed = subprocess.run(
         [
@@ -148,9 +79,9 @@ def _build_untracked_diff(repo_root: Path, rel_path: str) -> str:
 # Paths the assertion-cli owns end-to-end. Excluded from the diff bundle so
 # reviewers don't flag our own bootstrap files as "unrelated changes" — they're
 # generated/refreshed by `asrt init` and `asrt checkpoint` and have nothing to
-# do with the customer's feature work. CLAUDE.md / AGENTS.md are intentionally
-# NOT in this list: those are customer-owned files we only patch a marked
-# block into, so the customer's other edits to them should still flow through.
+# do with the user's feature work. CLAUDE.md / AGENTS.md are intentionally
+# NOT in this list: those are user-owned files we only patch a marked
+# block into, so the user's other edits to them should still flow through.
 _ASSERTION_EXCLUDED_PATHSPECS = [
     ":(exclude).assertion",
     ":(exclude).claude/skills/assertion-cli",
@@ -158,13 +89,18 @@ _ASSERTION_EXCLUDED_PATHSPECS = [
 ]
 
 
-def get_uncommitted_diff(repo_root: Path) -> str:
+def get_uncommitted_diff(repo_root: Path, base_sha: str) -> str:
+    """Build a unified diff from `base_sha` to the current working tree.
+
+    `git diff <base_sha>` compares the working tree directly to the base
+    commit, which subsumes both committed-since-base and unstaged tweaks in
+    one shot — so a single call covers all tracked changes regardless of
+    whether the agent committed locally. Untracked files are still added
+    separately as new-file diffs.
+    """
     try:
         tracked = run_git_command(
-            repo_root, ["diff", "--", *_ASSERTION_EXCLUDED_PATHSPECS]
-        )
-        staged = run_git_command(
-            repo_root, ["diff", "--cached", "--", *_ASSERTION_EXCLUDED_PATHSPECS]
+            repo_root, ["diff", base_sha, "--", *_ASSERTION_EXCLUDED_PATHSPECS]
         )
 
         untracked_output = run_git_command(
@@ -183,7 +119,7 @@ def get_uncommitted_diff(repo_root: Path) -> str:
             if rel_path
         ]
 
-        parts = [p for p in [tracked, staged, "\n".join(untracked_diffs)] if p]
+        parts = [p for p in [tracked, "\n".join(untracked_diffs)] if p]
         return "\n".join(parts)
     except RuntimeError as exc:
         exit_with_error(f"Failed to collect git diff: {exc}")