Skip to content

🐛 fix: show verified external merges at the terminal tracker step - #16036

Merged
clubanderson merged 3 commits into
v5from
fix/tracker-external-terminal
Oct 31, 2026
Merged

clubanderson merged 3 commits into
v5from
fix/tracker-external-terminal

Conversation

@clubanderson

Copy link
Copy Markdown
Member

What changes

Verified canonical merge facts now project root, inline and nested PRs directly to the existing terminal110 step, even when the browser never observed queue admission. Retained models survive bounded ledger lag; actual merger identity is preserved and unknown remains unknown. Related issues are not implicitly closed. No synthetic100, native queue membership, or Hive/manual-click provenance.

Correctness

Per-PR immutable observation/windows prevent one merged sibling renewing another. Existing release timers rearm for already-rendered hosts. Closed terminal PRs retain navigation but stale captured write actions are rejected at the final request seam. History-only unresolved siblings never reappear as visible work.

Review and validation

Independent code review found stale actions, sibling windows, release scheduling, duplicate fixture constant and unresolved-history resurrection; all were fixed with focused regression cases. Only changed-file gofmt and required dashboard generation ran locally, per AGENTS. CI is the sole verdict; exact-head terminal result will be recorded here. No deployment, live policy/config changes or manual merge requested.

Signed-off-by: Andy Anderson <andy@clubanderson.com>
…rminal

Signed-off-by: Andy Anderson <andy@clubanderson.com>
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Oct 31, 2026
@kubestellar-prow

Copy link
Copy Markdown
Contributor

