assertion-cli 0.5.10__tar.gz → 0.5.12__tar.gz

{assertion_cli-0.5.10 → assertion_cli-0.5.12}/PKG-INFO

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

{assertion_cli-0.5.10 → assertion_cli-0.5.12}/assertion_cli.egg-info/PKG-INFO

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

{assertion_cli-0.5.10 → assertion_cli-0.5.12}/main.py

@@ -16,6 +16,7 @@ from git import (
     find_git_root,
     get_full_diff,
     get_head_branch,
+    get_head_sha,
     get_merge_base,
     get_uncommitted_diff,
     get_upstream_ref,
@@ -271,8 +272,9 @@ def _resolve_diff_base(repo_root: Path) -> str:
     refs (from a force-pushed or rebased branch) would otherwise produce a
     merge-base that's no longer reachable from any remote ref.
 
-    Errors out when no upstream can be resolved (detached HEAD, no tracking
-    branch, branch not pushed to remote).
+    Falls back to HEAD when no upstream can be resolved (e.g. Codex cloud
+    sandboxes with no remote tracking refs) — the branch was cloned from the
+    remote so HEAD exists on the remote at session start time.
     """
     try:
         run_git_command(repo_root, ["fetch", "--no-tags", "origin"])
@@ -281,13 +283,11 @@ def _resolve_diff_base(repo_root: Path) -> str:
 
     upstream = get_upstream_ref(repo_root)
     if upstream is None:
-        exit_with_error(
-            "Cannot determine the diff base: no upstream tracking branch found.\n"
-            "Make sure you are on a branch that has been pushed to a remote "
-            "with a tracking branch configured, e.g.:\n"
-            "  git push -u origin <branch>\n"
-            "Or use an existing branch that tracks an upstream.",
+        typer.echo(
+            "Warning: no upstream tracking branch found, falling back to HEAD.",
+            err=True,
         )
+        return get_head_sha(repo_root)
     return get_merge_base(repo_root, upstream)
 
 
@@ -296,9 +296,10 @@ def session_start() -> None:
     """Record the merge-base with the upstream tracking branch as the diff base.
 
     Unlike the old HEAD-based approach, the merge-base always exists on the
-    remote so the backend can check it out. Branches without a remote tracking
-    ref (detached HEAD, no upstream, not pushed) are rejected with a clear
-    message — run ``asrt session start`` from a branch with an upstream.
+    remote so the backend can check it out. When no upstream tracking branch
+    can be resolved (e.g. Codex cloud sandboxes), falls back to HEAD — the
+    branch was cloned from the remote so HEAD exists on the remote at session
+    start time.
 
     `session start` does not write skill files — that is `asrt install`, the
     one-time onboarding step. It also never touches user content in `CLAUDE.md` /

{assertion_cli-0.5.10 → assertion_cli-0.5.12}/pyproject.toml

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

assertion_cli-0.5.12/templates/AGENTS.md

@@ -0,0 +1,26 @@
+# 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. Apply to every user turn, not just the first.
+2. **Checkpoint at trajectory-feedback moments** with `asrt checkpoint` — a handful across a feature build, not one per file.
+3. **Verify, then PR with the session marker.** At completion, run `asrt verify` and poll `asrt verify-status` until clean. Then open the PR and embed the hidden session marker — `$(asrt get-link)`, an HTML comment — in its body.
+
+**The session marker is mandatory, not optional.** It's an HTML comment carrying the session URL — `asrt get-link` prints exactly this form:
+
+```
+<!-- assertion-session: https://app.tryassertion.com/sessions/<id> -->
+```
+
+Every PR opened from an Assertion session **must** carry it: the Assertion GitHub bot links the PR to the verification session by branch name first, and falls back to this marker when the branch doesn't match — without it, that PR can't be linked. So:
+
+- Put `$(asrt get-link)` in the PR body via `gh pr create`/`gh pr edit` — never paste the bare URL into the visible description.
+- After creating or editing the PR, **confirm the marker actually landed in the raw body** (`gh pr view --json body --jq .body | grep -q 'assertion-session:'`). It won't show in the rendered description — that's expected.
+- A missing marker is a **blocking error, not a warning**: do not consider the task done, and do not open a PR at all, until the marker is verified present. Re-run `gh pr edit` with `$(asrt get-link)` and re-check until it passes.
+
+See the skill file for the full rules, edge cases, and the exact PR command (section: *Embed the hidden session marker in the PR*).

{assertion_cli-0.5.10 → assertion_cli-0.5.12}/templates/SKILL.md

@@ -15,7 +15,7 @@ Before any `asrt` call:
 
 - You are inside a git repository.
 - `asrt install` has been run once in this repo. It installs the skill files you are reading right now (plus the `AGENTS.md` / `CLAUDE.md` pointer and `.gitignore` rules). This is an onboarding step, not a per-run one.
-- `asrt session start` has been run for this work session. It records the current HEAD as the diff base that every checkpoint/verify diffs against. If `asrt checkpoint` or `asrt verify` errors with "No diff base recorded", run `asrt session start` and retry.
+- `asrt session start` has been run for this work session. It records the merge-base with the upstream tracking branch (falling back to HEAD when no upstream is available) as the diff base that every checkpoint/verify diffs against. If `asrt checkpoint` or `asrt verify` errors with "No diff base recorded", run `asrt session start` and retry.
 
 **First command sequence for a new work session:**
 

{assertion_cli-0.5.10 → assertion_cli-0.5.12}/tests/test_git.py

@@ -7,7 +7,6 @@ from click.exceptions import Exit as ClickExit
 from git import (
     find_git_root,
     get_full_diff,
-    get_head_branch,
     get_head_sha,
     get_merge_base,
     get_uncommitted_diff,

{assertion_cli-0.5.10 → assertion_cli-0.5.12}/tests/test_new.py

@@ -125,15 +125,18 @@ def test_new_leaves_next_checkpoint_requiring_stack(
     assert not (assertion_dir / "metadata.json").exists()
 
 
-def test_new_requires_upstream_tracking_branch(
+def test_new_falls_back_to_head_when_no_upstream(
     tmp_path: Path,
     monkeypatch,
 ) -> None:
+    """When no upstream tracking branch exists, fall back to HEAD instead of erroring."""
     _run_git(tmp_path, "init")
     _run_git(tmp_path, "commit", "--allow-empty", "-m", "init")
+    head_sha = _run_git(tmp_path, "rev-parse", "HEAD")
     monkeypatch.chdir(tmp_path)
 
     result = runner.invoke(main.app, ["new"])
 
-    assert result.exit_code == 1
-    assert "no upstream tracking branch" in result.stderr
+    assert result.exit_code == 0
+    assert "falling back to HEAD" in result.stderr
+    assert (tmp_path / ".assertion" / "base_sha").read_text().strip() == head_sha

{assertion_cli-0.5.10 → assertion_cli-0.5.12}/tests/test_session_start.py

@@ -197,23 +197,27 @@ def test_session_start_requires_git_repo(tmp_path: Path, monkeypatch) -> None:
     assert "git repository" in result.stderr
 
 
-def test_session_start_requires_upstream_tracking_branch(
+def test_session_start_falls_back_to_head_when_no_upstream(
     tmp_path: Path, monkeypatch
 ) -> None:
+    """When no upstream tracking branch exists, fall back to HEAD instead of erroring.
+
+    Codex cloud sandboxes may not have upstream tracking configured, but the
+    branch was cloned from the remote so HEAD exists on the remote.
+    """
     _run_git(tmp_path, "init")
     _run_git(tmp_path, "commit", "--allow-empty", "-m", "init")
+    head_sha = _run_git(tmp_path, "rev-parse", "HEAD")
     monkeypatch.chdir(tmp_path)
 
     result = runner.invoke(main.app, ["session", "start"])
 
-    assert result.exit_code == 1
-    assert "no upstream tracking branch" in result.stderr
-    assert not (tmp_path / ".assertion" / "base_sha").exists()
+    assert result.exit_code == 0
+    assert "falling back to HEAD" in result.stderr
+    assert (tmp_path / ".assertion" / "base_sha").read_text().strip() == head_sha
 
 
-def test_session_start_records_merge_base_as_base(
-    tmp_path: Path, monkeypatch
-) -> None:
+def test_session_start_records_merge_base_as_base(tmp_path: Path, monkeypatch) -> None:
     """`asrt session start` pins the diff base to the branch merge-base.
 
     Every subsequent checkpoint/verify diffs against this SHA, so backend can

assertion_cli-0.5.10/templates/AGENTS.md

@@ -1,14 +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. Apply to every user turn, not just the first.
-2. **Checkpoint at trajectory-feedback moments** with `asrt checkpoint` — a handful across a feature build, not one per file.
-3. **Verify at completion** with `asrt verify`. Once it is clean, open a PR whose body embeds the hidden session marker from `asrt get-link`.
-
-See the skill file for the full rules, edge cases, and the exact PR command.