housebroken-cli 0.2.3__tar.gz → 0.2.4__tar.gz

{housebroken_cli-0.2.3 → housebroken_cli-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: housebroken-cli
-Version: 0.2.3
+Version: 0.2.4
 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

{housebroken_cli-0.2.3 → housebroken_cli-0.2.4}/pyproject.toml

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

{housebroken_cli-0.2.3 → housebroken_cli-0.2.4}/scripts/inbox.sh

@@ -64,7 +64,7 @@ if [ -z "$since" ]; then
   if [ -s "$cursor_file" ]; then since="$(head -1 "$cursor_file")"; else since="$(date -u -d '24 hours ago' +%Y-%m-%dT%H:%M:%SZ 2>/dev/null || date -u -v-24H +%Y-%m-%dT%H:%M:%SZ)"; fi
 fi
 
-is_bot() { case "$1" in *"[bot]"|copilot-pull-request-reviewer|codecov-commenter|coveralls|CLAassistant|meta-cla*|vercel*|coderabbitai*|copy-pr-bot*|oracle-contributor-agreement*|dependabot*|github-actions*|sonarcloud*|netlify*) return 0 ;; *) return 1 ;; esac; }
+is_bot() { case "$1" in *"[bot]"|Copilot|copilot*|codecov-commenter|coveralls|CLAassistant|meta-cla*|vercel*|coderabbitai*|copy-pr-bot*|oracle-contributor-agreement*|dependabot*|github-actions*|sonarcloud*|netlify*) return 0 ;; *) return 1 ;; esac; }
 
 echo "== inbox for $user since $since (now $now) =="
 if ! feed="$(gh api "notifications?all=true&since=$since&per_page=100" --paginate 2>/dev/null)"; then
@@ -85,27 +85,34 @@ while IFS= read -r t; do
   echo
   echo "--- $repo#$num [$reason, $at] $state"
   echo "    $title"
-  if [ -n "$latest" ]; then
-    if c="$(gh api "$latest" 2>/dev/null)"; then
-      who=$(jq -r '.user.login // "?"' <<<"$c"); when=$(jq -r '.created_at // .submitted_at // ""' <<<"$c"); where=$(jq -r 'if .path then " on " + .path + ":" + ((.line // .original_line // 0)|tostring) else "" end' <<<"$c"); rstate=$(jq -r '.state // ""' <<<"$c")
-      if [ "$who" = "$user" ]; then
-        echo "    latest: yours, $when"
-      elif is_bot "$who"; then
-        echo "    latest: $who (bot), $when$where"
-      else
-        human=$((human + 1))
-        echo "    latest: $who, $when$where${rstate:+ [$rstate]}"
-        jq -r '.body // ""' <<<"$c" | sed 's/^/    | /'
-      fi
-    else
-      echo "    latest comment could not be fetched: $latest"
-    fi
+  ic="$(gh api "repos/$repo/issues/$num/comments?since=$since&per_page=100" 2>/dev/null || echo '[]')"
+  if [ "$type" = "PullRequest" ]; then
+    rc="$(gh api "repos/$repo/pulls/$num/comments?since=$since&per_page=100" 2>/dev/null || echo '[]')"
+    rv="$(gh api "repos/$repo/pulls/$num/reviews?per_page=100" 2>/dev/null || echo '[]')"
   else
-    echo "    (no comment attached: a review, a merge, a close, a mention or a review request; see the state above)"
-    if [ "$type" = "PullRequest" ]; then
-      gh api "repos/$repo/pulls/$num/reviews?per_page=100" --jq --arg since "$since" --arg me "$user" '.[] | select(.submitted_at > $since and .user.login != $me) | "    review " + .state + " by " + .user.login + ", " + .submitted_at + (if (.body // "") != "" then "\n    | " + (.body | gsub("\r\n"; "\n    | ")) else "" end)' 2>/dev/null
-    fi
+    rc='[]'; rv='[]'
   fi
+  events="$(jq -nc --argjson ic "$ic" --argjson rc "$rc" --argjson rv "$rv" --arg since "$since" '
+    [ ($ic[] | {t: .created_at, who: (.user.login // "?"), kind: "comment", where: "", rst: "", body: (.body // "")}),
+      ($rc[] | {t: .created_at, who: (.user.login // "?"), kind: "inline", where: (" on " + .path + ":" + ((.line // .original_line // 0) | tostring)), rst: "", body: (.body // "")}),
+      ($rv[] | select((.submitted_at // "") > $since) | {t: .submitted_at, who: (.user.login // "?"), kind: "review", where: "", rst: (.state // ""), body: (.body // "")}) ]
+    | sort_by(.t) | .[]' 2>/dev/null)"
+  shown=0
+  while IFS= read -r e; do
+    [ -n "$e" ] || continue
+    who=$(jq -r .who <<<"$e"); when=$(jq -r .t <<<"$e"); kind=$(jq -r .kind <<<"$e"); where=$(jq -r .where <<<"$e"); rst=$(jq -r .rst <<<"$e")
+    shown=$((shown + 1))
+    if [ "$who" = "$user" ]; then
+      echo "    $when yours: $kind$where"
+    elif is_bot "$who"; then
+      echo "    $when $who (bot): $kind$where${rst:+ [$rst]}"
+    else
+      human=$((human + 1))
+      echo "    $when $who: $kind$where${rst:+ [$rst]}"
+      jq -r .body <<<"$e" | tr -d '\r' | sed 's/^/    | /'
+    fi
+  done <<<"$events"
+  [ "$shown" -gt 0 ] || echo "    (no comment or review since the cursor: a merge, a close, a push, a mention or a review request; see the state above)"
 done <<<"$threads"
 
 if [ "$do_ci" -eq 1 ]; then