Skip to content
Merged
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
1 change: 1 addition & 0 deletions changelog.d/added-delegate-plan-what-hive-saw.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- *Let hive decide* now shows what the decision rests on. Under **Details**, the preview lists **What hive saw**: every fact the decision rules read (author, whether the contributor is connected, CI, conflicts, sign-off, review, Sentinel and the rest), each marked as fine, holding the item back, or steering the decision. Then come the rule that decided, with its whole reason, and each option that was ruled out, with the fact that ruled it out. The visible part of the dialog is unchanged.
2 changes: 1 addition & 1 deletion src/docs/api-reference/packs-and-acmm.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Part of the [Dashboard REST API reference](../api-reference.md); see that page f
| `POST` | `/api/repos/{owner}/{repo}/items/{number}/hold` | Owner or repo write/maintain/admin | Add or remove a dashboard hold chip for an issue or PR. Body `{"held": true}` adds the hive's exact-match canonical `hive-pause/<hive-id>` label; `{"held": false}` removes exactly the labels causing the hold (`hive-pause/<hive-id>` and/or generic hold labels) and never removes `hive/<hive-id>` provenance. Every toggle writes an audit-log entry; the #8851 upgrade migration writes `/data/hive-hold-migration-<hive-id>.json` with audit-backed, provenance-only, and ambiguous legacy `hive/<hive-id>` classifications. | `pkg/dashboard/api.go:364`, `pkg/dashboard/api_repo_hold.go` |
| `POST` | `/api/repos/{owner}/{repo}/items/{number}/decision` | Owner or repo write/maintain/admin, signed-in GitHub user | Record an operator decision from the activity monitor's row menu / selection bar. Body `{"decision": "approve"|"direction"|"close-superseded"|"close-wontfix"|"adopt"|"reroute"|"re-author"|"merge-now"|"queue-merge", "comment": "…", "type": "issue"|"pr", "superseded_by": "#458", "force": true, "to": "<login>"|"any"}` (`force` only with `adopt`, `to` only with `reroute`; an unknown `decision` is a 400). On an issue parked at 045, `approve`/`direction` act exactly as a maintainer's `/hive approve` / `/hive decision <text>` comment would (labels, `approved-direction`, stage-engine Unparked fact, reply comment naming the operator). On a PR parked at 085 (`type: "pr"`), `approve` posts the `/lgtm` and `/approve` commands as two comments attributed to the operator, records the approval against the head as the human answer to a `requires_human` / decision-requested verdict (the lanes and the stage engine honour it like a trusted merger's Approve review), lifts `needs-human`, clears the sentinel label and acknowledges the bundle's sentinel findings for that head, re-derives the stage and drops the tracker cache — the response adds `released` (`approval-recorded`, `needs-human`, `sentinel-label`, `sentinel-acknowledged`) and `stage`; the merge gate decides from there (no review as the operator, no merge) — and `direction` records the text as a human change request against the head — the `/hive decision` fix lane — on a hive-authored PR, and on a contributor's clanker PR (`author/clanker` / hive attribution markers) where the text is posted to the contributor's hive and the PR moves to `stage/072-returned-to-contributor` (`status: "direction-returned-to-contributor"`); a person's PR, which no hive can carry direction to, answers 409. The close variants post a comment naming the operator (and the superseding PR when `superseded_by` is given) and close the item as not planned. `adopt` and `re-author` require `type: "pr"` and queue adoption via the `adoption/supersede` label (409 unless `governor.labels.stage.adoption` is enabled). `adopt` with `"force": true` is *Adopt now* ([#15038](https://github.com/hivecommons/hive/issues/15038)): it bypasses the author's presence, the grace window and `maintainer_policy`, marks the stage record and nudges the automerge sweep so the adoption engine supersedes the head at once (responds `status: "already-adopted"` when nothing is left to do; 400 on the hive's own PR). `reroute` (`type: "pr"`, `"to": "<clanker login>"|"any"`) hands the PR's follow-up work to another online clanker through the contributor fix queue, posts a `<!-- hive:rerouted … -->` note and arms a pickup timer that falls back to Adopt now after `governor.reroute.pickup_timeout`; answers `status: "rerouted"`, 409 when no clanker is online or adoption is disabled. On a PR at 090, `queue-merge` (*Approve and let hive merge*, the lead action) records an approval attributed to the operator and applies the automerge label, returning `status: "queued-for-merge"` (on the hive's own PR, which the App cannot review, the queue note is a comment and the operator's approval is recorded as `approve` records it — `released` lists `approval-recorded`, `admitted`); hive's merge sweep merges on its next tick once CI is green and the head has soaked, and that recorded operator approval is the one thing that lets the sweep merge an untrusted-author PR (the merge comment names the operator). `merge-now` (*Merge now as maintainer*, secondary) posts an attributed comment and merges immediately through the hive's GitHub App, returning `status: "merged"`. Both require `type: "pr"` and a verified owner or `merger` role in addition to the route's repo permission check; both refuse closed/merged PRs and the operator's own PR. `merge-now` on a PR whose `mergeable_state` is `dirty`/`behind` instead answers `202` with `status: "rebase-queued"` (approval recorded, rebase kicked, merge follows via the follow-through once the hive's own rebase is green; a head pushed by anyone else fails the follow-through closed; `head-not-pushable` refusal on a fork without maintainer edits). `approve` on such a PR adds `rebase: {attempt, max, exhausted, head, text}` for the rebase episode it opened. Every decision writes an audit-log entry (`repo_item_decision_*`, e.g. `repo_item_decision_adopt_now`, `repo_item_decision_reroute`). | `pkg/dashboard/api.go:365`, `pkg/dashboard/api_repo_item_decision.go` |
| `POST` / `GET` | `/api/repos/{owner}/{repo}/items/{number}/decide-delegated` | Same as `…/hold` (owner or repo write), signed-in GitHub user; `decisions.delegate.enabled` (403 when off) | *Let hive decide*: enqueue a delegated-decision job in which the hive decides the parked item itself as the owner's delegate under `pkg/delegatedecision.PolicyText` and records it as a human decision (`/hive decision` comment with the `<!-- hive:delegated-decision … -->` marker, park labels off, `triage/accepted`, queue approval on a PR head). Body `{"type": "issue"|"pr", "reason", "caption", "sentinel_reason"}`. `POST` answers 202 with the job (`{id, status: "running"|"done"|"failed", decision: {verdict, rule, text, rationale, actions, keeps_park, ladder?: {decision, reason, ruled_out[]}}, notes, error}`; `ladder` is set on contributor-PR decisions and names the rung that decided — `already-fixed` → `mergeable-as-is` → `rebase-then-merge` → `return-to-contributor` → `contributor-offline` — and why each rung above it did not apply); 409 with the running job while one is in flight; `GET` reads it. Rails: never merges, refuses items wearing `hold`, never grants secrets/permissions (`needs-owner` + `hold` instead), recommends only on hive policy/governance questions (keeps 085). Audited as `repo_item_decision_delegated[_failed]`. See [dashboard-sections.md](../dashboard-sections/activity-monitor.md#let-hive-decide). | `pkg/dashboard/api.go:329`, `pkg/dashboard/api_repo_item_decide_delegated.go` |
| `POST` | `/api/repos/{owner}/{repo}/items/{number}/decide-delegated/plan` | Same as `…/decide-delegated` | Preview for *Let hive decide*: runs the same owner-delegate policy with **no side effects** (nothing written, no job) and answers `{would, rule, acting, title, summary, why, consequences[], ladder, mergeable_as_is, alternatives[], writes: false, prior, notes}` — `summary` is one verb-first sentence with no "Hive would:" prefix (*Send #15332 back to its author with one instruction: make CI green, nothing else.*), `why` one short line (*CI is red.*), `consequences` at most two items, `ladder` the rung that decided with its `ruled_out` list, and `mergeable_as_is` whether an as-is merge is honest (the queue-merge and merge-now alternatives are dropped when it is not). The dialog shows **Cancel** / **Let hive do that**, plus **Approve and let hive merge** (or **Merge now as maintainer** when the hive would approve anyway) only when `mergeable_as_is`; only then does the SPA post `…/decide-delegated` with `chosen` naming the button. See [dashboard-sections.md](../dashboard-sections/activity-monitor.md#let-hive-decide). | `pkg/dashboard/api.go:369`, `pkg/dashboard/api_repo_item_decide_delegated_plan.go` |
| `POST` | `/api/repos/{owner}/{repo}/items/{number}/decide-delegated/plan` | Same as `…/decide-delegated` | Preview for *Let hive decide*: runs the same owner-delegate policy with **no side effects** (nothing written, no job) and answers `{would, rule, acting, title, summary, why, consequences[], ladder, mergeable_as_is, alternatives[], writes: false, prior, notes, saw[], rule_plain, rationale, why_not[]}` — `summary` is one verb-first sentence with no "Hive would:" prefix (*Send #15332 back to its author with one instruction: make CI green, nothing else.*), `why` one short line (*CI is red.*), `consequences` at most two items, `ladder` the rung that decided with its `ruled_out` list, `saw` every fact the rules read as `{label, value, state}` (`state` is `ok`, `blocks` or `info`), `rule_plain` and `rationale` the deciding rule in plain words and its whole reason (`rationale` omitted when it only repeats `why`), `why_not` the ruled-out rungs as `{option, because}`, and `mergeable_as_is` whether an as-is merge is honest (the queue-merge and merge-now alternatives are dropped when it is not). The dialog shows **Cancel** / **Let hive do that**, plus **Approve and let hive merge** (or **Merge now as maintainer** when the hive would approve anyway) only when `mergeable_as_is`; only then does the SPA post `…/decide-delegated` with `chosen` naming the button. See [dashboard-sections.md](../dashboard-sections/activity-monitor.md#let-hive-decide). | `pkg/dashboard/api.go:369`, `pkg/dashboard/api_repo_item_decide_delegated_plan.go` |
| `POST` | `/api/repos/{owner}/{repo}/items/{number}/blocker/recheck` | Same as `…/hold` (owner or repo write), signed-in GitHub user | *Re-check permissions* on an issue parked on a capability blocker (#15099): probes the GitHub App installation's permissions; when a non-workflows permission is granted, clears its ledger entries and un-parks the item; workflows blockers require a separate hand-off (`{result: {outcome: "released", …}}`), otherwise `{result: {outcome: "no-effect", reason: "blocker", options: [...]}}`; 404 when the item has no blocker, 409 when the blocker is not a capability gap | `pkg/dashboard/api.go:370` |
| `POST` | `/api/repos/{owner}/{repo}/items/{number}/blocker/handoff` | Same as `…/hold`, signed-in GitHub user | With a workflows blocker, verified App permission and capable lane, records the decision, clears the park and routes the issue to that lane; rejects held or ineligible issues | `pkg/dashboard/api.go:371` |
| `POST` | `/api/repos/{owner}/{repo}/items/{number}/blocker/close-partial` | Same as `…/hold` (owner or repo write), signed-in GitHub user | Option (c) on a capability blocker (#15099): labels the issue `hive/partially-addressed`, posts the operator's `{"comment"}` naming what remains and closes it; the ledger entry is cleared | `pkg/dashboard/api.go:372` |
Expand Down
4 changes: 2 additions & 2 deletions src/docs/dashboard-sections/activity-monitor.md
Original file line number Diff line number Diff line change
Expand Up @@ -752,11 +752,11 @@ The toast and the decision trail lead with the outcome in one line — *Adopted

**Fast previews.** Revealing a row's decision options — opening its decision popover or ⋯ menu, or hovering or focusing its *Let hive decide* button — prefetches the plan, and the click reuses that answer. The server keeps each plan for 45 s (at most 256 entries) keyed by repo, number, type, PR head and the request, so the prefetch and the click share one GitHub round trip; a new head or a recorded decision drops it. The plan response carries `Server-Timing: decide_plan;desc="hit|miss";dur=…` and the server logs one debug line with the plan's duration ([#15773](https://github.com/hivecommons/hive/issues/15773)).

**Preview before acting.** *Let hive decide* no longer acts on the click. The button turns busy and reads **Asking the hive…** (the row caption says the same) while it first calls `POST …/decide-delegated/plan`, a dry run with no side effects that answers `{would, title, summary, why, consequences[], ladder, mergeable_as_is, alternatives[]}`, and shows one decision — built to be read in three seconds (operator feedback on hive's own spoke: the first version was "a wall of text" with a doubled *Hive would: Hive would:*, the PR named twice, three type sizes and a merge button on a head it had just called not mergeable):
**Preview before acting.** *Let hive decide* no longer acts on the click. The button turns busy and reads **Asking the hive…** (the row caption says the same) while it first calls `POST …/decide-delegated/plan`, a dry run with no side effects that answers `{would, title, summary, why, consequences[], ladder, mergeable_as_is, alternatives[], saw[], rule_plain, rationale, why_not[]}`, and shows one decision — built to be read in three seconds (operator feedback on hive's own spoke: the first version was "a wall of text" with a doubled *Hive would: Hive would:*, the PR named twice, three type sizes and a merge button on a head it had just called not mergeable):

- **Title** *Let hive decide*, then one subject line — `hivecommons/hive#15332 · ci: run crux's Go file-size ratchet…` — with a compact **⚠ Sentinel** chip when the sentinel flagged the head (the full finding is in Details).
- **Eyebrow** *Hive would* → **one verb-first sentence**: *Send #15332 back to its author with one instruction: make CI green, nothing else.* → one muted **Why** line (≤ 12 words: *CI is red.*) → **Then**, at most two short items (*Hive posts that instruction on #15332. · The author pushes a fix; the row updates when it lands.*).
- **Details** (collapsed): the sentinel finding, *Why not the others* — the ladder rungs ruled out above the one that decided (`ladder.ruled_out`) — and the one-line rails (*never merges, never touches held items, never grants secrets; the sentinel label stays with a person*).
- **Details** (collapsed): the sentinel finding; **What hive saw** (`saw`), every fact the decision rules read — author, whether the contributor is connected, CI, conflicts, sign-off, review, Sentinel, and whatever else steered it — each marked ✓ (fine), ✗ (holds it back) or • (steers the decision), then the **Rule** that decided and its whole reason; *Why not the others* — each option the ladder ruled out above the one that decided, with the fact that ruled it out (*Approve as it is — conflicting, CI not green*; `why_not`, from `ladder.ruled_out`); and the one-line rails (*never merges, never touches held items, never grants secrets; the sentinel label stays with a person*).
- **Buttons**, right-aligned: **Cancel** · **Let hive do that**. A merge button appears only when the plan says `mergeable_as_is` — the ladder's *mergeable-as-is* rung, or (no ladder) a green, conflict-free, signed-off head — and is greyed with the reason when the operator lacks merge rights; the plan drops both merge alternatives otherwise, so the dialog cannot contradict itself. The button is **Approve and let hive merge** (`decide:queue-merge`); when the hive would approve anyway, that is the primary button under another name, so the one merge alternative left is **Merge now as maintainer**.

The same renderer serves issue decisions and every PR verdict (adopt, approve, close as duplicate/superseded, send back, recommend only). The visible text never uses hive's vocabulary (*park*, *audit marker*, *stage*, *ladder*, */hive decision*) and is ≤ 60 words for the #15332 case, which the node harness enforces. Nothing is written until the operator picks, and the badge tooltip and the trail record which button was pressed (the request's `chosen`).
Expand Down
13 changes: 11 additions & 2 deletions src/pkg/dashboard/api_repo_item_decide_delegated_plan.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@ type delegatedDecisionPlan struct {
// then says so and the primary button re-runs it.
Prior *time.Time `json:"prior,omitempty"`
Notes []string `json:"notes,omitempty"`
// Saw is every fact the decision rules read, for the dialog's "What
// hive saw"; RulePlain and Rationale are the rule that decided and its
// whole reason; WhyNot is the ladder's ruled-out options with the fact
// that ruled each out. All four sit under Details.
Saw []delegatedecision.Fact `json:"saw,omitempty"`
RulePlain string `json:"rule_plain,omitempty"`
Rationale string `json:"rationale,omitempty"`
WhyNot []delegatedecision.WhyNot `json:"why_not,omitempty"`
}

// delegatedPlanAlternativeLabel is the preview's merge button: the
Expand Down Expand Up @@ -230,7 +238,7 @@ func (s *Server) planDelegatedDecision(ctx context.Context, repoFull string, num
if err != nil {
return nil, err
}
plan := &delegatedDecisionPlan{Repo: repoFull, Number: number, Type: itemType, Title: strings.TrimSpace(in.Title)}
plan := &delegatedDecisionPlan{Repo: repoFull, Number: number, Type: itemType, Title: strings.TrimSpace(in.Title), Saw: in.Facts()}
if in.Kind == delegatedecision.KindIssue {
if b := s.delegatedBlocker(ctx, repoFull, number, s.delegatedCommentTexts(ctx, repoFull, number)); b != nil && blocker.Kind(b.Kind) == blocker.CapabilityWorkflowsPermission {
held := len(holdLabels(in.Labels, s.delegateHiveID())) > 0
Expand Down Expand Up @@ -274,7 +282,8 @@ func (s *Server) planDelegatedDecision(ctx context.Context, repoFull string, num
}
plan.Summary, plan.Consequences = delegatedPlanWording(in, d)
plan.Why = delegatedPlanWhy(in, d)
plan.Ladder = d.Ladder
plan.RulePlain, plan.Rationale = delegatedPlanRule(in, d, plan.Why)
plan.Ladder, plan.WhyNot = d.Ladder, d.Ladder.WhyNot()
plan.MergeableAsIs = delegatedPlanMergeableAsIs(in, d)
if plan.Alternatives == nil {
plan.Alternatives = delegatedPlanAlternatives(in, d, mergerRole)
Expand Down
22 changes: 22 additions & 0 deletions src/pkg/dashboard/api_repo_item_decide_delegated_plan_rule.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package dashboard

import (
"strings"

"github.com/hivecommons/hive/pkg/delegatedecision"
)

// delegatedPlanRule is the rule that decided, in plain words, and its whole
// reason with issue references stripped; the reason is left out when it
// says no more than the dialog's one-line Why.
func delegatedPlanRule(in delegatedecision.Input, d delegatedecision.Decision, why string) (rule, rationale string) {
if d.Rule != "" {
rule = delegatedecision.PlainOn(d.Rule, in.Kind)
}
rationale = strings.TrimSpace(delegatedPlanIssueRef.ReplaceAllString(strings.TrimSpace(d.Rationale), ""))
rationale = strings.Join(strings.Fields(rationale), " ")
if strings.EqualFold(strings.TrimSuffix(rationale, "."), strings.TrimSuffix(strings.TrimSpace(why), ".")) {
rationale = ""
}
return rule, rationale
}
Loading
Loading