[clubanderson]

Fixes #15397

Operator feedback on the "Let hive decide — preview" dialog (seen on #15332): "yikes - this is a mess. different fonts, repeated wording, placement of text and buttons, explanation is confusing" — "this needs to be exceedingly simple to understand and act on."

What changed

Plan API (GET …/decide/delegated/plan, api_repo_item_decide_delegated_plan.go)

• summary is one verb-first sentence with no Hive would: prefix (the prefix was composed on both sides — Go put it in summary, JS prepended it again → "Hive would: Hive would:").
• why is one plain line (≤ 12 words); consequences ≤ 2.
• New fields: title, ladder (🐛 Let hive decide: close already-fixed PRs instead of adopting them #15301), mergeable_as_is. The decide:merge-now alternative is dropped unless the head is mergeable as it is (ladder rung mergeable-as-is, or head facts when the rule had no ladder), so the API and the UI can't disagree.

Dashboard (static-src/js/tracker-actions.js, static-src/css/tracker.css, regenerated static/index.html)

• One renderer (stageTrackerDelegatePlanView → stageTrackerDelegatePlanHtml) for PR, issue, batch and the adopt / close / return variants: title · subject line (repo#N · title…) · optional ⚠ Sentinel chip · Hive would sentence · Why · Then list · collapsed Details (rails, "Why not the others" ruled-out rungs, sentinel finding).
• Exactly two buttons — Cancel · Let hive do that — right-aligned with the .hive-dialog-btn family; Approve & merge as-is only appears when mergeable_as_is (greyed with a reason if the caller lacks the merger role).
• Tokens only, no new raw sizes/colours/inline styles.

Tests

• Go: TestDelegatedPlanWordingDirectionIsOneSentence (🌱 ci: run crux's Go file-size ratchet against src/crux on hive PRs #15332 input → "Send 🌱 ci: run crux's Go file-size ratchet against src/crux on hive PRs #15332 back to its author with one instruction: make CI green, nothing else.", why "CI is red.", no jargon), TestDelegatedDecisionPlanMergeableAsIsOffersMerge, updated adopt/090 cases.
• Node harness: TestStageTrackerDelegatePlanDialogIsOneDecision — 🌱 ci: run crux's Go file-size ratchet against src/crux on hive PRs #15332 case has no duplicate "Hive would", no merge button, visible text ≤ 60 words, no jargon; mergeable-as-is case shows the merge button (and greys it without the role); issue case; batch case; stale double-prefixed summaries are normalised.

Docs / changelog: src/docs/dashboard-sections.md (Preview before acting), src/docs/api-reference/packs-and-acmm.md, changelog.d/fixed-decide-preview-one-decision.md.

Before / after (#15332, headless)

Before	After

After — Details expanded, and a mergeable-as-is PR

Details open	Mergeable as-is

[kubestellar-prow]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign hanthor for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[hivecommons-hive]

@clubanderson is auto-promoted for contributor-lane merging on this PR: the last 5 merged PRs by this author in this hive's repositories have no revert or sentinel-alert evidence. CI, reviewer verdict, diff fences, soak, holds and branch protection still apply.

[github-actions]

Open PR overlap check

Base branch: v5

Conflicts are checked with every PR merged onto the current tip of v5, so a PR that only needs a rebase is not reported as conflicting with its siblings.

PR	Title	Relation	Files
#15402	🐛 fix: show adopted PR provenance in the stage tracker	same files	src/pkg/dashboard/static/index.html
#15408	🐛 tracker: merge outcomes always render in the Merge gate column; pending CI is not 'red'	same files	src/docs/dashboard-sections.md src/pkg/dashboard/static-src/css/tracker.css src/pkg/dashboard/static/index.html
#15406	🐛 tracker: say it once, in plain words — simplify hovers, menus and captions	same files	src/docs/dashboard-sections.md src/pkg/dashboard/stage_tracker_row_actions_test.go src/pkg/dashboard/static-src/css/tracker.css src/pkg/dashboard/static-src/js/tracker-actions.js src/pkg/dashboard/static/index.html
#15400	🐛 fix: keep merge queue position visible during sweeps	same files	src/pkg/dashboard/static/index.html
#15407	✨ tracker: show where an adopted PR came from	CONFLICT	src/pkg/dashboard/static-src/css/tracker.css src/pkg/dashboard/static/index.html

[hivecommons-hive]

Reviewed — no findings from this perspective.

— hive: agent=ci-maintainer backend=copilot model=claude-fable-5.1 copilot=1.0.88

[hivecommons-hive]

stage 080-awaiting-merge-admission → 050-review-pending: required-check-pending:build-and-test

[hivecommons-hive]

Correctness review (head 499bb51)

1. Direction sentence garbles / drops the reviewer's question (medium, in-scope) — src/pkg/dashboard/api_repo_item_decide_delegated_plan.go:233-252 (delegatedPlanInstruction). When the PR has a fix list and in.Question is set, the function falls back to delegatedPlanPlain(d.Text). For a person-authored PR decideReturnToAuthor builds d.Text as "@author: make CI green without widening scope on #N; then it merges — @author, the reviewer asked: <question>" (src/pkg/delegatedecision/policy.go:613-626), and delegatedPlanPlain cuts at the first "; " (plan.go:297-300). Result: "Send #N back to its author with one instruction: @author: make CI green without widening scope on #N." — the reviewer's question (the only reason this branch exists) is lost, the @author: prefix is duplicated into the sentence, and the "one instruction" wording is wrong. No test covers Question != "". Suggested fix:

 func delegatedPlanInstruction(in delegatedecision.Input, d delegatedecision.Decision) string {
 	var fix []string
 	if in.Conflicting {
 		fix = append(fix, "rebase onto the base branch")
 	}
 	if in.DCOMissing {
 		fix = append(fix, "add the sign-off")
 	}
 	if !in.CIGreen {
 		fix = append(fix, "make CI green")
 	}
-	if len(fix) == 0 || strings.TrimSpace(in.Question) != "" {
+	question := strings.TrimSuffix(strings.TrimSpace(in.Question), ".")
+	if len(fix) == 0 && question == "" {
 		if text := delegatedPlanPlain(d.Text); text != "" {
 			return text
 		}
+		return "address the review"
 	}
 	if len(fix) == 0 {
-		return "address the review"
+		return "answer the reviewer: " + question
 	}
+	if question != "" {
+		return strings.Join(fix, ", ") + ", and answer the reviewer: " + question
+	}
 	return strings.Join(fix, ", ") + ", nothing else"
 }

plus a case in TestDelegatedPlanWordingDirectionIsOneSentence with OwnerAuthor: false, TrustedAuthor: true, Question: "…".

2. mergeable_as_is fallback ignores policy holds the ladder would have ruled out (low, in-scope, advisory) — plan.go:306-315: when the ladder does not land (decideLadder returns ok=false for ReporterTrustHold/WorkflowPath, ladder.go:198-200), d.Ladder is nil and the fallback is head facts only, so a green head under a reporter-trust hold still gets mergeable_as_is: true and the merge button, even though rung 2 had skipped mergeable-as-is with "reporter-trust hold" (ladder.go:183, mergeBlockers ladder.go:288-293). If an as-is merge is meant as a deliberate maintainer override there, fine — but then the Details list won't show the ruled-out rung either. Consider && !in.ReporterTrustHold && !in.AdoptionStalled in the fallback to match rung 2.

Otherwise verified: in-place filter of plan.Alternatives is safe (options are freshly built per call, delegated_decision_human_merge.go:88); merge-now disabled reason merger role required is always present (:48,58); JS OffersMerge/Mergeable gating and the #15332 duplicate-prefix normalisation match the Go output.

— hive: agent=adjudicator backend=copilot model=claude-fable-5.1 copilot=1.0.88

[hivecommons-hive]

Read the Go and JS against the tree; this looks correct to me.

• The doubled prefix is fixed at both ends: delegatedPlanWording no longer emits Hive would: (api_repo_item_decide_delegated_plan.go:185-230) and stageTrackerPlanSentence strips any stale (hive would:\s*)+ from an older server (tracker-actions.js:1216), so a mixed-version spoke still renders one eyebrow.
• The API and the dialog cannot disagree on the merge button: the server drops decide:merge-now unless MergeableAsIs (:156-166), and stageTrackerDelegatePlanOffersMerge additionally requires mergeable_as_is === true (tracker-actions.js:1300). A non-merger still gets the option with enabled=false from delegatedHumanMergeOptions (delegated_decision_human_merge.go:48), so the greyed-with-reason path in the body is real.
• The 090 shortcut (delegatedHumanMergeOutcome) builds a Decision with no Ladder, so MergeableAsIs falls back to head facts there — a green 090 head keeps the as-is button, a red one loses it. Sensible.
• stageTrackerDelegatePlanText has no remaining callers outside the regenerated index.html; static-src and static/index.html are in sync (CI test (rest) green).

One open question, not a defect: with a Ladder present, mergeable_as_is is d.Ladder.Decision == RuleMergeableAsIs (:313). Rung 2 is skipped for a green, conflict-free, signed head when ReporterTrustHold or AdoptionStalled is set (delegatedecision/ladder.go:183), and the ladder then lands on rung 4/5 with a Ladder attached — so a merger loses Approve & merge as-is on a head that is technically mergeable, where the old dialog offered it. If that narrowing is intended (the ladder's judgement outranks the head facts), fine; if not, the fallback at :315 could also apply when the ladder's RuledOut entry for mergeable-as-is names only a trust/stall hold.

— hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88

[hivecommons-hive]

Read the Go change against v5 and ran the generator check on 499bb51; looks correct to me.

• Alternatives filter (api_repo_item_decide_delegated_plan.go, the kept := plan.Alternatives[:0] loop): decide:merge-now is dropped only when MergeableAsIs is false, and delegatedPlanMergeableAsIs defers to the ladder rung when a ladder ran and to !Conflicting && CIGreen && !DCOMissing otherwise. Both branches are asserted (TestDelegatedDecisionPlanMergeableAsIsOffersMerge offers it; the contributor-offline case asserts it is absent). The 090 shortcut path still gets its own alternatives first and then goes through the same filter, so the two paths cannot disagree — which is the point of the change.
• Why/Direction wording: delegatedPlanWhy now suppresses the "untrusted / clanker offline" clauses for VerdictDirection and uses delegatedPlanBlockers instead, so a send-back no longer explains itself with trust facts that did not decide it. Consistent with the delegatedPlanInstruction fix list.
• Source layout: static-src/js/tracker-actions.js, static-src/css/tracker.css and the regenerated static/index.html all move together; go run ./pkg/dashboard/webstatic/gen … -check exits 0 on this head, so TestIndexHTMLIsGenerated will pass.

One open question, not a defect: delegatedPlanPlain truncates at the first "; " and strips any (…#N) parenthetical. A rule rationale whose first clause is the less informative half would lose the useful part in the preview; the full text still rides ladder under Details, so this only matters if a rationale is written clause-second. Worth keeping in mind when adding rules.

— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88

[github-actions]

Thank you for your contribution! Your PR has been merged.

We'd love to hear how your experience was: share feedback