14c19ea538
* feat(github): plumb CI popover fields + branch protection cache
Adds RequiredReviews/UnresolvedReviewThreads/ChecksTotal/ChecksPassing
to TaskPR + PRStatus. Extends the GraphQL PR query with reviewThreads
to populate UnresolvedReviewThreads on every poll. New branch_protection.go
holds an in-memory TTL cache + BranchProtectionFetcher interface;
PATClient/GHClient implement REST/CLI lookups so SyncTaskPR can resolve
required_approving_review_count for the PR's base branch. SyncTaskPR
preserves existing counts when a lightweight (GraphQL) sync returns 0
so the popover doesn't flap during the polling cycle.
* feat(github): mock controller hooks for CI popover e2e
Extends associateTaskPR to accept review/check counts, required_reviews,
and unresolved_review_threads, and switches to ReplaceTaskPR so re-POSTing
the same task drives the popover live-refresh path. Adds POST /pr-feedback
to seed PRFeedback (checks/reviews/comments) keyed by a deterministic
synthetic head_sha, and PUT /auth-health to flip the mock client's
authenticated flag for the "Reconnect GitHub" branch. Mock client gains
ReplaceCheckRuns/ReplaceReviews/ReplaceComments helpers and an
authenticated field that defaults to true.
* feat(web): CI hover popover on PR top-bar button
Hovering the PR top-bar button now reveals a popover with
Passed/In-Progress/Failed counts, a workflow-rollup list under the
non-empty buckets (with "open on GitHub" + "+ ctx" affordances on
failed rows), a review-state row ("Approved 1 / 2 required"), and
unresolved-comments count. Click on the button keeps the existing
"open PR detail panel" behavior so shipped tests stay green.
PRFeedback is lazy-fetched on hover-open via a new SWR-style hook
backed by a 20-entry LRU cache slice; the popover refetches whenever
the underlying TaskPR's updated_at changes (the WS handler already
applies poll deltas). Bucket logic + workflow grouping live in a
small util with vitest coverage. The aggregate-popover variant for
multi-PR tasks ships but the multi-PR trigger preserves its existing
DropdownMenu so per-row click → addPRPanel still works.
* test(e2e): pr-topbar-popover scenarios A–F covering CI popover
11 specs covering: count rows + zero-bucket hiding, workflow rollup
with (N/M passed) badge under Failed, review row + unresolved comments,
hover open + leave close, failed-row open/+ctx affordances, header
external link, "No checks have started" empty state, "Reconnect GitHub"
auth-lost branch, and live count updates on a re-associate.
Adds api-client helpers (mockGitHubSeedPRFeedback, mockGitHubSetAuthHealth,
extended mockGitHubAssociateTaskPR) and SessionPage popover accessors.
* fix(github): address bot review comments on CI popover
- branch_protection.go: evict stale entries on read so the cache map
cannot grow unbounded over a long-running deployment; rewrite the
comment to drop the inaccurate singleflight claim (no dedup logic
exists, concurrent misses race harmlessly to set()).
- gh_client.go: replace fragile strings.Contains "HTTP 404" with an
isNotFoundErr helper that tolerates the formats current and future
gh CLI versions use ("HTTP 404", "404 Not Found", "status: 404").
- graphql.go: extend reviewThreads with totalCount and attribute the
un-fetched tail to the unresolved bucket so PRs with >100 threads
don't silently undercount in the popover.
- pr-ci-popover.tsx: drop the dead "icon" initializer in PRReviewRow
(every branch overwrites it). Memoize useAddCheckToContext so
PRWorkflowRow's reference equality stays stable across renders.
- pr-topbar-button.tsx: collapse the duplicate JSDoc on
usePopoverInteractions.
* fix(github): address remaining bot review comments + tests
Real correctness fixes:
- Replace the "0/0 means counts omitted" heuristic with an explicit
PRStatus.ChecksPopulated flag so the rich REST sync can clear stale
totals when checks are removed from a PR upstream.
- Refresh tp.BaseBranch from status.PR on each SyncTaskPR so a
retargeted PR's branch-protection lookup keys off the new branch.
Persist base_branch in UpdateTaskPR.
- Cache 403 from /branches/.../protection (token lacks Administration:
Read scope) the same way as 404 — otherwise every poller tick burns
rate-limit quota retrying. Both PATClient and GHClient.
- usePRCIPopover: refetch on every popover-open transition (not just
on updated_at change), via a wasEnabledRef gate. Restores the
intended SWR semantics that the lastSyncedRef-only guard suppressed.
- groupChecksByWorkflow: prefer the URL of a job matching the group's
bucket so clicking a "failed" workflow row navigates to a failing
job, not an earlier passing one.
Tests:
- branch_protection_test.go: cache hit/miss/TTL/eviction, error
not cached, no-rule cached, client-without-fetcher path.
- pat_client_test.go: TestPATClient_FetchBranchProtection table-test
for 200/200-with-null/404/403/500.
- service_test.go: ChecksPopulated preserve-on-zero, accept real
zero, base-branch retarget, change-publish for the new fields.
* refactor(github): trim associateTaskPR + drop unreachable PRAggregatePopover
- mock_controller.go: extract associateTaskPRRequest struct,
buildTaskPRFromRequest, and ensureMockPRForRequest helpers so the
handler is back under the 80-line Go limit.
- pr-ci-popover.tsx: remove unreachable PRAggregatePopover export.
Multi-PR tasks currently use the existing DropdownMenu trigger
(no hover popover), so the aggregate component was dead code.
* fix(github): drop unused anchorRef + tests for is{NotFound,Forbidden}Err
- pr-topbar-button.tsx: anchorRef was leftover from the dropped
click-to-pin onInteractOutside guard. Removed.
- gh_client_test.go: tests for the new isNotFoundErr / isForbiddenErr
helpers covering each accepted format and a few non-matches so a
future gh CLI wording change is caught.
* fix(github): UnresolvedReviewThreadsPopulated guard + drop unreachable nil checks
- service.go: mirror the ChecksPopulated/preserve dance for
UnresolvedReviewThreads. The REST single-PR poller (getPRStatus)
doesn't fetch review threads, so without this guard every REST
sync would clobber the GraphQL-populated value to 0 and emit a
spurious github.task_pr.updated event. The GraphQL path
(convertBatchedPRResult) sets the new flag.
- branch_protection.go: drop unreachable s == nil / fetcher == nil
checks. fetchRequiredReviews is only invoked from SyncTaskPR on a
service constructed via NewService, which always initialises the
cache. After a successful type assertion, the interface value
cannot be nil; the !ok branch already covers nil-interface inputs.
- service_test.go: new TestSyncTaskPR_UnresolvedThreads_PreservesOnLightweightSync
covers the regression. Existing NewFieldsPublishEvent threads-change
case updated to set UnresolvedReviewThreadsPopulated.
* refactor(web): drop CI popover progress bar — last-updated is enough
The animated progress bar was visual noise; the "updated Ns ago"
timestamp tells the user the same thing without the indicator. Footer
also hides entirely until the first fetch lands so an empty popover
doesn't show a useless "" line.
* fix(web): background-sync PRFeedback so popover is fresh on first hover
The on-hover SWR fetch was the only refresh path, so opening the popover
showed the previously-cached value while a new fetch raced behind it —
visibly stale until the refetch landed. The button icon, by contrast,
updates the moment a github.task_pr.updated WS push lands.
Add a usePRFeedbackBackgroundSync hook mounted at the PRTopbarButton
that subscribes to the same pr.updated_at change signal and refetches
PRFeedback into the cache in the background. The popover hook still
fires an on-open refetch as a safety net for the very first hover
(before any sync). No extra polling — fetches are gated on real
TaskPR changes, matching the icon's cadence.
* feat(web): CI status chip in chat status bar + tweak elapsed label
- New <PRStatusChip> renders a compact colored circle in the chat
status bar (left of the TodoIndicator, just above the input). Hover
opens the same PRCIPopover anchored to the chip's top edge so the
card expands upward — matching the user's "open bottom-up" ask. The
chip mounts the background-sync hook so the popover is fresh on
first hover even when the top-bar PR button isn't visible.
- elapsedLabel: "just now" → "updated just now" so the footer reads
the same regardless of how recently the cache was refreshed.
* fix(web): chip color was missing — use static class map for Tailwind JIT
\`getPRStatusColor().replace("text-", "bg-")\` produced class strings at
runtime, which Tailwind's content scanner doesn't pick up — the chip
rendered with no background. Replace with a static lookup so each
literal `bg-*` class appears in the source and gets compiled into the
bundle.
* fix(web): chip uses currentColor SVG so the dot actually renders
The previous bg-* approach relied on Tailwind compiling the literal
class strings. Even with a static map some palette entries (notably
bg-muted-foreground) didn't surface as a usable utility, so the chip
remained transparent. Apply getPRStatusColor's text-* class to the
button wrapper and fill an SVG circle with currentColor — the text-*
utilities are already compiled (PRTaskIcon uses them) so the dot
is guaranteed to render in the right color.
* fix(web): redesign PR status chip — clipboard icon + status glyph
- Move chip to right of TodoIndicator (was left).
- Render as "[clipboard icon] [status glyph]" instead of a bare circle:
passed → green CircleCheck, failed → red CircleX, in_progress →
yellow Loader2 (spinning), merged/neutral → muted dot. Status icons
reuse already-compiled text-* utilities so colors render reliably.
* fix(github): ReviewCount = approved-reviewer count + ReviewCountsPopulated guard
Two bugs feeding the popover's "Approved (0)" misreport:
- Semantic: REST path set ReviewCount to len(reviews), which double-counts
authors who left multiple reviews and includes COMMENTED rows. Replace
with countApprovedReviewers — distinct authors whose latest review
state is APPROVED. GraphQL converter gets the parallel
countApprovedReviewerNodes helper and also populates PendingReviewCount
from ReviewRequests.TotalCount (was unset, so the chip's "(K requested)"
suffix was always missing).
- Clobber: GraphQL polls used to write ReviewCount/PendingReviewCount=0
on every cycle because the converter never set them. Add
ReviewCountsPopulated to PRStatus and gate SyncTaskPR's writes on it
the same way ChecksPopulated already does, so a partial sync path
preserves the persisted values instead of resetting them to zero.
* fix(web): popover nitpicks (icon, review row, indent, badge)
- Chip icon: ClipboardCheck → ListCheck.
- PRReviewRow always renders (drop the early-return). Fresh PRs with
no approvals + no protection rule now show "Awaiting review" instead
of vanishing.
- Indent workflow rows under the In Progress / Failed group headers
(pl-5) so the hierarchy reads more clearly.
- In-progress workflow badge: "0/1 ran" → "1 running". The old phrasing
hid whether the job had even started.
* feat(web): stacked pass-rate progress bar in CI popover
Mirrors TodoIndicator's progress bar at the top of the CI section, but
split into three coloured segments:
green (passed) | yellow (in_progress) | red (failed)
sized proportionally to each bucket's count. The label reads
"Pass rate · K/N (P%)" so the user gets the same at-a-glance summary
TODOs shows. Skipped/cancelled-but-not-failed jobs aren't counted —
the bar always reflects the actionable picture.
* fix(web): right-align review counts + drop chip hover bg
- Move approval/required counts to the right edge of the review row
("Approved" on the left, "1 / 2" on the right), mirroring the
bucket-row layout. The "(K requested)" suffix becomes a "· K requested"
trailing fragment on the right side.
- PRStatusChip: drop hover:bg-accent/50 so the trigger doesn't grow a
background plate when the popover is open.
* fix(web): switch CI chip icon to IconChecklist
* fix(github): clear bot review-comment backlog
Real correctness fixes:
- pr-status-chip: pending checks / pending review now beat
checks_state === "success" in chipStatus precedence — a PR with
CI green but reviewers outstanding is no longer rendered as
"passed".
- branch_protection: drop the unreachable Reset() method.
- pr-topbar-button: stop double-mounting usePRFeedbackBackgroundSync;
the chip already covers it.
- use-pr-ci-popover: dedupe key combines prFeedbackKey + updated_at
so switching tasks with same-timestamp PRs still refetches.
- use-pr-ci-popover: drop stale comment about the removed progress bar.
Refactor:
- client_helpers + graphql: extract reviewSample +
latestReviewStateByAuthor helper so the three near-identical
per-reviewer dedup loops share one implementation.
Tests:
- countApprovedReviewers + reduceReviewSummary unit tests.
- TestSyncTaskPR_ReviewCounts_PreservesOnLightweightSync +
AcceptsRealZero mirror the existing ChecksPopulated guards.
- groupChecksByWorkflow distinct-URL test verifies the failed-job
URL-selection fix.
- branch_protection TTL tests now use testing/synctest — instant
virtual time, no real-sleep flake on CI.
* fix(web): clicking the CI chip no longer closes the popover
HoverCard treats the trigger button as outside the content's bounding
box, so a click on the chip fired Radix's onPointerDownOutside and
auto-closed the popover. Add a triggerRef + onPointerDownOutside guard
on HoverCardContent that filters out clicks landing on the trigger —
clicking the chip is now a no-op while the popover stays open via hover.
148 lines
5.8 KiB
TypeScript
148 lines
5.8 KiB
TypeScript
import { describe, it, expect } from "vitest";
|
|
import { bucketCheck, bucketCheckCounts, groupChecksByWorkflow } from "./check-buckets";
|
|
import type { CheckRun } from "@/lib/types/github";
|
|
|
|
function makeCheck(overrides: Partial<CheckRun> = {}): CheckRun {
|
|
return {
|
|
name: "Test / unit",
|
|
source: "check_run",
|
|
status: "completed",
|
|
conclusion: "success",
|
|
html_url: "https://example.com/checks/1",
|
|
output: "",
|
|
started_at: null,
|
|
completed_at: null,
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
describe("bucketCheck", () => {
|
|
it("buckets success and neutral as Passed", () => {
|
|
expect(bucketCheck(makeCheck({ conclusion: "success" }))).toBe("passed");
|
|
expect(bucketCheck(makeCheck({ conclusion: "neutral" }))).toBe("passed");
|
|
});
|
|
|
|
it("buckets failure / cancelled / timed_out / action_required as Failed", () => {
|
|
expect(bucketCheck(makeCheck({ conclusion: "failure" }))).toBe("failed");
|
|
expect(bucketCheck(makeCheck({ conclusion: "cancelled" }))).toBe("failed");
|
|
expect(bucketCheck(makeCheck({ conclusion: "timed_out" }))).toBe("failed");
|
|
expect(bucketCheck(makeCheck({ conclusion: "action_required" }))).toBe("failed");
|
|
});
|
|
|
|
it("buckets queued / in_progress as In Progress (status takes priority)", () => {
|
|
expect(bucketCheck(makeCheck({ status: "queued", conclusion: "" }))).toBe("in_progress");
|
|
expect(bucketCheck(makeCheck({ status: "in_progress", conclusion: "" }))).toBe("in_progress");
|
|
// Even if a stale conclusion is present, status overrides:
|
|
expect(bucketCheck(makeCheck({ status: "in_progress", conclusion: "failure" }))).toBe(
|
|
"in_progress",
|
|
);
|
|
});
|
|
|
|
it("ignores skipped and stale", () => {
|
|
expect(bucketCheck(makeCheck({ conclusion: "skipped" }))).toBeNull();
|
|
expect(bucketCheck(makeCheck({ conclusion: "stale" }))).toBeNull();
|
|
});
|
|
});
|
|
|
|
describe("bucketCheckCounts", () => {
|
|
it("counts each bucket independently and ignores skipped/stale", () => {
|
|
const checks = [
|
|
makeCheck({ conclusion: "success" }),
|
|
makeCheck({ conclusion: "neutral" }),
|
|
makeCheck({ conclusion: "cancelled" }),
|
|
makeCheck({ conclusion: "timed_out" }),
|
|
makeCheck({ conclusion: "action_required" }),
|
|
makeCheck({ status: "in_progress", conclusion: "" }),
|
|
makeCheck({ conclusion: "skipped" }),
|
|
makeCheck({ conclusion: "stale" }),
|
|
];
|
|
expect(bucketCheckCounts(checks)).toEqual({ passed: 2, inProgress: 1, failed: 3 });
|
|
});
|
|
});
|
|
|
|
describe("groupChecksByWorkflow", () => {
|
|
it("groups by the part before ' / '", () => {
|
|
const checks = [
|
|
makeCheck({ name: "Test / unit", conclusion: "success" }),
|
|
makeCheck({ name: "Test / e2e", conclusion: "failure" }),
|
|
makeCheck({ name: "Lint / check", conclusion: "failure" }),
|
|
];
|
|
const groups = groupChecksByWorkflow(checks);
|
|
expect(groups.map((g) => g.workflow)).toEqual(["Test", "Lint"]);
|
|
const test = groups.find((g) => g.workflow === "Test")!;
|
|
expect(test.passed).toBe(1);
|
|
expect(test.failed).toBe(1);
|
|
expect(test.bucket).toBe("failed");
|
|
});
|
|
|
|
it("treats a name without ' / ' as a single-row workflow", () => {
|
|
const checks = [makeCheck({ name: "vercel", source: "status_context", conclusion: "success" })];
|
|
const groups = groupChecksByWorkflow(checks);
|
|
expect(groups).toHaveLength(1);
|
|
expect(groups[0].workflow).toBe("vercel");
|
|
expect(groups[0].bucket).toBe("passed");
|
|
});
|
|
|
|
it("group bucket prioritizes failed > in_progress > passed", () => {
|
|
const checks = [
|
|
makeCheck({ name: "Test / a", conclusion: "success" }),
|
|
makeCheck({ name: "Test / b", status: "in_progress", conclusion: "" }),
|
|
makeCheck({ name: "Test / c", conclusion: "failure" }),
|
|
];
|
|
const [group] = groupChecksByWorkflow(checks);
|
|
expect(group.bucket).toBe("failed");
|
|
expect(group.passed).toBe(1);
|
|
expect(group.inProgress).toBe(1);
|
|
expect(group.failed).toBe(1);
|
|
expect(group.total).toBe(3);
|
|
});
|
|
|
|
it("computes (N/M passed) badge components correctly when no failures", () => {
|
|
const checks = [
|
|
makeCheck({ name: "Build / linux", status: "in_progress", conclusion: "" }),
|
|
makeCheck({ name: "Build / mac", conclusion: "success" }),
|
|
];
|
|
const [group] = groupChecksByWorkflow(checks);
|
|
expect(group.bucket).toBe("in_progress");
|
|
expect(group.passed).toBe(1);
|
|
expect(group.inProgress).toBe(1);
|
|
expect(group.total).toBe(2);
|
|
});
|
|
|
|
it("htmlUrl points to first job matching the group's bucket", () => {
|
|
// Regression for the URL-selection fix in check-buckets.ts: a failed
|
|
// workflow row should link to a failing job's log, not the first
|
|
// (potentially passing) job's URL.
|
|
const checks = [
|
|
makeCheck({ name: "Build / a", conclusion: "success", html_url: "https://ok" }),
|
|
makeCheck({ name: "Build / b", conclusion: "failure", html_url: "https://bad" }),
|
|
makeCheck({ name: "Build / c", conclusion: "failure", html_url: "https://bad-2" }),
|
|
];
|
|
const [group] = groupChecksByWorkflow(checks);
|
|
expect(group.bucket).toBe("failed");
|
|
// Picks the first failing job's URL.
|
|
expect(group.htmlUrl).toBe("https://bad");
|
|
});
|
|
|
|
it("htmlUrl falls back to first job's URL when no bucket-match has html_url", () => {
|
|
const checks = [
|
|
makeCheck({ name: "Build / a", conclusion: "success", html_url: "https://ok-1" }),
|
|
makeCheck({ name: "Build / b", conclusion: "success", html_url: "https://ok-2" }),
|
|
];
|
|
const [group] = groupChecksByWorkflow(checks);
|
|
expect(group.bucket).toBe("passed");
|
|
expect(group.htmlUrl).toBe("https://ok-1");
|
|
});
|
|
|
|
it("ignores skipped jobs in totals", () => {
|
|
const checks = [
|
|
makeCheck({ name: "Test / a", conclusion: "success" }),
|
|
makeCheck({ name: "Test / b", conclusion: "skipped" }),
|
|
];
|
|
const [group] = groupChecksByWorkflow(checks);
|
|
expect(group.total).toBe(1);
|
|
expect(group.passed).toBe(1);
|
|
expect(group.bucket).toBe("passed");
|
|
});
|
|
});
|