assertion-cli 0.5.2__tar.gz → 0.5.3__tar.gz

{assertion_cli-0.5.2 → assertion_cli-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assertion-cli
-Version: 0.5.2
+Version: 0.5.3
 Summary: CLI for the Assertion API
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown

{assertion_cli-0.5.2 → assertion_cli-0.5.3}/assertion_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assertion-cli
-Version: 0.5.2
+Version: 0.5.3
 Summary: CLI for the Assertion API
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown

{assertion_cli-0.5.2 → assertion_cli-0.5.3}/git.py

@@ -120,6 +120,7 @@ def get_uncommitted_diff(repo_root: Path, base_sha: str) -> str:
         ]
 
         parts = [p for p in [tracked, "\n".join(untracked_diffs)] if p]
-        return "\n".join(parts)
+        diff = "\n".join(parts)
+        return diff + "\n" if diff else diff
     except RuntimeError as exc:
         exit_with_error(f"Failed to collect git diff: {exc}")

{assertion_cli-0.5.2 → assertion_cli-0.5.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "assertion-cli"
-version = "0.5.2"
+version = "0.5.3"
 description = "CLI for the Assertion API"
 readme = "README.md"
 requires-python = ">=3.13"

assertion_cli-0.5.3/templates/ACTIVATION.md

@@ -0,0 +1,50 @@
+# Assertion verification
+
+This repo uses the Assertion CLI (`asrt`) to track user intent and verify your work. The full workflow lives in the `assertion-cli` skill:
+
+- **Claude Code** — [`.claude/skills/assertion-cli/SKILL.md`](.claude/skills/assertion-cli/SKILL.md)
+- **Codex / Cursor** — [`.agents/skills/assertion-cli/SKILL.md`](.agents/skills/assertion-cli/SKILL.md)
+
+Both files are byte-identical. Read whichever your agent loads (or either one directly). In brief, follow these three rules for every conversation:
+
+1. **Log every user message:** run `asrt prompt "<exact text>"` before anything else, on every turn — it's the verifier's record of intent.
+2. **Checkpoint at trajectory-feedback moments**, not every change. First checkpoint: `asrt stacks`, pick the stack that fits, then `asrt checkpoint --stack <id> "<summary>"`; later ones drop `--stack` and auto-continue. A feature build is a handful of checkpoints.
+3. **Verify at completion** with `asrt verify`. If feedback requires changes, iterate and re-verify — do **not** drop back into the checkpoint loop. Once verify is clean, open a PR — and that PR **must** carry the hidden Assertion session marker (see below).
+
+---
+
+## ⚠️ REQUIRED: every PR must embed the hidden session marker
+
+**This is the single most-missed step, and it is not optional.** A PR opened from an Assertion session that omits the marker cannot be linked back to its verification, so the work reads as unverified.
+
+The Assertion GitHub bot links a PR to its verification session by **branch name first**. When the branch name doesn't match the one you verified on (you renamed it, the head ref differs, etc.), the bot falls back to reading the marker. No marker → no fallback → no link.
+
+`asrt get-link` prints the marker as an HTML comment that GitHub hides from the rendered description but still delivers to the bot in the webhook payload:
+
+```
+<!-- assertion-session: https://app.tryassertion.com/sessions/<id> -->
+```
+
+**Open the PR with the marker embedded** — never paste the bare URL into the visible body; use the command so the format stays exact:
+
+```
+gh pr create --title "<title>" --body "$(printf '%s\n\n%s\n' '<one-paragraph why>' "$(asrt get-link)")"
+```
+
+If a PR already exists for the branch, add the marker instead of opening a new one:
+
+```
+gh pr edit --body "$(printf '%s\n\n%s\n' '<existing summary>' "$(asrt get-link)")"
+```
+
+**Then confirm it landed.** The marker won't show in the rendered description — that's expected — so verify it's in the raw body:
+
+```
+gh pr view --json body --jq .body | grep -q 'assertion-session:' && echo "marker present" || echo "MARKER MISSING — fix before continuing"
+```
+
+---
+
+## Hard gates (do not bypass)
+- **No PR whose body omits the session marker.** If `asrt get-link` has nothing to return, you haven't verified yet — go back to rule 3.
+- **Confirm the marker after creating/editing the PR** with the `gh pr view` check above. Treat a missing marker as a blocking error, not a warning.

{assertion_cli-0.5.2 → assertion_cli-0.5.3}/templates/SKILL.md

@@ -16,6 +16,8 @@ Before any `asrt` call:
 - You are inside a git repository.
 - `asrt init` has been run in this repo. It records the current HEAD as the diff base that every checkpoint/verify diffs against, and installs the skill files you are reading right now. If `asrt checkpoint` or `asrt verify` errors with "No diff base recorded", run `asrt init` and retry.
 
+**Starting a fresh session:** when beginning a new session, delete the contents of `.assertion/` first. This clears the previous session's in-flight state (metadata, prompts log, link) so a new session starts clean and anchors to the stack you pick on the first checkpoint. Only the user should do this — it resets the session.
+
 Treat `.assertion/metadata.json`, `.assertion/prompts`, and `.assertion/base_sha` as internal state owned by the CLI. Do not create, edit, or delete those files manually — use `asrt prompt` to append to the prompts log.
 
 `asrt stacks` is read-only and lists every verification stack in the user's workspace, along with the repo each is configured for. Run it once per session before your first checkpoint so you can pick a stack ID; do not hardcode IDs from memory.
@@ -179,7 +181,15 @@ EOF
 )"
 ```
 
-After creating or editing the PR, confirm the marker is in the raw body with `gh pr view --json body` — it won't show in the rendered description, and that's expected.
+**Enforce it — don't assume it landed.** Immediately after creating or editing the PR, confirm the marker is in the raw body (it won't show in the rendered description — that's expected):
+
+```
+gh pr view --json body --jq .body | grep -q 'assertion-session:' \
+  && echo "marker present" \
+  || { echo "MARKER MISSING — re-run gh pr edit with \$(asrt get-link) before continuing"; exit 1; }
+```
+
+A missing marker is a **blocking error**, not a warning: do not consider the PR step complete, and do not move on, until this check prints `marker present`. Re-run `gh pr edit` with `$(asrt get-link)` and re-check until it passes.
 
 **Do not open a PR without a clean `asrt verify` / `asrt verify-status`, and do not open one whose body omits the session marker.** Do not end a session with a failed/dirty verify unless the verification service itself is unavailable.
 
@@ -200,8 +210,6 @@ asrt get-link                                 # hidden PR marker — embed in th
 
 ## Environment
 
-- `ASSERTION_BASE_URL` — point the CLI at a non-default backend (default `http://localhost:8000`).
-
 ## Non-interactive / harness mode
 
 When running under a non-interactive harness (CI, benchmark runner, scripts):

