housebroken-cli 0.6.4__tar.gz → 0.6.6__tar.gz

{housebroken_cli-0.6.4 → housebroken_cli-0.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: housebroken-cli
-Version: 0.6.4
+Version: 0.6.6
 Summary: Agent-written pull requests that do not make a mess in someone else's house.
 Project-URL: Repository, https://github.com/lenamonj/housebroken
 License-Expression: MIT
@@ -126,7 +126,7 @@ uv tool install git+https://github.com/lenamonj/housebroken
 | `scripts/file-pr.sh` | the only way a pull request gets filed: five gates in front of `gh pr create` |
 | `scripts/file-issue.sh` | the only way an issue gets filed: the same printouts and prose, and a fix offered is a fix linked |
 | `scripts/verify-filed-pr.sh` | the filed pull request is what was meant, and CI settled |
-| `scripts/pr-sweep.sh` | every open pull request where the ball is in your court |
+| `scripts/pr-sweep.sh` | every open pull request where the ball is in your court, and every merged or closed one whose fork branch is still there, repeated each run until it is gone |
 | `scripts/inbox.sh` | what GitHub has to tell you since you last looked, bodies included, with a census of every open pull request |
 | `scripts/notes.sh` | what this repository's maintainers have asked for before |
 | `scripts/fork-hygiene.sh` | branches deleted after merge or close, orphan forks listed |

{housebroken_cli-0.6.4 → housebroken_cli-0.6.6}/README.md

@@ -114,7 +114,7 @@ uv tool install git+https://github.com/lenamonj/housebroken
 | `scripts/file-pr.sh` | the only way a pull request gets filed: five gates in front of `gh pr create` |
 | `scripts/file-issue.sh` | the only way an issue gets filed: the same printouts and prose, and a fix offered is a fix linked |
 | `scripts/verify-filed-pr.sh` | the filed pull request is what was meant, and CI settled |
-| `scripts/pr-sweep.sh` | every open pull request where the ball is in your court |
+| `scripts/pr-sweep.sh` | every open pull request where the ball is in your court, and every merged or closed one whose fork branch is still there, repeated each run until it is gone |
 | `scripts/inbox.sh` | what GitHub has to tell you since you last looked, bodies included, with a census of every open pull request |
 | `scripts/notes.sh` | what this repository's maintainers have asked for before |
 | `scripts/fork-hygiene.sh` | branches deleted after merge or close, orphan forks listed |

{housebroken_cli-0.6.4 → housebroken_cli-0.6.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "housebroken-cli"
-version = "0.6.4"
+version = "0.6.6"
 description = "Agent-written pull requests that do not make a mess in someone else's house."
 dynamic = ["readme"]
 license = "MIT"

{housebroken_cli-0.6.4 → housebroken_cli-0.6.6}/scripts/branch-check.sh

@@ -91,8 +91,10 @@ while IFS= read -r f; do
   [ -n "$entry" ] || continue
   mode=$(printf '%s\n' "$entry" | awk '{print $1}')
 
-  # A mode is only wrong relative to the file's own neighbours.
-  if [ "$mode" = "100755" ]; then
+  # A mode is only wrong relative to the file's own neighbours, and only the
+  # branch's to answer for when the base does not already carry it.
+  base_mode=$(git ls-tree "$base" -- "$f" 2>/dev/null | awk '{print $1}')
+  if [ "$mode" = "100755" ] && [ "$base_mode" != "100755" ]; then
     case "$f" in
       *.*) ext=".${f##*.}" ;;
       *) ext="" ;;

{housebroken_cli-0.6.4 → housebroken_cli-0.6.6}/scripts/pr-sweep.sh

@@ -9,7 +9,10 @@
 #
 # A merge or a close drops a PR out of the open list without a word, so each
 # run writes its open set to a state file and the next run reports what left
-# it.
+# it. A PR that left still owns a branch on our fork until someone deletes it,
+# so the sweep records that branch in the state file and prints a TIDY line on
+# every run until `housebroken hygiene` has removed it. The obligation is in
+# the output, not in anyone's memory.
 #
 # Usage:
 #   bash pr-sweep.sh                  # only PRs where the ball is in our court
@@ -77,14 +80,21 @@ if [ -f "$STATE" ]; then
     exit 1
   fi
   echo "--- merged or closed since $last"
+  tidy="$(jq -r '.tidy[]?' "$STATE" | tr -d '\r')"
   gone="$(comm -23 <(jq -r '.open[]?' "$STATE" | tr -d '\r' | sort) <(printf '%s\n' "$open_ids"))"
   while read -r id; do
     [ -n "$id" ] || continue
     gone_repo="${id%#*}"; gone_num="${id##*#}"
