Skip to content

Add PR link to GitStatus UI #15

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
jamierpond merged 3 commits into from
Feb 11, 2026
Merged

Add PR link to GitStatus UI #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a5c58b
feat: add PR link to GitStatus UI
jamierpond Feb 11, 2026
a08a063
fix: move PR badge next to branch button as separate clickable link
jamierpond Feb 11, 2026
a0d9490
style: fix prettier formatting
jamierpond Feb 11, 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
99 changes: 95 additions & 4 deletions client/src/components/GitStatus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@
branches: string[];
}

interface PrData {
url: string;
number: number;
title: string;
state: string;
}

// Git status code to color/label
function fileStatusColor(status: string): string {
if (status.includes("M")) return "text-yellow-300";
Expand Down Expand Up @@ -64,6 +71,27 @@
const [creating, setCreating] = useState(false);
const [createError, setCreateError] = useState<string | null>(null);
const [deleting, setDeleting] = useState(false);
const [pr, setPr] = useState<PrData | null>(null);

const fetchPr = useCallback(async () => {
if (!projectId) {
setPr(null);
return;
}
try {
const res = await apiFetch(
`/api/projects/${encodeURIComponent(projectId)}/pr`,
{ serverId, serverUrl },
);
if (!res.ok) {
setPr(null);
return;
}
setPr(await res.json());
} catch {
setPr(null);
}
}, [projectId, serverId, serverUrl]);

const fetchStatus = useCallback(async () => {
if (!projectId) {
Expand Down Expand Up @@ -95,19 +123,23 @@
} finally {
setLoading(false);
}
}, [projectId]);

Check warning on line 126 in client/src/components/GitStatus.tsx

View workflow job for this annotation

GitHub Actions / lint 

React Hook useCallback has missing dependencies: 'serverId' and 'serverUrl'. Either include them or remove the dependency array

// Fetch on mount and when projectId changes
useEffect(() => {
fetchStatus();
}, [fetchStatus]);
fetchPr();
}, [fetchStatus, fetchPr]);

// Refresh periodically (every 30s)
useEffect(() => {
if (!projectId) return;
const interval = setInterval(fetchStatus, 30000);
const interval = setInterval(() => {
fetchStatus();
fetchPr();
}, 30000);
return () => clearInterval(interval);
}, [projectId, fetchStatus]);
}, [projectId, fetchStatus, fetchPr]);

// Reset worktree create state when dropdown closes
useEffect(() => {
Expand Down Expand Up @@ -195,7 +227,7 @@
}

return (
<div className="relative">
<div className="relative flex items-center gap-1">
<button
onClick={() => setExpanded(!expanded)}
className={`
Expand Down Expand Up @@ -241,6 +273,23 @@
</span>
)}
</button>
{pr && (
<a
href={pr.url}
target="_blank"
rel="noopener noreferrer"
className="flex items-center gap-1 px-2 py-1 rounded-lg text-xs font-medium bg-[var(--color-bg-secondary)] text-[var(--color-accent)] hover:bg-[var(--color-bg-hover)] transition-colors"
title={`PR #${pr.number}: ${pr.title}`}
>
<svg className="w-3.5 h-3.5" viewBox="0 0 16 16" fill="currentColor">
<path
fillRule="evenodd"
d="M7.177 3.073L9.573.677A.25.25 0 0110 .854v4.792a.25.25 0 01-.427.177L7.177 3.427a.25.25 0 010-.354zM3.75 2.5a.75.75 0 100 1.5.75.75 0 000-1.5zm-2.25.75a2.25 2.25 0 113 2.122v5.256a2.251 2.251 0 11-1.5 0V5.372A2.25 2.25 0 011.5 3.25zM11 2.5h-1V4h1a1 1 0 011 1v5.628a2.251 2.251 0 101.5 0V5A2.5 2.5 0 0011 2.5zm1 10.25a.75.75 0 111.5 0 .75.75 0 01-1.5 0zM3.75 12a.75.75 0 100 1.5.75.75 0 000-1.5z"
/>
</svg>
#{pr.number}
</a>
)}

{/* Expanded details dropdown */}
{expanded && (
Expand Down Expand Up @@ -320,6 +369,47 @@
)}
</div>
)}