{assertion_cli-0.5.2 → assertion_cli-0.5.3}/tests/test_git.py

@@ -222,3 +222,36 @@ def test_get_uncommitted_diff_includes_local_only_commit_against_base(
     diff = get_uncommitted_diff(tmp_path, base_sha)
     assert "local.txt" in diff
     assert "+local change" in diff
+
+
+# --- trailing newline (diff must never be corrupt for git apply) ---
+
+
+def test_get_uncommitted_diff_ends_with_newline_when_not_empty(tmp_path: Path) -> None:
+    """Diff must end with \\n so git apply on the receiving end never chokes."""
+    _init_repo_with_commit(tmp_path)
+
+    # Tracked change
+    f = tmp_path / "file.txt"
+    f.write_text("content\n")
+    subprocess.run(
+        ["git", "add", "file.txt"], cwd=tmp_path, capture_output=True, check=True
+    )
+    subprocess.run(
+        ["git", "commit", "-m", "add file"],
+        cwd=tmp_path,
+        capture_output=True,
+        check=True,
+        env={**GIT_ENV, "HOME": str(tmp_path)},
+    )
+    f.write_text("modified\n")
+
+    diff = get_uncommitted_diff(tmp_path, "HEAD")
+    assert diff != ""
+    assert diff.endswith("\n"), f"tracked diff should end with newline, got: {diff[-10:]!r}"
+
+    # Untracked only
+    (tmp_path / "untracked.py").write_text("x = 1\n")
+    diff2 = get_uncommitted_diff(tmp_path, "HEAD")
+    assert diff2 != ""
+    assert diff2.endswith("\n"), f"untracked diff should end with newline, got: {diff2[-10:]!r}"

assertion_cli-0.5.2/templates/ACTIVATION.md

@@ -1,20 +0,0 @@
-# Assertion verification
-
-This repo uses the Assertion CLI (`asrt`) to track user intent and verify your work. The full workflow lives in the `assertion-cli` skill:
-
-- **Claude Code** — [`.claude/skills/assertion-cli/SKILL.md`](.claude/skills/assertion-cli/SKILL.md)
-- **Codex / Cursor** — [`.agents/skills/assertion-cli/SKILL.md`](.agents/skills/assertion-cli/SKILL.md)
-
-Both files are byte-identical. Read whichever your agent loads (or either one directly). In brief, follow these three rules for every conversation:
-
-1. **Every user message:** call `asrt prompt "<exact text of the message>"` before doing any other work for that turn. This is the verifier's source of truth for what the user asked for and how their direction evolves. Apply to every user turn, not just the first.
-2. **Checkpoint at trajectory-feedback moments**, not on every small change. On the first checkpoint of a session, run `asrt stacks`, pick the stack that fits this repo and the work (use the stack's `repo`, `name`, `description`, plus folder/branch/README signals), then run `asrt checkpoint --stack <id> "<summary>"`. Subsequent checkpoints in the same session don't need `--stack` — `asrt checkpoint "<summary>"` auto-continues. A whole feature build is a handful of checkpoints, not one per file.
-3. **Verify at completion** with `asrt verify`. If feedback requires changes, iterate and re-verify — do **not** drop back into the checkpoint loop. Once verify is clean, open a PR and **embed the hidden Assertion session marker in its body** — this is required, not optional. The marker (`asrt get-link`) is an HTML comment GitHub hides from the rendered description but delivers to the Assertion GitHub bot, which uses it to link the PR to the verification when the branch name doesn't match:
-
-   ```
-   gh pr create --title "<title>" --body "$(printf '%s\n\n%s\n' '<one-paragraph why>' "$(asrt get-link)")"
-   ```
-
-   If a PR already exists for the branch, add the marker with `gh pr edit --body` instead of opening a new one.
-
-Do not open a PR without a clean `asrt verify`, and do not open one whose body omits the session marker.