${esc(ref)}${item.title ? ' · ' + esc(item.title) : ''}
-
${esc(d.question || '')}
+
${esc(question)}
${typeof stageTrackerPresenceTip === 'function' && stageTrackerPresenceTip(item, nowMs) ? `
${stageTrackerPresenceDotHtml(item, nowMs)}${esc(stageTrackerPresenceTip(item, nowMs))}
` : ''}
- ${d.blocker ? `
${esc(d.blocker)}
` : ''}
- ${buttons ? `
${buttons}
` : ''}
- ${consequences ? `
` : ''}
+ ${lead || more ? `
${lead}${more}
` : ''}
${esc(meta)}
- ${tip ? `
${esc(tip)}
` : ''}
+ ${fold}
`;
}
// Run a popover action down the row context menu's path.
@@ -773,7 +796,7 @@
p.onKey = e => {
if (e.key === 'Escape') { e.preventDefault(); e.stopPropagation(); stageTrackerCloseDecisionPop(true); return; }
if (e.key === 'Tab' && el.contains(e.target)) {
- const acts = Array.from(el.querySelectorAll('.ham-decision-act'));
+ const acts = Array.from(el.querySelectorAll('.ham-decision-act, .ham-decision-details > summary'));
const last = acts[acts.length - 1], first = acts[0];
if ((!e.shiftKey && e.target === last) || (e.shiftKey && (e.target === first || e.target === el))) stageTrackerCloseDecisionPop(true);
}
@@ -782,6 +805,15 @@
el.addEventListener('pointerleave', () => stageTrackerDecisionPopLeave());
el.addEventListener('focusin', () => { p.pinned = true; clearTimeout(p.timer); });
el.addEventListener('click', e => {
+ const moreBtn = e.target.closest('[data-ham-more]');
+ if (moreBtn) {
+ // "More ⋯" hands over to the row's own menu, anchored on the trigger.
+ e.preventDefault(); e.stopPropagation();
+ const anchor = stageTrackerDecisionTrigger(key) || trigger;
+ stageTrackerCloseDecisionPop(false);
+ stageTrackerOpenMenu([p.item], { anchor, restore: anchor });
+ return;
+ }
const b = e.target.closest('[data-ham-act]');
if (!b || b.getAttribute('aria-disabled') === 'true') return;
e.preventDefault(); e.stopPropagation();
@@ -1325,10 +1357,10 @@
if (items.some(stageTrackerNeedsRebase)) {
return (await stageTrackerAsk(id, 'confirm', { title: STAGE_TRACKER_REBASE_MERGE_LABEL, message: preface + refs + ' is behind ' + base + ' (needs a rebase), so GitHub would refuse a plain merge. Record your approval as ' + who + ' and have the hive rebase it onto ' + base + ', wait for CI, then merge it with your approval on record? You get a toast when it lands or if the rebase conflicts.' + stageTrackerDCOCaveat(items), confirmLabel: 'Approve & rebase-merge', danger: true })) ? {} : null;
}
- return (await stageTrackerAsk(id, 'confirm', { title: 'Approve & merge as maintainer', message: preface + 'Merge ' + refs + ' into ' + base + ' now via hive\'s identity, attributed to ' + who + '? The merge gate parked it for a human because its author is not a trusted merger on this repo; this is you taking that call. The head you see is the head that merges — a push in between makes GitHub refuse.' + stageTrackerDCOCaveat(items), confirmLabel: 'Approve & merge', danger: true })) ? {} : null;
+ return (await stageTrackerAsk(id, 'confirm', { title: 'Approve & merge as maintainer', message: preface + 'Merge ' + refs + ' into ' + base + ' now, credited to ' + who + '? Hive left this merge to a person; this is you taking that call. The version you see is the one that merges.' + stageTrackerDCOCaveat(items), confirmLabel: 'Approve & merge', danger: true })) ? {} : null;
}
case 'decide:queue-merge':
- return (await stageTrackerAsk(id, 'confirm', { title: 'Approve — let hive merge', message: preface + 'Record your approval on ' + refs + ' as the owner decision, as ' + who + '? This is the trust override for this head: hive\'s merge sweep merges it as-is on the next tick once CI is green, respecting soak, and will not adopt or re-author it. The dashboard merges nothing itself.' + stageTrackerDCOCaveat(items), confirmLabel: 'Approve' })) ? {} : null;
+ return (await stageTrackerAsk(id, 'confirm', { title: 'Approve — let hive merge', message: preface + 'Approve ' + refs + ' as ' + who + '? Your approval stands in for the author\'s trust on this version: hive merges it as-is on its next pass once CI is green, and will not adopt or re-author it.' + stageTrackerDCOCaveat(items), confirmLabel: 'Approve' })) ? {} : null;
case 'decide:re-author': {
const caveat = stageTrackerDCOCaveat(items);
return (await stageTrackerAsk(id, 'confirm', { title: 'Re-author as hive PR', message: preface + 'Have the hive re-author ' + refs + ' as ' + who + '?' + (caveat || ' Its head cannot merge as-is.') + ' The hive re-homes the commits on a hive-owned, signed-off branch and opens a superseding PR; this one is closed when that merges. Nothing is merged as-is, and the author\'s commits stay attributed.', confirmLabel: 'Re-author', danger: true })) ? {} : null;
diff --git a/src/pkg/dashboard/static-src/js/tracker-row.js b/src/pkg/dashboard/static-src/js/tracker-row.js
index 13332357a7..94b2d48698 100644
--- a/src/pkg/dashboard/static-src/js/tracker-row.js
+++ b/src/pkg/dashboard/static-src/js/tracker-row.js
@@ -283,7 +283,8 @@
else if (curStage === STAGE_TRACKER_PRE_MERGE_SOAK) tip = sg.label + ' — admitted, soaking' + stageTrackerSoakLeft(item);
else if (curStage === 100) tip = sg.label + ' — admitted, merging';
// Why a person merges a 090 PR leads its tooltip (hivecommons/hive#14658).
- else if (curStage === STAGE_TRACKER_READY_FOR_HUMAN_MERGE && item.human_merge_reason_text) tip = ((sg.detour && sg.detour.text) || sg.label) + ' — ' + String(item.human_merge_reason_text).trim() + (sg.description ? ' — ' + sg.description : '');
+ // The reason is the whole story; the stage description would only repeat it (hivecommons/hive#15394).
+ else if (curStage === STAGE_TRACKER_READY_FOR_HUMAN_MERGE && item.human_merge_reason_text) tip = ((sg.detour && sg.detour.text) || sg.label) + ' — ' + String(item.human_merge_reason_text).trim();
if (actorTip && !sg.cap) tip += actorTip;
// The sentinel's reason leads the lane tooltip so the security
// implication is read before the stage mechanics.
@@ -402,6 +403,8 @@
// Row tooltip: headline, reason, repo, author, flags, since, recent hops.
function stageTrackerTooltip(item, nowMs) {
const ak = item.author_kind || '';
+ // Plain words for author_kind in hover text (hivecommons/hive#15394).
+ const akPlain = { human: 'person', clanker: 'agent', hive: 'hive', bot: 'bot' };
const mods = Array.isArray(item.modifiers) ? item.modifiers : [];
const sinceMs = Date.parse(item.stage_since || '');
const trail = stageTrackerTrailText(item);
@@ -409,7 +412,7 @@
const lines = openHeld
? [stageTrackerHeadline(item) + (item.caption || item.reason ? ' · ' + (item.caption || item.reason) : '') + (item.repo ? ' · ' + item.repo : '')]
: [stageTrackerHeadline(item), item.caption || item.reason || '', item.repo || ''];
- if (item.author || ak) lines.push('Author: ' + (item.author ? '@' + item.author : '') + (ak ? ' (author/' + ak + (item.author_kind_source === 'inferred' ? ', inferred' : '') + ')' : '') + (item.tier ? ' · ' + item.tier : ''));
+ if (item.author || ak) lines.push('Author: ' + (item.author ? '@' + item.author : '') + (ak ? ' (' + (akPlain[ak] || ak) + (item.author_kind_source === 'inferred' ? ', inferred' : '') + ')' : '') + (item.tier ? ' · ' + item.tier : ''));
if (item.origin) lines.push('Origin: origin/' + item.origin);
if (item.kind === 'issue' && Array.isArray(item.linked_prs) && item.linked_prs.length) lines.push('Covering PR: ' + item.linked_prs.map(lp => Number(lp.number) || 0).sort((x, y) => x - y).map(n => '#' + n).join(', '));
else if (item.kind === 'issue' && item.linked_pr) lines.push('Covering PR: #' + item.linked_pr);
@@ -438,7 +441,8 @@
if (mods.indexOf('hold') >= 0 && typeof stageTrackerHoldPill === 'function' && stageTrackerHoldPill(item)) lines.push(stageTrackerHoldPill(item));
if (sinceMs) lines.push('Since ' + agentNowClockTime(sinceMs, nowMs) + ' · ' + agentNowAgo(nowMs - sinceMs));
if (trail) lines.push('Trail: ' + trail);
- return lines.filter(Boolean).join('\n');
+ // Say it once: a line the caption already said is not repeated (hivecommons/hive#15394).
+ return lines.filter((l, i) => l && lines.indexOf(l) === i).join('\n');
}
// The sentinel chip: drawn in the chip area (beside needs rebase /
diff --git a/src/pkg/dashboard/static/index.html b/src/pkg/dashboard/static/index.html
index 9037adea45..71c6219b02 100644
--- a/src/pkg/dashboard/static/index.html
+++ b/src/pkg/dashboard/static/index.html
@@ -1832,7 +1832,7 @@
.ham-decision-q { font-weight: var(--fw-semibold); color: var(--text); }
.ham-decision-blocker { font-size: var(--fs-xs); color: var(--text-muted); }
.ham-capability-gap { color: var(--amber); }
- .ham-decision-meta, .ham-decision-stage { font-size: var(--fs-xs); color: var(--text-faint); }
+ .ham-decision-meta { font-size: var(--fs-xs); color: var(--text-faint); }
.ham-decision-acts { display: flex; flex-wrap: wrap; gap: var(--sp-2); margin: var(--sp-3) 0 var(--sp-2); }
.ham-decision-act { padding: var(--sp-1) var(--sp-3); border: var(--line-width) solid var(--line-subtle); border-radius: var(--r-pill); background: transparent; color: var(--text); font: inherit; font-size: var(--fs-xs); cursor: pointer; white-space: nowrap; }
.ham-decision-act:hover, .ham-decision-act:focus-visible { background: var(--panel-strong); outline: none; border-color: var(--line-strong); }
@@ -1840,9 +1840,12 @@
.ham-decision-act.ham-menu-danger { color: var(--red); }
.ham-decision-act[aria-disabled="true"] { color: var(--text-faint); border-style: dashed; cursor: default; opacity: 0.6; }
.ham-decision-act[aria-disabled="true"]:hover { background: transparent; border-color: var(--line-subtle); }
- .ham-decision-consequences { margin: 0 0 var(--sp-1); padding-left: var(--sp-4); font-size: var(--fs-xs); color: var(--text-muted); }
- .ham-decision-consequences li { margin: 0; overflow-wrap: anywhere; }
- .ham-decision-consequences b { font-weight: var(--fw-semibold); color: var(--text); }
+ .ham-decision-act.ham-decision-more { color: var(--text-muted); }
+ /* The technical background folds behind one collapsed Details. */
+ .ham-decision-details { margin: var(--sp-2) 0 0; font-size: var(--fs-xs); color: var(--text-muted); }
+ .ham-decision-details > summary { cursor: pointer; color: var(--text-faint); }
+ .ham-decision-details > summary:focus-visible { outline: var(--line-width) solid var(--accent); outline-offset: var(--sp-1); border-radius: var(--r-sm); }
+ .ham-decision-details[open] > summary { color: var(--text-muted); }
.ham-selbar { display: flex; flex-wrap: wrap; align-items: center; gap: var(--sp-2); margin: 0 0 var(--sp-2); padding: var(--sp-2) var(--sp-3); border: var(--line-width) solid color-mix(in srgb, var(--accent) 45%, var(--line-subtle)); border-radius: var(--r-sm); background: color-mix(in srgb, var(--accent) 8%, var(--panel)); font-size: var(--fs-xs); }
.ham-selbar[hidden] { display: none; }
.ham-selbar .ham-sel-count { font-weight: var(--fw-semibold); color: var(--text); margin-right: var(--sp-2); }
@@ -15479,7 +15482,8 @@
${esc(ref)}${item.title ? ' · ' + esc(item.title) : ''}
-
${esc(d.question || '')}
+
${esc(question)}
${typeof stageTrackerPresenceTip === 'function' && stageTrackerPresenceTip(item, nowMs) ? `
${stageTrackerPresenceDotHtml(item, nowMs)}${esc(stageTrackerPresenceTip(item, nowMs))}
` : ''}
- ${d.blocker ? `
${esc(d.blocker)}
` : ''}
- ${buttons ? `
${buttons}
` : ''}
- ${consequences ? `
` : ''}
+ ${lead || more ? `
${lead}${more}
` : ''}
${esc(meta)}
- ${tip ? `
${esc(tip)}
` : ''}
+ ${fold}
`;
}
// Run a popover action down the row context menu's path.
@@ -18574,7 +18604,7 @@