Skip to content

fix: refresh PR state when branches gain a PR number #573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matt2e merged 5 commits into from
Apr 2, 2026
Merged

fix: refresh PR state when branches gain a PR number #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d13fd5
chore: add PR polling diagnostics
matt2e Apr 2, 2026
841863f
fix: refresh PR status after PR creation completes
matt2e Apr 2, 2026
e652e95
fix: start PR polling for PR-backed branch creation
matt2e Apr 2, 2026
e801a3b
chore: remove PR polling diagnostics
matt2e Apr 2, 2026
48ad63d
fix: separate PR persistence and refresh failures
matt2e Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions apps/staged/src/lib/features/branches/BranchCardPrButton.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
// PR status polling state
let prStatusPollTimer: ReturnType<typeof setInterval> | null = null;
let prStatusRefreshing = $state(false);
let lastImmediateRefreshPrNumber = $state<number | null>(null);

// PR status fields (local state, updated via events)
let prStatusState = $state<string | null>(null);
Expand Down Expand Up @@ -281,6 +282,26 @@
};
});

// Kick off an immediate refresh whenever this branch gains a PR number.
// This covers branches hydrated after mount, such as project/repo creation from an existing PR.
$effect(() => {
const prNumber = branch.prNumber;

if (!prNumber) {
lastImmediateRefreshPrNumber = null;
return;
}

if (!isWindowFocused || prStatusRefreshing || lastImmediateRefreshPrNumber === prNumber) {
return;
}

lastImmediateRefreshPrNumber = prNumber;
commands
.refreshPrStatus(branch.id)
.catch((e) => console.error('Failed to fetch initial PR status:', e));
});

onMount(() => {
window.addEventListener('keydown', handleOptionDown);
window.addEventListener('keyup', handleOptionUp);
Expand All @@ -298,12 +319,6 @@
};
window.addEventListener('focus', handleFocus);
window.addEventListener('blur', handleBlur);

if (branch.prNumber) {
commands
.refreshPrStatus(branch.id)
.catch((e) => console.error('Failed to fetch initial PR status:', e));
}
});

onDestroy(() => {
Expand Down
10 changes: 9 additions & 1 deletion apps/staged/src/lib/listeners/sessionStatusListener.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,15 @@ async function handlePrCompletion(sessionId: string, branchId: string, status: s
try {
await commands.updateBranchPr(branchId, prNumber);
} catch (storageError) {
console.error('Failed to persist PR number to storage:', storageError);
console.error('Failed to persist PR state after creation:', storageError);
prStateStore.setPrError(branchId, 'Failed to save PR details after creation.');
return;
}

try {
await commands.refreshPrStatus(branchId);

@chatgpt-codex-connector chatgpt-codex-connector Bot Apr 2, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Do not block PR completion on status refresh

handlePrCompletion now waits for commands.refreshPrStatus(branchId) before marking the PR as created, but that backend call can take up to 60 seconds (the gh wrapper enforces a 60s timeout). Because handleSessionEnd awaits this function before running prStateStore.clearSessionTracking, sessionRegistry.unregister, and drainQueuedSessions, a slow GitHub response can leave the branch stuck in "creating" and delay queued work even though the PR was already created. This refresh should be non-blocking (or moved after cleanup) so completion state is not held behind network latency.

Useful? React with 👍 / 👎.

} catch (refreshError) {
console.error('Failed to refresh PR state after creation:', refreshError);
}
}
prStateStore.setPrCreated(branchId, foundUrl);
Expand Down