feat: fork-aware issue/PR listing & OpenCode startup loading indicator (#1061)
* Add design spec: OpenCode readiness loading indicator * Add implementation plan: OpenCode readiness loading indicator * feat: add useOpenCodeReadiness hook * feat: add i18n keys for common.loading * feat: add loading state to ModelSelector * feat: add loading state to AgentSelector * feat: add loading state to ModelControls chat selectors * update package-lock * feat(github): add shared fork detection utility * feat(github): make issue listing fork-aware * feat(github): make PR listing fork-aware * feat(types): add sourceRepo to issue/PR summary types * feat(ui): add source badges to GitHub integration dialog * feat(ui): add source badges to issue/PR picker dialogs * feat(github): pass headRemote in PR creation for fork support * feat(ui): add source→target label in PR tab for fork workflows * fix(github): allow PR section on base branch when upstream remote exists * fix(github): show PR section on any branch including main for fork→upstream PRs * fix(github): allow PullRequestSection to render on base branch when upstream remote exists * feat(github): auto-detect upstream repo for fork→upstream PR creation - Add GET /api/github/repo/upstream endpoint to discover fork's upstream - Fix PullRequestSection canShow to allow PR creation on base branch when repo is a fork - Add virtual upstream target in remote dropdown (no explicit upstream remote needed) - Add targetRepo parameter to /api/github/pr/create for direct upstream targeting - Add repoUpstream() API client method and GitHubRepoUpstreamResult type * feat(github): auto-detect upstream repo for fork→upstream PR creation - Add GET /api/github/repo/upstream endpoint to discover fork's upstream - Fix PullRequestSection canShow to allow PR creation on base branch when repo is a fork - Add virtual upstream target in remote dropdown (no explicit upstream remote needed) - Add targetRepo parameter to /api/github/pr/create for direct upstream targeting - Add repoUpstream() API client method and GitHubRepoUpstreamResult type * fix: complete fork→upstream PR workflow - Server: return defaultBranch from /api/github/repo/upstream endpoint - Server: fix cross-repo head ref construction (compare repos, not remote names) - Server: filterActiveRemoteBranches checks all remotes, not just origin - UI: set targetBaseBranch to upstream's default branch when using detected upstream - UI: include all remote branches in base branch dropdown when using detected upstream - UI: skip base===head check for cross-repo PRs (same branch name on different repos is valid) - Types: add defaultBranch to GitHubRepoUpstreamResult * chore: delete superpowers folder * feat: add (local)/(remote) labels to PR branch display and adapt Repository button to selected remote * feat: Repository button adapts to selected remote (upstream vs origin) * fix: complete fork→upstream PR feature gaps Server: - Extend /api/github/repo/upstream to return defaultBranchSha and remoteName - Reuse headRepo result instead of redundant resolveGitHubRepoFromDirectory call - Return clear error when headRepo is null (invalid GitHub URL) UI: - Add upstream's default branch to availableBaseBranches when using detected upstream - Use upstream's default branch SHA in git log for generate description (fixes 'No commits found in range main...main') - Show qualified names (owner/repo · branch) in base branch dropdown when using detected upstream Types: - Add defaultBranchSha and remoteName to GitHubRepoUpstreamResult * fix: move detectedUpstream state before availableBaseBranches to fix temporal dead zone * fix: fetch upstream branches from GitHub API for base branch dropdown - Add GET /api/github/repo/branches endpoint to fetch branches via Octokit - Add repoBranches() to GitHub API client and interface - Fetch upstream branches on detection and store in upstreamBranches state - Include upstreamBranches in availableBaseBranches when using detected upstream - Re-add availableBaseBranches memo and auto-correction effect that were lost - Remove unnecessary qualified names from dropdown (upstream is already selected) * fix: restore prStatusKey and statusEntry declarations lost during refactor * fix: cleanly re-apply all fork→upstream PR UI changes Restored PullRequestSection.tsx from clean base and re-applied: - Expand detectedUpstream type with defaultBranch, defaultBranchSha, remoteName - Add upstreamBranches state and fetch on upstream detection - Include upstream branches in availableBaseBranches when using detected upstream - Use upstream default branch SHA in generate description (fixes 'No commits found') - Adapt Repository button URL to selected remote - Add (local)/(remote)/(upstream) labels to branch display * fix: move detectedUpstream/upstreamBranches before availableBaseBranches to fix TDZ * style: add pill badge styling to upstream repo source labels * fix: don't cache error PR status responses, allow force-bypass of server cache * fix: resolve PR status cache bugs, stale directory fallback, and upstream re-detection * fix: keep collapse button visible when scrolling long user messages - Collapse button now sticks to top of scrollable user message content instead of scrolling away * fix: checkbox focus ring blends into sidebar background * fix: polish fork PR follow-ups * fix: remove user message collapse artifact * fix: tighten fork PR internals * fix: check all remotes for fork PR status * fix: recover sidebar PR status misses --------- Signed-off-by: Islam Nofl <islamnofl.official@gmail.com> Co-authored-by: Bohdan Triapitsyn <artmore@protonmail.com>
This commit is contained in:
Islam Nofl
committed by
GitHub
GitHub
co-authored by
Bohdan Triapitsyn
Bohdan Triapitsyn
parent
17650becc0
commit
21253d7fc2
@@ -27,6 +27,18 @@ const parseTrackingRemoteName = (trackingBranch) => {
|
||||
return normalized.slice(0, slashIndex).trim();
|
||||
};
|
||||
|
||||
const parseTrackingBranchName = (trackingBranch) => {
|
||||
const normalized = normalizeText(trackingBranch);
|
||||
if (!normalized) {
|
||||
return '';
|
||||
}
|
||||
const slashIndex = normalized.indexOf('/');
|
||||
if (slashIndex <= 0 || slashIndex >= normalized.length - 1) {
|
||||
return '';
|
||||
}
|
||||
return normalized.slice(slashIndex + 1).trim();
|
||||
};
|
||||
|
||||
const pushUnique = (collection, value, keyFn = normalizeLower) => {
|
||||
const normalizedValue = normalizeText(value);
|
||||
if (!normalizedValue) {
|
||||
@@ -421,13 +433,17 @@ export async function resolveGitHubPrStatus({ octokit, directory, branch, remote
|
||||
]);
|
||||
|
||||
const trackingRemoteName = parseTrackingRemoteName(status?.tracking);
|
||||
const trackingBranchName = parseTrackingBranchName(status?.tracking);
|
||||
const branchCandidates = [];
|
||||
pushUnique(branchCandidates, normalizedBranch);
|
||||
pushUnique(branchCandidates, trackingBranchName);
|
||||
const rankedRemoteNames = rankRemoteNames(
|
||||
Array.isArray(remotes) ? remotes.map((remote) => remote?.name).filter(Boolean) : [],
|
||||
normalizedRemoteName,
|
||||
trackingRemoteName,
|
||||
);
|
||||
|
||||
const resolvedRemoteTargets = await resolveRemoteCandidates(directory, rankedRemoteNames.slice(0, 3));
|
||||
const resolvedRemoteTargets = await resolveRemoteCandidates(directory, rankedRemoteNames);
|
||||
const resolvedTargets = await expandRepoNetwork(
|
||||
octokit,
|
||||
resolvedRemoteTargets.map((target, index) => ({ ...target, priority: index })),
|
||||
@@ -454,38 +470,44 @@ export async function resolveGitHubPrStatus({ octokit, directory, branch, remote
|
||||
fallbackRemoteName = target.remoteName;
|
||||
fallbackDefaultBranch = defaultBranch;
|
||||
}
|
||||
if (defaultBranch && defaultBranch === normalizedBranch) {
|
||||
continue;
|
||||
}
|
||||
|
||||
const pr = await findFirstMatchingPr({
|
||||
octokit,
|
||||
target,
|
||||
branch: normalizedBranch,
|
||||
sourceCandidates,
|
||||
});
|
||||
if (pr) {
|
||||
return {
|
||||
repo: target.repo,
|
||||
pr,
|
||||
defaultBranch,
|
||||
resolvedRemoteName: target.remoteName,
|
||||
};
|
||||
const hasCrossRepoSource = sourceCandidates.some((candidate) => normalizeRepoKey(candidate.repo?.owner, candidate.repo?.repo) !== normalizeRepoKey(target.repo?.owner, target.repo?.repo));
|
||||
for (const candidateBranch of branchCandidates) {
|
||||
if (defaultBranch && defaultBranch === candidateBranch && !hasCrossRepoSource) {
|
||||
continue;
|
||||
}
|
||||
|
||||
const pr = await findFirstMatchingPr({
|
||||
octokit,
|
||||
target,
|
||||
branch: candidateBranch,
|
||||
sourceCandidates,
|
||||
});
|
||||
if (pr) {
|
||||
return {
|
||||
repo: target.repo,
|
||||
pr,
|
||||
defaultBranch,
|
||||
resolvedRemoteName: target.remoteName,
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const fallbackSearch = await searchFallbackPr({
|
||||
octokit,
|
||||
branch: normalizedBranch,
|
||||
repoNames: resolvedTargets.map((target) => target.repo.repo),
|
||||
});
|
||||
if (fallbackSearch) {
|
||||
return {
|
||||
repo: fallbackSearch.repo,
|
||||
pr: fallbackSearch.pr,
|
||||
defaultBranch: await getRepoDefaultBranch(octokit, fallbackSearch.repo),
|
||||
resolvedRemoteName: null,
|
||||
};
|
||||
for (const candidateBranch of branchCandidates) {
|
||||
const fallbackSearch = await searchFallbackPr({
|
||||
octokit,
|
||||
branch: candidateBranch,
|
||||
repoNames: resolvedTargets.map((target) => target.repo.repo),
|
||||
});
|
||||
if (fallbackSearch) {
|
||||
return {
|
||||
repo: fallbackSearch.repo,
|
||||
pr: fallbackSearch.pr,
|
||||
defaultBranch: await getRepoDefaultBranch(octokit, fallbackSearch.repo),
|
||||
resolvedRemoteName: null,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user