fix(pr-checks): harden branch PR detection

Author: johannesjo

electron/ipc/channels.ts

@@ -137,6 +137,7 @@ export enum IPC {
   StartPrChecksWatcher = 'start_pr_checks_watcher',
   StopPrChecksWatcher = 'stop_pr_checks_watcher',
   DetectPrForBranch = 'detect_pr_for_branch',
+  RefreshPrChecksWatcher = 'refresh_pr_checks_watcher',
   PrChecksUpdate = 'pr_checks_update',
 
   // Logging

electron/ipc/pr-checks.test.ts

@@ -42,13 +42,13 @@ import {
 } from './pr-checks.js';
 
 type ExecCb = (err: Error | null, stdout: string, stderr: string) => void;
-type GhHandler = (args: string[], cb: ExecCb) => void;
+type GhHandler = (args: string[], cb: ExecCb, cmd: string) => void;
 
 function stubGh(handler: GhHandler): string[][] {
   const calls: string[][] = [];
-  const impl = (_cmd: string, args: string[], _opts: unknown, cb: ExecCb) => {
+  const impl = (cmd: string, args: string[], _opts: unknown, cb: ExecCb) => {
     calls.push(args);
-    handler(args, cb);
+    handler(args, cb, cmd);
   };
   vi.mocked(execFile).mockImplementation(impl as unknown as typeof execFile);
   return calls;
@@ -206,34 +206,66 @@ describe('detectPrUrlForBranch', () => {
   });
 
   it('finds an open PR for a branch', async () => {
-    const calls = stubGh((_args, cb) =>
-      cb(null, JSON.stringify([{ url: 'https://github.com/a/b/pull/12' }]), ''),
-    );
+    const calls = stubGh((_args, cb, cmd) => {
+      if (cmd === 'git') {
+        cb(null, 'abc123\n', '');
+        return;
+      }
+      cb(
+        null,
+        JSON.stringify([
+          {
+            url: 'https://github.com/a/b/pull/11',
+            headRefName: 'task/my-branch',
+            headRefOid: 'old',
+          },
+          {
+            url: 'https://github.com/a/b/pull/12',
+            headRefName: 'task/my-branch',
+            headRefOid: 'abc123',
+          },
+        ]),
+        '',
+      );
+    });
     await expect(detectPrUrlForBranch('/repo/worktree', 'task/my-branch')).resolves.toBe(
       'https://github.com/a/b/pull/12',
     );
-    expect(calls[0]).toEqual([
+    expect(calls[0]).toEqual(['rev-parse', 'task/my-branch']);
+    expect(calls[1]).toEqual([
       'pr',
       'list',
       '--state',
       'open',
       '--head',
       'task/my-branch',
       '--json',
-      'url',
+      'url,headRefName,headRefOid',
       '--limit',
-      '1',
+      '20',
     ]);
   });
 
   it('returns null when the branch has no open PR', async () => {
-    stubGh((_args, cb) => cb(null, JSON.stringify([]), ''));
+    stubGh((_args, cb, cmd) => cb(null, cmd === 'git' ? 'abc123\n' : JSON.stringify([]), ''));
     await expect(detectPrUrlForBranch('/repo/worktree', 'task/no-pr')).resolves.toBe(null);
   });
 
   it('rejects malformed PR URLs from gh output', async () => {
-    stubGh((_args, cb) =>
-      cb(null, JSON.stringify([{ url: 'https://github.com/a/b/issues/12' }]), ''),
+    stubGh((_args, cb, cmd) =>
+      cb(
+        null,
+        cmd === 'git'
+          ? 'abc123\n'
+          : JSON.stringify([
+              {
+                url: 'https://github.com/a/b/issues/12',
+                headRefName: 'task/issue',
+                headRefOid: 'abc123',
+              },
+            ]),
+        '',
+      ),
     );
     await expect(detectPrUrlForBranch('/repo/worktree', 'task/issue')).resolves.toBe(null);
   });

electron/ipc/pr-checks.ts

@@ -7,6 +7,7 @@ const exec = promisify(execFile);
 
 const TICK_MS = 30_000;
 const SETTLED_REFRESH_MS = 5 * 60_000;
+const POST_PUSH_REFRESH_GRACE_MS = 2 * 60_000;
 const GH_TIMEOUT_MS = 15_000;
 const GH_MAX_BUFFER = 4 * 1024 * 1024;
 
@@ -44,6 +45,8 @@ interface TaskEntry {
   lastNotifiedSha: string | null;
   /** Outcome at the last notification, so the same (sha, outcome) doesn't refire. */
   lastNotifiedOutcome: Exclude<PrChecksOverall, 'pending' | 'none'> | null;
+  /** After a local push, ignore stale old-SHA check data while GitHub catches up. */
+  postPushRefreshUntil: number | null;
 }
 
 let win: BrowserWindow | null = null;
@@ -114,6 +117,7 @@ export function startPrChecksWatcher(args: {
         lastRefreshedAt: 0,
         lastNotifiedSha: null,
         lastNotifiedOutcome: null,
+        postPushRefreshUntil: null,
       }
     : { ...existing, taskName: args.taskName };
   tasks.set(args.taskId, next);
@@ -128,6 +132,21 @@ export function stopPrChecksWatcher(taskId: string): void {
   if (tasks.size === 0) clearTickInterval();
 }
 
+export function refreshPrChecksWatcher(taskId: string): void {
+  if (disabled) return;
+  const entry = tasks.get(taskId);
+  if (!entry) return;
+  entry.postPushRefreshUntil = Date.now() + POST_PUSH_REFRESH_GRACE_MS;
+  entry.overall = 'pending';
+  entry.passing = 0;
+  entry.pending = Math.max(1, entry.checks.length);
+  entry.failing = 0;
+  entry.checks = [];
+  entry.lastRefreshedAt = Date.now();
+  sendUpdate(entry);
+  ensureInterval();
+}
+
 /** True if the window currently exists and is visible. */
 function windowIsVisible(): boolean {
   return !!win && !win.isDestroyed() && win.isVisible();
@@ -209,6 +228,12 @@ async function refreshOne(taskId: string): Promise<void> {
   const prevSha = entry.headRefOid;
   const shaChanged = prevSha !== null && prevSha !== view.headRefOid;
   const firstRefresh = entry.lastRefreshedAt === 0;
+  const waitingForPostPushHead =
+    entry.postPushRefreshUntil !== null && !shaChanged && Date.now() < entry.postPushRefreshUntil;
+  if (waitingForPostPushHead) {
+    entry.lastRefreshedAt = Date.now();
+    return;
+  }
   const nothingChanged =
     !firstRefresh &&
     entry.overall === overall &&
@@ -221,6 +246,9 @@ async function refreshOne(taskId: string): Promise<void> {
   if (shaChanged) {
     entry.lastNotifiedSha = null;
     entry.lastNotifiedOutcome = null;
+    entry.postPushRefreshUntil = null;
+  } else if (entry.postPushRefreshUntil !== null && Date.now() >= entry.postPushRefreshUntil) {
+    entry.postPushRefreshUntil = null;
   }
 
   entry.overall = overall;
@@ -356,16 +384,37 @@ export async function detectPrUrlForBranch(
   worktreePath: string,
   branchName: string,
 ): Promise<string | null> {
+  const { stdout: headStdout } = await exec('git', ['rev-parse', branchName], {
+    cwd: worktreePath,
+    timeout: GH_TIMEOUT_MS,
+    maxBuffer: GH_MAX_BUFFER,
+  });
+  const localHead = headStdout.trim();
   const { stdout } = await exec(
     'gh',
-    ['pr', 'list', '--state', 'open', '--head', branchName, '--json', 'url', '--limit', '1'],
+    [
+      'pr',
+      'list',
+      '--state',
+      'open',
+      '--head',
+      branchName,
+      '--json',
+      'url,headRefName,headRefOid',
+      '--limit',
+      '20',
+    ],
     { cwd: worktreePath, timeout: GH_TIMEOUT_MS, maxBuffer: GH_MAX_BUFFER },
   );
   const parsed: unknown = JSON.parse(stdout);
   if (!Array.isArray(parsed)) return null;
-  const first = parsed[0];
-  if (!first || typeof first !== 'object') return null;
-  const url = (first as Record<string, unknown>)['url'];
+  const match = parsed.find((item) => {
+    if (!item || typeof item !== 'object') return false;
+    const pr = item as Record<string, unknown>;
+    return pr['headRefName'] === branchName && pr['headRefOid'] === localHead;
+  });
+  if (!match || typeof match !== 'object') return null;
+  const url = (match as Record<string, unknown>)['url'];
   return typeof url === 'string' && isPrUrl(url) ? url : null;
 }
 

electron/ipc/register.ts

@@ -32,6 +32,7 @@ import {
   startPrChecksWatcher,
   stopPrChecksWatcher,
   detectPrUrlForBranch,
+  refreshPrChecksWatcher,
   isPrUrl,
 } from './pr-checks.js';
 import { readCoverageSummary } from './coverage.js';
@@ -837,15 +838,24 @@ export function registerAllHandlers(win: BrowserWindow): void {
     stopPrChecksWatcher(args.taskId);
   });
   ipcMain.handle(IPC.DetectPrForBranch, (_e, args) => {
-    assertString(args.worktreePath, 'worktreePath');
-    assertString(args.branchName, 'branchName');
-    return detectPrUrlForBranch(args.worktreePath, args.branchName).catch((err: unknown) => {
-      const code = (err as NodeJS.ErrnoException)?.code;
-      const stderr = (err as { stderr?: string })?.stderr ?? '';
-      if (code === 'ENOENT' || /not logged into|authentication required/i.test(stderr)) return null;
-      console.warn('[pr-checks] branch PR detection failed:', (err as Error)?.message ?? err);
-      return null;
-    });
+    validatePath(args.worktreePath, 'worktreePath');
+    validateBranchName(args.branchName, 'branchName');
+    return detectPrUrlForBranch(args.worktreePath, args.branchName)
+      .then((url) => ({ url }))
+      .catch((err: unknown) => {
+        const code = (err as NodeJS.ErrnoException)?.code;
+        const stderr = (err as { stderr?: string })?.stderr ?? '';
+        if (code === 'ENOENT') return { url: null, unavailable: 'missing' };
+        if (/not logged into|authentication required/i.test(stderr)) {
+          return { url: null, unavailable: 'auth' };
+        }
+        console.warn('[pr-checks] branch PR detection failed:', (err as Error)?.message ?? err);
+        return { url: null };
+      });
+  });
+  ipcMain.handle(IPC.RefreshPrChecksWatcher, (_e, args) => {
+    assertString(args.taskId, 'taskId');
+    refreshPrChecksWatcher(args.taskId);
   });
 
   // --- Steps content (one-shot read) ---

electron/preload.cjs

@@ -124,6 +124,7 @@ const ALLOWED_CHANNELS = new Set([
   'start_pr_checks_watcher',
   'stop_pr_checks_watcher',
   'detect_pr_for_branch',
+  'refresh_pr_checks_watcher',
   'pr_checks_update',
   // Logging
   'log_from_renderer',

src/components/TaskBranchInfoBar.tsx

@@ -5,6 +5,7 @@ import { revealItemInDir, openInEditor } from '../lib/shell';
 import { InfoBar } from './InfoBar';
 import { theme } from '../lib/theme';
 import { isMac } from '../lib/platform';
+import { parseGitHubUrl } from '../lib/github-url';
 import type { Task } from '../store/types';
 
 const infoBarBtnStyle: JSX.CSSProperties = {
@@ -28,6 +29,19 @@ interface TaskBranchInfoBarProps {
 
 export function TaskBranchInfoBar(props: TaskBranchInfoBarProps) {
   const mod = isMac ? 'Cmd' : 'Ctrl';
+  const isPrUrl = (url: string | undefined): boolean => {
+    const parsed = url ? parseGitHubUrl(url) : null;
+    return parsed?.type === 'pull' && !!parsed.number;
+  };
+  const githubLabel = (url: string): string => url.replace(/^https?:\/\/(www\.)?github\.com\//, '');
+  const prLinkUrl = () =>
+    props.task.prUrl ?? (isPrUrl(props.task.githubUrl) ? props.task.githubUrl : undefined);
+  const sourceLinkUrl = () => {
+    const prUrl = prLinkUrl();
+    return props.task.githubUrl && props.task.githubUrl !== prUrl
+      ? props.task.githubUrl
+      : undefined;
+  };
   const editorTitle = () =>
     store.editorCommand
       ? `Click to open in ${store.editorCommand} · ${mod}+Click to reveal in file manager · ${mod}+Shift+Click to open the project root in ${store.editorCommand}`
@@ -83,7 +97,28 @@ export function TaskBranchInfoBar(props: TaskBranchInfoBarProps) {
           </Show>
         );
       })()}
-      <Show when={props.task.githubUrl}>
+      <Show when={sourceLinkUrl()}>
+        {(url) => (
+          <button
+            type="button"
+            onClick={() => window.open(url(), '_blank')}
+            title={url()}
+            style={{ ...infoBarBtnStyle, 'margin-right': '8px', color: theme.accent }}
+          >
+            <svg
+              width="12"
+              height="12"
+              viewBox="0 0 16 16"
+              fill="currentColor"
+              style={{ 'flex-shrink': '0' }}
+            >
+              <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8Z" />
+            </svg>
+            {githubLabel(url())}
+          </button>
+        )}
+      </Show>
+      <Show when={prLinkUrl()}>
         {(url) => {
           const pr = () => getPrChecks(props.task.id);
           const dotColor = (): string | null => {
@@ -143,7 +178,7 @@ export function TaskBranchInfoBar(props: TaskBranchInfoBarProps) {
               >
                 <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8Z" />
               </svg>
-              {url().replace(/^https?:\/\/(www\.)?github\.com\//, '')}
+              {githubLabel(url())}
             </button>
           );
         }}