{loading ? (
diff --git a/packages/ui/src/components/views/git/PullRequestSection.tsx b/packages/ui/src/components/views/git/PullRequestSection.tsx
index aba07d0f..c5aa86ba 100644
--- a/packages/ui/src/components/views/git/PullRequestSection.tsx
+++ b/packages/ui/src/components/views/git/PullRequestSection.tsx
@@ -251,7 +251,7 @@ export const PullRequestSection: React.FC<{
{checks ? (
- {checks.total > 0 ? `${checks.success}/${checks.total}` : checks.state}
+ {checks.total > 0 ? `${checks.success}/${checks.total} checks` : `${checks.state} checks`}
) : null}
diff --git a/packages/vscode/src/gitService.ts b/packages/vscode/src/gitService.ts
index b25e4457..c60dc525 100644
--- a/packages/vscode/src/gitService.ts
+++ b/packages/vscode/src/gitService.ts
@@ -699,7 +699,18 @@ export async function getGitRangeDiff(
if (!baseRef || !headRef) {
return { diff: '' };
}
- const args = ['diff', '--no-color', `-U${Math.max(0, contextLines)}`, `${baseRef}...${headRef}`, '--', filePath];
+
+ let resolvedBase = baseRef;
+ try {
+ const verify = await execGit(['rev-parse', '--verify', `refs/remotes/origin/${baseRef}`], directory);
+ if (verify.exitCode === 0) {
+ resolvedBase = `origin/${baseRef}`;
+ }
+ } catch {
+ // ignore
+ }
+
+ const args = ['diff', '--no-color', `-U${Math.max(0, contextLines)}`, `${resolvedBase}...${headRef}`, '--', filePath];
const result = await execGit(args, directory);
return { diff: result.stdout };
}
@@ -717,7 +728,18 @@ export async function getGitRangeFiles(
if (!baseRef || !headRef) {
return [];
}
- const args = ['diff', '--name-only', `${baseRef}...${headRef}`];
+
+ let resolvedBase = baseRef;
+ try {
+ const verify = await execGit(['rev-parse', '--verify', `refs/remotes/origin/${baseRef}`], directory);
+ if (verify.exitCode === 0) {
+ resolvedBase = `origin/${baseRef}`;
+ }
+ } catch {
+ // ignore
+ }
+
+ const args = ['diff', '--name-only', `${resolvedBase}...${headRef}`];
const result = await execGit(args, directory);
if (result.exitCode !== 0) return [];
return String(result.stdout || '')
diff --git a/packages/vscode/src/githubPr.ts b/packages/vscode/src/githubPr.ts
index 0f97b066..f71889af 100644
--- a/packages/vscode/src/githubPr.ts
+++ b/packages/vscode/src/githubPr.ts
@@ -180,24 +180,66 @@ export const getPullRequestStatus = async (
let checks: GitHubChecksSummary | null = null;
if (pr.headSha) {
- const statusResp = await githubFetch(
- `${API_BASE}/repos/${repo.owner}/${repo.repo}/commits/${pr.headSha}/status`,
+ // Prefer check-runs (Actions)
+ const runsResp = await githubFetch(
+ `${API_BASE}/repos/${repo.owner}/${repo.repo}/commits/${pr.headSha}/check-runs`,
accessToken,
);
- const statusJson = await jsonOrNull(statusResp);
- if (statusResp.ok && statusJson) {
- const statuses = Array.isArray(statusJson.statuses) ? (statusJson.statuses as unknown[]) : [];
+ const runsJson = await jsonOrNull(runsResp);
+ const runs = Array.isArray((runsJson as JsonRecord | null)?.check_runs)
+ ? ((runsJson as JsonRecord).check_runs as unknown[])
+ : [];
+
+ if (runsResp.ok && runs.length > 0) {
const counts = { success: 0, failure: 0, pending: 0 };
- statuses.forEach((s) => {
- const st = readString((s as JsonRecord | null)?.state);
- if (st === 'success') counts.success += 1;
- else if (st === 'failure' || st === 'error') counts.failure += 1;
- else if (st === 'pending') counts.pending += 1;
+ runs.forEach((r) => {
+ const rec = (r && typeof r === 'object') ? (r as JsonRecord) : null;
+ const status = readString(rec?.status);
+ const conclusion = readString(rec?.conclusion);
+ if (status === 'queued' || status === 'in_progress') {
+ counts.pending += 1;
+ return;
+ }
+ if (!conclusion) {
+ counts.pending += 1;
+ return;
+ }
+ if (conclusion === 'success' || conclusion === 'neutral' || conclusion === 'skipped') {
+ counts.success += 1;
+ } else {
+ counts.failure += 1;
+ }
});
const total = counts.success + counts.failure + counts.pending;
- const state2 = counts.failure > 0 ? 'failure' : (counts.pending > 0 ? 'pending' : (total > 0 ? 'success' : 'unknown'));
+ const state2 = counts.failure > 0
+ ? 'failure'
+ : (counts.pending > 0 ? 'pending' : (total > 0 ? 'success' : 'unknown'));
checks = { state: state2, total, ...counts };
}
+
+ // Fallback: classic statuses
+ if (!checks) {
+ const statusResp = await githubFetch(
+ `${API_BASE}/repos/${repo.owner}/${repo.repo}/commits/${pr.headSha}/status`,
+ accessToken,
+ );
+ const statusJson = await jsonOrNull(statusResp);
+ if (statusResp.ok && statusJson) {
+ const statuses = Array.isArray(statusJson.statuses) ? (statusJson.statuses as unknown[]) : [];
+ const counts = { success: 0, failure: 0, pending: 0 };
+ statuses.forEach((s) => {
+ const st = readString((s as JsonRecord | null)?.state);
+ if (st === 'success') counts.success += 1;
+ else if (st === 'failure' || st === 'error') counts.failure += 1;
+ else if (st === 'pending') counts.pending += 1;
+ });
+ const total = counts.success + counts.failure + counts.pending;
+ const state2 = counts.failure > 0
+ ? 'failure'
+ : (counts.pending > 0 ? 'pending' : (total > 0 ? 'success' : 'unknown'));
+ checks = { state: state2, total, ...counts };
+ }
+ }
}
let canMerge = false;
diff --git a/packages/web/server/index.js b/packages/web/server/index.js
index 441d4f23..90ca28a2 100644
--- a/packages/web/server/index.js
+++ b/packages/web/server/index.js
@@ -4094,26 +4094,70 @@ async function main(options = {}) {
return res.json({ connected: true, repo, branch, pr: null, checks: null, canMerge: false });
}
- // Checks summary (combined status)
+ // Checks summary: prefer check-runs (Actions), fallback to classic statuses.
let checks = null;
- try {
- const combined = await octokit.rest.repos.getCombinedStatusForRef({
- owner: repo.owner,
- repo: repo.repo,
- ref: prData.head?.sha,
- });
- const statuses = Array.isArray(combined?.data?.statuses) ? combined.data.statuses : [];
- const counts = { success: 0, failure: 0, pending: 0 };
- statuses.forEach((s) => {
- if (s.state === 'success') counts.success += 1;
- else if (s.state === 'failure' || s.state === 'error') counts.failure += 1;
- else if (s.state === 'pending') counts.pending += 1;
- });
- const total = counts.success + counts.failure + counts.pending;
- const state = counts.failure > 0 ? 'failure' : (counts.pending > 0 ? 'pending' : (total > 0 ? 'success' : 'unknown'));
- checks = { state, total, ...counts };
- } catch {
- checks = null;
+ const sha = prData.head?.sha;
+ if (sha) {
+ try {
+ const runs = await octokit.rest.checks.listForRef({
+ owner: repo.owner,
+ repo: repo.repo,
+ ref: sha,
+ per_page: 100,
+ });
+ const checkRuns = Array.isArray(runs?.data?.check_runs) ? runs.data.check_runs : [];
+ if (checkRuns.length > 0) {
+ const counts = { success: 0, failure: 0, pending: 0 };
+ for (const run of checkRuns) {
+ const status = run?.status;
+ const conclusion = run?.conclusion;
+ if (status === 'queued' || status === 'in_progress') {
+ counts.pending += 1;
+ continue;
+ }
+ if (!conclusion) {
+ counts.pending += 1;
+ continue;
+ }
+ if (conclusion === 'success' || conclusion === 'neutral' || conclusion === 'skipped') {
+ counts.success += 1;
+ } else {
+ counts.failure += 1;
+ }
+ }
+ const total = counts.success + counts.failure + counts.pending;
+ const state = counts.failure > 0
+ ? 'failure'
+ : (counts.pending > 0 ? 'pending' : (total > 0 ? 'success' : 'unknown'));
+ checks = { state, total, ...counts };
+ }
+ } catch {
+ // ignore and fall back
+ }
+
+ if (!checks) {
+ try {
+ const combined = await octokit.rest.repos.getCombinedStatusForRef({
+ owner: repo.owner,
+ repo: repo.repo,
+ ref: sha,
+ });
+ const statuses = Array.isArray(combined?.data?.statuses) ? combined.data.statuses : [];
+ const counts = { success: 0, failure: 0, pending: 0 };
+ statuses.forEach((s) => {
+ if (s.state === 'success') counts.success += 1;
+ else if (s.state === 'failure' || s.state === 'error') counts.failure += 1;
+ else if (s.state === 'pending') counts.pending += 1;
+ });
+ const total = counts.success + counts.failure + counts.pending;
+ const state = counts.failure > 0
+ ? 'failure'
+ : (counts.pending > 0 ? 'pending' : (total > 0 ? 'success' : 'unknown'));
+ checks = { state, total, ...counts };
+ } catch {
+ checks = null;
+ }
+ }
}
// Permission check (best-effort)
@@ -4814,7 +4858,7 @@ async function main(options = {}) {
}
}
if (diffs.length === 0) {
- return res.status(400).json({ error: 'No diffs available for selected files' });
+ return res.status(400).json({ error: 'No diffs available for base...head' });
}
const diffSummaries = diffs.map(({ path, diff }) => `FILE: ${path}\n${diff}`).join('\n\n');
diff --git a/packages/web/server/lib/git-service.js b/packages/web/server/lib/git-service.js
index df725fb9..aa7625b7 100644
--- a/packages/web/server/lib/git-service.js
+++ b/packages/web/server/lib/git-service.js
@@ -440,11 +440,24 @@ export async function getRangeDiff(directory, { base, head, path, contextLines =
throw new Error('base and head are required');
}
+ // Prefer remote-tracking base ref so merged commits don't reappear
+ // when local base branch is stale (common when user stays on feature branch).
+ let resolvedBase = baseRef;
+ const originCandidate = `refs/remotes/origin/${baseRef}`;
+ try {
+ const verified = await git.raw(['rev-parse', '--verify', originCandidate]);
+ if (verified && verified.trim()) {
+ resolvedBase = `origin/${baseRef}`;
+ }
+ } catch {
+ // ignore
+ }
+
const args = ['diff', '--no-color'];
if (typeof contextLines === 'number' && !Number.isNaN(contextLines)) {
args.push(`-U${Math.max(0, contextLines)}`);
}
- args.push(`${baseRef}...${headRef}`);
+ args.push(`${resolvedBase}...${headRef}`);
if (path) {
args.push('--', path);
}
@@ -459,7 +472,19 @@ export async function getRangeFiles(directory, { base, head } = {}) {
if (!baseRef || !headRef) {
throw new Error('base and head are required');
}
- const raw = await git.raw(['diff', '--name-only', `${baseRef}...${headRef}`]);
+
+ let resolvedBase = baseRef;
+ const originCandidate = `refs/remotes/origin/${baseRef}`;
+ try {
+ const verified = await git.raw(['rev-parse', '--verify', originCandidate]);
+ if (verified && verified.trim()) {
+ resolvedBase = `origin/${baseRef}`;
+ }
+ } catch {
+ // ignore
+ }
+
+ const raw = await git.raw(['diff', '--name-only', `${resolvedBase}...${headRef}`]);
return String(raw || '')
.split('\n')
.map((l) => l.trim())