{/* PR link */}
{pr && (
<div className="flex items-center gap-2">
<svg
className="w-4 h-4 text-[var(--color-text-tertiary)]"
viewBox="0 0 16 16"
fill="currentColor"
>
<path
fillRule="evenodd"
d="M7.177 3.073L9.573.677A.25.25 0 0110 .854v4.792a.25.25 0 01-.427.177L7.177 3.427a.25.25 0 010-.354zM3.75 2.5a.75.75 0 100 1.5.75.75 0 000-1.5zm-2.25.75a2.25 2.25 0 113 2.122v5.256a2.251 2.251 0 11-1.5 0V5.372A2.25 2.25 0 011.5 3.25zM11 2.5h-1V4h1a1 1 0 011 1v5.628a2.251 2.251 0 101.5 0V5A2.5 2.5 0 0011 2.5zm1 10.25a.75.75 0 111.5 0 .75.75 0 01-1.5 0zM3.75 12a.75.75 0 100 1.5.75.75 0 000-1.5z"
/>
</svg>
<a
href={pr.url}
target="_blank"
rel="noopener noreferrer"
onClick={(e) => e.stopPropagation()}
className="inline-flex items-center gap-1 text-sm text-[var(--color-accent)] hover:text-[#d97a5a] underline decoration-[var(--color-accent-muted)] hover:decoration-[#d97a5a] underline-offset-2"
>
PR #{pr.number}
<svg
className="w-3 h-3 shrink-0"
viewBox="0 0 20 20"
fill="currentColor"
>
<path
fillRule="evenodd"
d="M4.25 5.5a.75.75 0 00-.75.75v8.5c0 .414.336.75.75.75h8.5a.75.75 0 00.75-.75v-4a.75.75 0 011.5 0v4A2.25 2.25 0 0112.75 17h-8.5A2.25 2.25 0 012 14.75v-8.5A2.25 2.25 0 014.25 4h5a.75.75 0 010 1.5h-5zm7.25-1.25a.75.75 0 01.75-.75h4.5a.75.75 0 01.75.75v4.5a.75.75 0 01-1.5 0V6.31l-5.72 5.72a.75.75 0 11-1.06-1.06l5.72-5.72h-2.69a.75.75 0 01-.75-.75z"
clipRule="evenodd"
/>
</svg>
</a>
{pr.state !== "OPEN" && (
<span className="text-[10px] px-1.5 py-0.5 rounded bg-purple-900/50 text-purple-300">
{pr.state.toLowerCase()}
</span>
)}
</div>
)}
</div>

{/* Changed files list */}
Expand Down Expand Up @@ -352,6 +442,7 @@
onClick={(e) => {
e.stopPropagation();
fetchStatus();
fetchPr();
}}
className="w-full flex items-center justify-center gap-2 px-3 py-1.5 text-xs text-[var(--color-text-secondary)] hover:text-[var(--color-text-primary)] hover:bg-[var(--color-bg-hover)] rounded transition-colors"
>
Expand Down
33 changes: 33 additions & 0 deletions server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,39 @@ async function handleRequest(req: IncomingMessage, res: ServerResponse) {
}
}

// API: Get PR info for a project's current branch
if (
pathname?.startsWith("/api/projects/") &&
pathname.endsWith("/pr") &&
method === "GET"
) {
const projectId = decodeURIComponent(
pathname.split("/api/projects/")[1].replace("/pr", ""),
);
if (!validateProjectId(projectId))
return json(res, { error: "Invalid project ID" }, 400);
const project = getProject(projectId);
if (!project) {
return json(res, { error: "Project not found" }, 404);
}

try {
const prJson = execSync("gh pr view --json url,number,title,state", {
cwd: project.path,
encoding: "utf-8",
timeout: 10000,
}).trim();
const pr = JSON.parse(prJson);
console.log(
`[api] PR info for ${projectId}: #${pr.number} (${pr.state})`,
);
return json(res, pr);
} catch {
console.log(`[api] No PR found for ${projectId}`);
return json(res, { error: "No PR found" }, 404);
}
}

// API: Worktree management
if (
pathname?.startsWith("/api/projects/") &&
Expand Down
Loading