diff --git a/actions/issueflow-reconcile/issueflow-reconcile.sh b/actions/issueflow-reconcile/issueflow-reconcile.sh index df82c4f..faf6c8d 100644 --- a/actions/issueflow-reconcile/issueflow-reconcile.sh +++ b/actions/issueflow-reconcile/issueflow-reconcile.sh @@ -830,7 +830,7 @@ last_issue_comment_activity() { # $1 issue, $2 created_at → epoch; non-zero on issue_activity_at "$1" "$2" comments-only } -reconcile_board_flags() { # $1 = issue — the collision and window flags (#293) +reconcile_board_flags() { # $1 issue, $2 concluded queue state — board flags (#293) # Dedup is the declaration echo's, per family (#293 D4): the marker is # keyed to the offending state's VALUE and compared against this family's # last word on the thread, so a state that changes speaks and a state that @@ -845,6 +845,7 @@ reconcile_board_flags() { # $1 = issue — the collision and window flags (#293) # board fact that is true right now, and a board where the fact never # changed has nothing new to say. local n="$1" state marker rendered + board_flags_in_scope "$2" || return 0 state="$(flag_for_issue "$n" "${COLLISION_FLAGS:-}")" if [ -n "$state" ]; then marker="$(state_marker collision "$state")" @@ -882,20 +883,22 @@ marker carries the collision itself, so an unchanged one never re-posts.*" >/dev if state_echo_needed "$n" window-nonmember "$marker"; then run forge_issue_comment "$n" " A release window is standing ($state) and this issue is neither one of its -gate members nor an \`epic\` or \`post-merge\` issue. +members nor an \`epic\` or \`post-merge\` issue. #292's invariant: during a standing window — an open \`release\`-labeled issue -with a non-empty gate — the \`ready\` set is a subset of the gate, \`epic\` and -\`post-merge\` exempt. Every mint during a window is a membership call, binary, -made at mint time: **behind the gate**, this issue's own Dependencies declare -the release issue as a blocker and the sweep releases it when the release -closes; or **into the graph**, three writes in one tick — this issue declares -its immediate predecessors, every member whose immediate predecessor it -becomes re-points to it, and the release issue gains \`Blocked by #N\`, which -records membership and nothing else. Silence is not a state. +with a non-empty membership record — the \`ready\` set is a subset of that +record, \`epic\` and \`post-merge\` exempt. Every mint during a window is a +membership call, binary, made at mint time: **behind the gate**, this issue's +own Dependencies declare the release issue as a blocker and the sweep releases +it when the release closes; or **into the graph**, three writes in one tick — +this issue declares its immediate predecessors, every member whose immediate +predecessor it becomes re-points to it, and the release issue gains a row for +this issue in its membership record. Silence is not a state. -The gate is read from the release issue's own \`Blocked by\` declarations — the -same parse every \`blocked\` issue is gated on, echoed on that issue. +Membership is read from the release issue's own \`## Members\` record: the rows +under that heading, one member each, the row's first token a bare \`#N\` and +everything after it prose. A \`Blocked by\` declaration on a release issue +answers its predecessor gate and never its membership (#343). *Comment only: nothing on this path writes a label or changes a state. The marker carries the window itself, so an unchanged one never re-posts.*" >/dev/null @@ -913,9 +916,14 @@ reconcile_issue() { local merged_ref_pr="" transition_marker="" transition_handled=false parsed_set="" parse_marker="" local unchecked="" remove_claimed=claimed local attention_active=true attention_suppression="" + local concluded_queue_state="" + for label in needs-triage epic "${QUEUE_LABELS[@]}"; do + has_issue_label "$label" && concluded_queue_state="$label" + done decision="$(queue_decision <<<"$ISSUE_LABELS")" case "$decision" in ADD_NEEDS_TRIAGE) + concluded_queue_state=needs-triage run forge_issue_edit "$n" --add-label needs-triage >/dev/null log "#$n: needs-triage (no queue state)" ;; FLAG_CONFLICT) @@ -969,6 +977,7 @@ The merge releases the claim; no builder owes a draft. Triage owes completion in --remove-label "$remove_claimed" --add-label post-merge >/dev/null fi log "#$n: merged Refs PR -> post-merge; claim released" + concluded_queue_state=post-merge attention_active=false else created="$(jq -r '.created_at' <<<"$ISSUE_JSON")" @@ -999,6 +1008,7 @@ The merge releases the claim; no builder owes a draft. Triage owes completion in else run forge_issue_edit "$n" --remove-label claimed --add-label ready >/dev/null fi + concluded_queue_state=ready log "#$n: stale claim reclaimed -> ready" ;; esac [ "$decision" != FLAG_UNASSIGNED ] || attention_suppression=claimed-unassigned @@ -1122,6 +1132,7 @@ itself, so a parse unchanged since the last echo never re-posts.*" >/dev/null ensure_comment "$n" blockers-cleared \ 'Every issue named by `Blocked by` is closed. The sweep is moving this issue to `ready`.' run forge_issue_edit "$n" --remove-label blocked --add-label ready >/dev/null + concluded_queue_state=ready log "#$n: blockers closed -> ready" ;; esac elif has_issue_label epic; then @@ -1138,7 +1149,7 @@ itself, so a parse unchanged since the last echo never re-posts.*" >/dev/null 1. Mint the window's members. 2. Graph hard dependencies and same-file clusters. -3. Write ordered waves and the progress task list. +3. Write ordered waves, the \`## Members\` record, and the progress task list. 4. Ask the operator to bless the order, then open the first wave. 5. Ship the release, close this epic, and trigger the next window. @@ -1168,7 +1179,7 @@ See \`$release_doctrine_path\`. The operator blessing the order is the one step # compose with every queue state, and FLAG_CONFLICT's early return still # short-circuits them, because a board lying about its queue state is # repaired before anything is derived from it. - reconcile_board_flags "$n" + reconcile_board_flags "$n" "$concluded_queue_state" # ---- the ruling invariants (#52), on any queue state ---- # The flag composes with the queue labels (#50 D8), so this runs after the @@ -1351,7 +1362,7 @@ main() { done < <(printf '%s' "$b64" | base64 -d | refs_references) done)" - local n tail_line issue_numbers board_json release_bodies rn rbody gate body + local n tail_line issue_numbers board_json release_numbers rn window_records body local window_rendered="" SKIPPED_COUNT=0 SKIPPED_ISSUES="" @@ -1376,31 +1387,39 @@ main() { | @tsv' \ <<<"$board_json")" issue_numbers="$(cut -f1 <<<"$BOARD_RECORDS")" - # A standing window is an open `release`-labeled issue whose gate still - # holds an OPEN member (#292 D1). The board read IS the open set, so - # membership decides openness with no extra call — and an all-closed gate - # is exactly the emptied gate the release's own `blocked` -> `ready` - # promotion answers, which is why a `ready` release leaves the flag - # dormant rather than flagging the whole board. - release_bodies="$(jq -r '.[] | select(.pull_request == null) + # A standing window is an open `release`-labeled issue whose MEMBERSHIP + # RECORD still holds an OPEN member (#292 D1 as #343 D3 re-reads it). The + # board read IS the open set, so membership decides openness with no extra + # call — and an all-closed record is exactly the emptied window the + # release's own `blocked` -> `ready` promotion answers, which is why a + # `ready` release leaves the flag dormant rather than flagging the board. + # + # The record is read by heading, so each body must reach the parse with its + # LINE STRUCTURE INTACT. Taking it from the board payload by issue number + # preserves that structure without fetching a second, disagreeing board. + release_numbers="$(jq -r '.[] | select(.pull_request == null) | select((.labels // []) | map(.name) | index("release")) - | [(.number | tostring), ((.body // "") | gsub("[\t\r\n]"; " "))] | @tsv' \ + | .number' \ <<<"$board_json")" WINDOW_CARRIERS="" - WINDOW_GATE="" + WINDOW_MEMBERS="" if [ -n "$issue_numbers" ]; then - while IFS=$'\t' read -r rn rbody; do - [ -n "$rn" ] || continue - gate="$(blocked_references <<<"$rbody")" - [ -n "$gate" ] || continue - grep -qxF -f <(printf '%s\n' "$issue_numbers") <<<"$gate" || continue - WINDOW_CARRIERS="${WINDOW_CARRIERS}${rn}"$'\n' - WINDOW_GATE="${WINDOW_GATE}${gate}"$'\n' - done <<<"$release_bodies" + window_records="$( + while IFS= read -r rn; do + [ -n "$rn" ] || continue + jq -r --argjson n "$rn" '.[] | select(.pull_request == null) + | select(.number == $n) | .body // ""' <<<"$board_json" \ + | release_window_members "$rn" "$issue_numbers" + done <<<"$release_numbers" + )" + # One record per parsed non-self member keeps the carrier decision and + # its WINDOW_MEMBERS contribution coupled to the extracted function. + WINDOW_CARRIERS="$(cut -f1 <<<"$window_records" | awk 'NF' | sort -nu)" + WINDOW_MEMBERS="$(cut -f2 <<<"$window_records" | awk 'NF' | sort -nu)" fi [ -z "$WINDOW_CARRIERS" ] || window_rendered="$(window_state "$WINDOW_CARRIERS")" COLLISION_FLAGS="$(collision_key_index <<<"$BOARD_RECORDS" | collision_flags)" - WINDOW_FLAGS="$(window_flags "$WINDOW_GATE" "$WINDOW_CARRIERS" <<<"$BOARD_RECORDS" \ + WINDOW_FLAGS="$(window_flags "$WINDOW_MEMBERS" "$WINDOW_CARRIERS" <<<"$BOARD_RECORDS" \ | awk -v state="$window_rendered" 'NF { print $1 "\t" state }')" if [ -z "$issue_numbers" ]; then log "no open issues." diff --git a/test/issueflow-reconcile.test.sh b/test/issueflow-reconcile.test.sh index 4e50bb0..0d0d8ed 100644 --- a/test/issueflow-reconcile.test.sh +++ b/test/issueflow-reconcile.test.sh @@ -502,6 +502,11 @@ check "a release epic with every declared blocker closed announces init" 0 "" \ grep -qF '' "$TMP/posted-53" check "the init announce names all five steps" 0 "5" \ grep -cE '^[1-5]\. ' "$TMP/posted-53" +# Release-init is where the membership record is first written, so step 3 +# names it beside the waves and the progress task list. +# shellcheck disable=SC2016 # backticks are the comment body's own Markdown +check "step 3 names the membership record it first writes" 0 "" \ + grep -qF '3. Write ordered waves, the `## Members` record' "$TMP/posted-53" # shellcheck disable=SC2016 # backticks are the literal portable doctrine citation check "the init announce cites the portable vendored doctrine path" 0 "" \ grep -qF 'See `.ceremony/RELEASES.md`.' "$TMP/posted-53" @@ -714,9 +719,16 @@ check "the flag-free control is reclaimed (the clock still runs elsewhere)" 0 "" # -- merged Refs work releases the claim before the reclaim clock ------------ printf '[]\n' >"$(cfix 35)" +COLLISION_FLAGS=$'35\tissueflow-reconcile=34' +WINDOW_FLAGS=$'35\t#50' transition="$(issue_probe 35 claimed 1 false 350 $'- [x] built\n- [ ] verify dispatch\n * [ ] confirm warning clears')" +unset COLLISION_FLAGS WINDOW_FLAGS check "merged Refs + unchecked criteria transitions in the sweep body" 0 "" \ grep -q 'merged Refs PR -> post-merge; claim released' <<<"$transition" +check "a pass concluding post-merge draws no precomputed collision flag" 1 "" \ + grep -q 'collision flag' <<<"$transition" +check "...and no precomputed window flag" 1 "" \ + grep -q 'window flag' <<<"$transition" # shellcheck disable=SC2016 # positional parameters belong to bash -c check "...names every remaining criterion verbatim in the comment" 0 "" \ bash -c 'grep -qF -- "- [ ] verify dispatch" "$1" && @@ -1821,12 +1833,12 @@ check "...the null-valued row is TRAVERSED, with an observable outcome" 0 "" \ check "...and the object-valued PR row is not reconciled as an issue" 1 "" \ grep -qE '^issueflow: #61' <<<"$fjb_out" -# release_bodies is the THIRD producer and has its own has() site. A `release` +# release_numbers is the THIRD producer and has its own issue-shape filter. A `release` # issue on a forgejo-shaped board must reach the window gather, or the #292 # flags are decided over an empty set (@codex-reviewer-andresmgsl, #210). printf '%s\n' \ '[{"number":60,"pull_request":null,"labels":[{"name":"ready"}],"title":"an issue"}, - {"number":62,"pull_request":null,"labels":[{"name":"release"}],"title":"Release 9.9.9","body":"Blocked by #60."}, + {"number":62,"pull_request":null,"labels":[{"name":"release"}],"title":"Release 9.9.9","body":"Blocked by #59.\n\n## Members\n- #60"}, {"number":63,"pull_request":null,"labels":[{"name":"ready"}],"title":"a claimable non-member"}, {"number":61,"pull_request":{"merged":false},"labels":[],"title":"a pull request"}]' \ >"$FORGEJO_BOARD/repos_owner_repo_issues_state_open.json" @@ -1836,13 +1848,13 @@ jq -n --arg at "$(iso_at "$INOW")" \ >"$FORGEJO_BOARD/repos_owner_repo_issues_63.json" printf '[]\n' >"$FORGEJO_BOARD/repos_owner_repo_issues_63_comments.json" jq -n --arg at "$(iso_at "$INOW")" \ - '{number:62,user:{login:"triage-one"},created_at:$at,body:"Blocked by #60.",pull_request:null, + '{number:62,user:{login:"triage-one"},created_at:$at,body:"Blocked by #59.\n\n## Members\n- #60",pull_request:null, labels:[{name:"release"}],assignees:[]}' \ >"$FORGEJO_BOARD/repos_owner_repo_issues_62.json" printf '[]\n' >"$FORGEJO_BOARD/repos_owner_repo_issues_62_comments.json" fjb2_out="$(forgejo_board_run)" -# The observable effect of release_bodies being NON-empty: an open `release` -# issue whose gate still holds an open member makes every claimable non-member +# The observable effect of release_numbers being NON-empty: an open `release` +# issue whose membership record still holds an open member makes every claimable non-member # draw a window flag. With that gather empty there are no carriers and no flag, # so this row discriminates the site rather than merely reaching it. check "a release issue on a forgejo-shaped board reaches the window gather" 0 "" \ @@ -2683,7 +2695,7 @@ board_run() { # them — six `ready` non-members against a standing gate, and one deliverable # carried three times in two spellings. board_issue 249 blocked,release 'Release 0.6.0 — the board empties into the tag' \ - 'Blocked by #253.' + "$(printf '%s\n' 'Blocked by #253.' '' '## Members' '- #253')" board_issue 253 claimed 'issueflow-reconcile — a release epic announces its own release-init' '' 1 board_issue 257 ready 'actions/issueflow-reconcile — a failed board read sweeps an empty board' board_issue 264 ready 'TRIAGE.md — the no-assignee clause scopes to the flag' @@ -2743,7 +2755,18 @@ check "the window comment names #292's invariant" 0 "" \ grep -qF "#292's invariant" "$BOARD/edits" # shellcheck disable=SC2016 # backticks are the comment body's own Markdown check "...and states the subset rule with its exemptions" 0 "" \ - grep -qF 'the `ready` set is a subset of the gate' "$BOARD/edits" + grep -qF 'the `ready` set is a subset of that' "$BOARD/edits" +# shellcheck disable=SC2016 # backticks are the comment body's own Markdown +check "...and tells triage where membership is actually read from" 0 "" \ + grep -qF 'Membership is read from the release issue'"'"'s own `## Members` record' \ + "$BOARD/edits" +# shellcheck disable=SC2016 # backticks are the comment body's own Markdown +check "...and says what a release issue's Blocked by line does answer" 0 "" \ + grep -qF 'answers its predecessor gate and never its membership' "$BOARD/edits" +check "...and asks the third write for a row, not a declaration" 0 "" \ + grep -qF 'the release issue gains a row for' "$BOARD/edits" +check "no window comment sends triage to a Blocked by declaration" 1 "" \ + grep -qF 'The gate is read from the release issue' "$BOARD/edits" check "both comments carry idempotency markers (D4)" 0 "" \ grep -qF '