-    if ! v="$(gh pr view "$gone_num" --repo "$gone_repo" --json state,mergedAt,closedAt,mergedBy)"; then
+    if ! v="$(gh pr view "$gone_num" --repo "$gone_repo" --json state,mergedAt,closedAt,mergedBy,headRefName,headRepository,headRepositoryOwner)"; then
       echo "pr-sweep.sh: gh pr view $id failed" >&2
       continue
     fi
+    head_owner="$(printf '%s' "$v" | jq -r '.headRepositoryOwner.login // "-"' | tr -d '\r')"
+    head_fork="$(printf '%s' "$v" | jq -r '.headRepository.name // "-"' | tr -d '\r')"
+    head_branch="$(printf '%s' "$v" | jq -r '.headRefName // "-"' | tr -d '\r')"
+    if [ "$head_owner" = "$ME" ] && [ "$gone_repo" != "$ME/$head_fork" ] && [ "$head_branch" != "-" ]; then
+      tidy="$(printf '%s\n%s\n' "$tidy" "$ME/$head_fork $head_branch $id")"
+    fi
     case "$(printf '%s' "$v" | jq -r '.state // "-"' | tr -d '\r')" in
       MERGED)
         printf 'MERGED %s by %s at %s\n' "$id" \
@@ -99,10 +109,22 @@ if [ -f "$STATE" ]; then
   done <<< "$gone"
 else
   echo "--- no previous sweep recorded"
+  tidy=""
 fi
 
-if ! printf '%s\n' "$open_ids" | jq -R -s --arg t "$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
-  '{lastRun: $t, open: (split("\n") | map(select(length > 0)))}' > "$STATE"; then
+# every recorded fork branch is checked again; it leaves the list only once GitHub says it is gone
+keep=""; ntidy=0
+while read -r fork branch id; do
+  [ -n "$fork" ] || continue
+  gh api "repos/$fork/git/refs/heads/$branch" >/dev/null 2>&1 || continue
+  ntidy=$((ntidy + 1))
+  keep="$(printf '%s\n%s\n' "$keep" "$fork $branch $id")"
+  printf 'TIDY   %-38s fork branch %s %s still exists: run housebroken hygiene\n' "$id" "$fork" "$branch"
+done <<< "$(printf '%s\n' "$tidy" | awk 'NF == 3 && !seen[$0]++')"
+
+if ! jq -n --arg t "$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
+  --arg open "$(printf '%s\n' "$open_ids")" --arg tidy "$(printf '%s\n' "$keep")" \
+  '{lastRun: $t, open: ($open | split("\n") | map(select(length > 0))), tidy: ($tidy | split("\n") | map(select(length > 0)))}' > "$STATE"; then
   echo "pr-sweep.sh: cannot write $STATE" >&2
   exit 1
 fi
@@ -136,3 +158,5 @@ while IFS=$'\t' read -r repo num updated title; do
   fi
 done <<< "$list"
 echo "open PRs: $n; needing action: $act"
+[ "$ntidy" -gt 0 ] && echo "fork branches to tidy: $ntidy (housebroken hygiene)"
+exit 0

{housebroken_cli-0.6.4 → housebroken_cli-0.6.6}/skills/housebroken/SKILL.md

@@ -99,8 +99,11 @@ report it in one line and do not proceed to the next step.
    commit, so a correction made after that commit is not in the new one. When the
    patched function serves several public entry points or has several
    branches, the test is a grid: every entry point through every branch,
-   plus the zero, identity and signed-boundary rows. A reviewer lists the
-   empty cells otherwise.
+   plus the zero, identity and signed-boundary rows. A patch that
+   reconciles two coupled setters keeps a value that already satisfies the
+   invariant instead of resetting it, and its grid has a row for every
+   order the two are called in, the same value twice and null included. A
+   reviewer lists the empty cells otherwise.
 
 5. **Run their CI, not yours.**
    Run the project's own test target on the fresh clone, and every gate its
@@ -184,7 +187,9 @@ report it in one line and do not proceed to the next step.
     `housebroken verify owner/repo PR` re-derives from GitHub that the head is
     the intended commit, the diff is exactly the intended files, and CI
     settled. `housebroken sweep` lists every open pull request where the ball
-    is in your court. `housebroken inbox` is the first thing a session does
+    is in your court, and prints a `TIDY` line for every merged or closed
+    pull request whose fork branch still exists, on every run until
+    `housebroken hygiene` has deleted it. `housebroken inbox` is the first thing a session does
     and the only way you learn a thread's state: it prints every event on
     your threads since the last acknowledged cursor with the full body, the
     thread's state, and a census of failing, blocked and conflicting checks

housebroken_cli-0.6.6/src/housebroken/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.6.6"

housebroken_cli-0.6.4/src/housebroken/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.6.4"