fix(github): harden terminal PR revalidation after critical review
Recompute focus/visibility staleness at event time, retry closed/merged sidebar associations on the no-PR cadence, and assert refresh failures preserve prior PR status. Co-authored-by: Serhii Dziupin <makeittech@users.noreply.github.com>
This commit is contained in:
committed by
Cursor Agent
co-authored by
Serhii Dziupin
parent
962b016cbd
commit
5e9e35897f
@@ -1471,12 +1471,16 @@ const SessionSidebarComponent: React.FC<SessionSidebarProps> = ({
|
||||
}
|
||||
const key = getGitHubPrStatusKey(directory, branch);
|
||||
const entry = useGitHubPrStatusStore.getState().entries[key];
|
||||
const hasPr = Boolean(entry?.status?.pr);
|
||||
const prState = entry?.status?.pr?.state;
|
||||
const isTerminalPr = prState === 'closed' || prState === 'merged';
|
||||
// Closed/merged associations are not live branch status — retry them on
|
||||
// the same cadence as missing PRs so a newer open PR can appear.
|
||||
const hasLivePr = Boolean(entry?.status?.pr) && !isTerminalPr;
|
||||
const retryKey = `${directory}::${branch}`;
|
||||
const noPrLastCheckedAt = Math.max(entry?.lastRefreshAt ?? 0, entry?.lastDiscoveryPollAt ?? 0);
|
||||
const shouldRetryNoPr = Boolean(
|
||||
entry?.isInitialStatusResolved
|
||||
&& !hasPr
|
||||
&& !hasLivePr
|
||||
&& (
|
||||
!retriedNoPrStatusKeysRef.current.has(retryKey)
|
||||
|| now - noPrLastCheckedAt >= SIDEBAR_PR_NO_PR_RETRY_MS
|
||||
|
||||
@@ -1169,16 +1169,20 @@ export const PullRequestSection: React.FC<{
|
||||
React.useEffect(() => {
|
||||
// Terminal (closed/merged) status must still revalidate on focus/visibility:
|
||||
// the branch may now have a newer open PR, or the association may clear.
|
||||
const lastRefreshAt = statusEntry?.lastRefreshAt ?? 0;
|
||||
const isStale = Date.now() - lastRefreshAt > 60_000;
|
||||
|
||||
// Recompute staleness inside the handlers — a captured boolean freezes after
|
||||
// the first fresh refresh until lastRefreshAt changes again.
|
||||
const onFocus = () => {
|
||||
if (isStale) {
|
||||
const lastRefreshAt = statusEntry?.lastRefreshAt ?? 0;
|
||||
if (Date.now() - lastRefreshAt > 60_000) {
|
||||
void refresh({ force: true, silent: true });
|
||||
}
|
||||
};
|
||||
const onVisibility = () => {
|
||||
if (document.visibilityState === 'visible' && isStale) {
|
||||
if (document.visibilityState !== 'visible') {
|
||||
return;
|
||||
}
|
||||
const lastRefreshAt = statusEntry?.lastRefreshAt ?? 0;
|
||||
if (Date.now() - lastRefreshAt > 60_000) {
|
||||
void refresh({ force: true, silent: true });
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user