Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions defaults/.claude/commands/loom/champion-ratification-hold.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ Rationale: `.loom/docs/ratification-hold.md`.
ratification re-arms the hold, because the text the operator released may not
be the text now on the PR.
- Fail closed: a candidate file whose head content cannot be read is never
`clear`. With no hold standing the tick defers (no merge, no marker); with one
standing it stays.
`clear`. The tick defers (no merge, no marker, no writes) whether or not a
hold is standing — the verb exits 3 before `decide` runs.

A held PR that goes CONFLICTING is served by Doctor, hold intact (#13505): Doctor resolves and pushes, leaves `loom:blocked` and `loom:pr` on, and Judge re-reviews the new head; the operator then ratifies a clean head.

Expand All @@ -66,7 +66,7 @@ The verb folds the state, the detector and the release comment into one
| `stands` | re-assert `loom:blocked` + park record, no comment; **stop** |
| `release` | post the released marker, remove `loom:blocked` only if the other-holds read succeeded and said none stands; continue (a later tick sees `none` at this head) |
| `clear` | the head no longer declares it: post the cleared marker, remove `loom:blocked` unless the other-holds read says another Champion hold stands (an unreadable read keeps the label, #14307); continue |
| `defer` | unreadable candidate, no hold standing: do not merge this tick, write nothing; **stop** |
| `defer` | unreadable candidate: do not merge this tick, write nothing (a read-failure tick does not re-assert `loom:blocked` or the park record); **stop** |

Exit 3 or no stdout (a failed read) is `defer`; exit 2 (a `loom-daemon` older
than the verb) is `none`, since `merge-pr.sh` still refuses a held PR.
Expand Down
9 changes: 6 additions & 3 deletions loom-daemon/src/cli/champion_hold_cmd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ pub(crate) enum ChampionHoldCommand {

/// Decide the ratification hold's tick for a PR (#12992): reads the head
/// contents of every spec/decision file the PR changes and the trusted
/// comments, and prints `LOOM-CHAMPION-RATIFICATION verdict=<clear|hold|
/// unreadable> action=<none|hold|stands|release|clear> pr=<N>
/// comments, and prints `LOOM-CHAMPION-RATIFICATION verdict=<clear|hold>
/// action=<none|hold|stands|release|clear> pr=<N>
/// head=<sha> files=<a,b|->`. Exit 3 with no stdout when a read failed.
Ratification(TargetArgs),

Expand Down Expand Up @@ -301,7 +301,10 @@ fn ratification_line(t: &TargetArgs, root: &std::path::Path) -> String {
let (name, hit) = match &verdict {
Verdict::Clear => ("clear", Vec::new()),
Verdict::Hold(h) => ("hold", h.clone()),
Verdict::Unreadable(u) => ("unreadable", u.clone()),
// Normally gated by `unreadable_candidates` above (exit 3 before
// `scan` runs); if that gate ever stops preceding `scan`, degrade to
// the same reported refusal rather than panic the merge gate.
Verdict::Unreadable(_) => fail("head content"),
};
let listed = if hit.is_empty() {
"-".to_string()
Expand Down
Loading