[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 danathar 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:

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

@kubestellar-prow kubestellar-prow Bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Oct 31, 2026
@github-actions

github-actions Bot commented Oct 31, 2026 •

Copy link
Copy Markdown
Contributor

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
#16027 🐛 fix: keep the preparation train connector continuous between adjacent members same files src/docs/dashboard-sections/activity-monitor.md
src/pkg/dashboard/static-src/js/tracker-filter-render.js
src/pkg/dashboard/static-src/js/tracker-row-layout.js
src/pkg/dashboard/static/index.html
#16032 🐛 Keep informational security notices separate from real human decision gates CONFLICT src/pkg/dashboard/static-src/js/tracker-row-layout.js
src/pkg/dashboard/static/index.html
#16037 🐛 fix: stop inferring idle external PR owners from missing Hive actors CONFLICT src/docs/dashboard-sections/activity-monitor.md
#15890 🐛 dashboard: point operator-reference help marks at the section sub-pages same files src/pkg/dashboard/static/index.html

@github-actions github-actions Bot added the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 31, 2026
Signed-off-by: Andy Anderson <andy@clubanderson.com>
@clubanderson

Copy link
Copy Markdown
Member Author

Source completeness follow-up f784e41: when raw nested_under points to an issue outside the current payload and no DOM host exists, terminal observation now falls back to the actual retained root PR row instead of losing the model. Added a focused no-host/no-DOM regression. Prior43d checks had no substantive failures, but they are not validation of f784; full CI is being observed again on the current exact head. No manual merge/deployment.

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correctness review (read at head f784e41, the current head; the dispatch cited 43d6b1f).

Pinned terminal rows bypass the active filter and page — tracker-merged.js:1040-1045, tracker-filter-render.js:174

Before this PR a pinned row could only be a node already on the board (stageTrackerPinnedRows fell back to el.querySelector([data-ham-key]) and dropped the pin when nothing was drawn), so it had necessarily passed stageTrackerVisible and pagination. Now stageTrackerTerminalObserve (tracker-merged.js:795-806) creates a pin for every fresh key whose row exists in _stageTrackerTerminalRows — i.e. any item in the last payload, filtered or not — and stageTrackerPinnedRows renders it from the model via renderItem with no filter check. renderStageTracker computes visible = stageTrackerVisible(d.items, f, ctx) (tracker-filter-render.js:92) but passes it => stageTrackerRowHtml(it, stages, ctx) unconditionally (:174), so with f.repo = hivecommons/console a hivecommons/hive merge appends a hive row to the bottom of the console-filtered list for STAGE_TRACKER_CELEBRATE_PIN_MS; same for the kind tab (a PR row under "issues"), search, labels, and rows from other pages. This contradicts the existing contract in stageTrackerCelebrateMerges ("filtered out, other page … its row is celebrated before removal only when it is drawn", tracker-merged.js:981-984) and stage_tracker_external_terminal_test.go has no filter case.

Suggested fix — gate the model render on the filter, keeping the pin (so stageTrackerTerminalEvents and the release still run) but not drawing it:

--- a/src/pkg/dashboard/static-src/js/tracker-filter-render.js
+++ b/src/pkg/dashboard/static-src/js/tracker-filter-render.js
@@
-      const rows = stageTrackerPinnedRows(el, [{ key: STAGE_TRACKER_HEADER_KEY, html: stageTrackerHeaderHtml(stages) }].concat(inlineRows), nowMs, it => stageTrackerRowHtml(it, stages, ctx));
+      // A pinned terminal model is drawn only where its live row would have been: same filter, never another page's row.
+      const rows = stageTrackerPinnedRows(el, [{ key: STAGE_TRACKER_HEADER_KEY, html: stageTrackerHeaderHtml(stages) }].concat(inlineRows), nowMs,
+        it => stageTrackerMatches(it, f, ctx) ? stageTrackerRowHtml(it, stages, ctx) : '');
--- a/src/pkg/dashboard/static-src/js/tracker-merged.js
+++ b/src/pkg/dashboard/static-src/js/tracker-merged.js
@@ function stageTrackerPinnedRows(el, rows, nowMs, renderItem) {
         const item = c.kind === 'merged' && typeof renderItem === 'function' && typeof stageTrackerTerminalPinnedItem === 'function' ? stageTrackerTerminalPinnedItem(k, nowMs) : null;
         if (item) {
-          out.push({ key: k, html: renderItem(item), pinned: true });
+          const html = renderItem(item);
+          if (html) out.push({ key: k, html, pinned: true });
           stageTrackerScheduleRelease(c.until - nowMs);
           continue;
         }

plus a regression case in stage_tracker_external_terminal_test.go where renderItem returns '' and asserts stageTrackerPinnedRows(...).length === 0 while _stageTrackerCelebrating[key] survives.

Advisory (not blocking): stageTrackerCarryOpen now keeps every true key for the life of the tab and in sessionStorage (tracker-merged.js:53-58, :94); growth is bounded by merges seen per session so it is fine in practice, but worth a comment since the prior comment promised "a few keys".

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

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Hive status — updated in place; edits do not notify. Full history is in the Activity Monitor.

Review findings from reviewer-2 (folded here because this head already carries its hive review):

Read at f784e41 against v5 — the observe / view / carry paths and their callers. No defect I can point at; this looks correct to me.

What I verified:

  • stageTrackerActionRequest (tracker-actions.js:1188-1191) now returns null for a known-merged PR. All four callers already handle null (tracker-actions.js:1351 → 'not applicable', :1692 → continue, :1702 → 'no route', :2359 guard), so stale captured write actions are rejected at the request seam as the body says.
  • merged_by attribution in stageTrackerTerminalObserve (tracker-merged.js:852-862) is per-PR: stageTrackerMergeState({items: teaching, recently_merged: [m]}, prev) uses prev only to teach short-repo aliases and emits exactly the one key for m (tracker-merged.js:7-20, 36-44), so the "every wanted key inherits the last entry's merger" failure I went looking for does not occur.
  • stageTrackerCarryOpen keeping true keys cannot re-fire a celebration: stageTrackerNewlyMerged requires prev[k] === false (tracker-merged.js:65-67), which a carried true never satisfies. The merge_sound_test expectation change matches that.
  • stageTrackerLinkedSupersededGone short-circuit (tracker-words-gate.js:80) is what lets the synthesized state:'closed', terminal_merge:true linked item through stageTrackerLinkedSorted; without it the terminal inline row would be filtered as a gone superseded PR.
  • The two rewritten cues_test assertions drop · by hive for an unknown merger rather than asserting a new attribution — consistent with "unknown remains unknown".

One open question, not a finding: once a PR's until window lapses, stageTrackerTerminalView (tracker-merged.js:889-892) returns null for a payload PR item the client has recorded as merged but the server still lists below the terminal stage, so the row disappears from the board entirely rather than rendering at the server's stage. The docs line ("a stale open refresh cannot undo a verified merge") says that is intended; flagging only so a maintainer confirms hiding — rather than drawing Merged — is the wanted behaviour for a long ledger/snapshot disagreement.

Note: this and #16037 both regenerate static/index.html and edit tracker-row*.js; whichever lands second needs a regen.

@clubanderson

Copy link
Copy Markdown
Member Author

FINAL immutable exact-head CI receipt: f784e41 has all17 applicable workflow runs terminal SUCCESS/SKIPPED, all79 CheckRun contexts success/skipped, DCO success. v2 Tests41202574593, v2 CI41202574552 (includes Node), security41202574466, image41202574666 including ARM freshness, dashboard lint41202574527 all SUCCESS. Current-head Hive reviewer-2 independently reports no concrete defect and verifies the action seam, per-PR actor identity, irreversible carry and closed-linked terminal exception. PR remains OPEN under Hive-managed review/preparation; no manual merge or deployment by me. Existing short pin expiry intentionally removes stale-open representations rather than regressing a verified merged PR.

@clubanderson
clubanderson merged commit cf008a5 into v5 Oct 31, 2026
80 of 81 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the fix/tracker-external-terminal branch October 31, 2026 13:14
@github-actions

Copy link
Copy Markdown
Contributor

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

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

@clubanderson

Copy link
Copy Markdown
Member Author

MERGE RECEIPT: explicitly authorized guarded admin squash matched the tested f784e41 and merged source cf008a5 by clubanderson at2026-10-31T13:14:26Z. Full17 workflows/all79 checks terminal pass/skip before merge; no actual human hold, no gate weakening. DCO trailer present in squash. No deployment/runtime activation by me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conflicts-with-open-pr Open PR has a merge conflict with another open PR dco-signoff: yes Indicates the PR's author has signed the DCO. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant