g1t/apps/web/app/routes/repo/queue.tsx
Pick any line to see why it is the way it is: the commit, the pull request and issue it came from, and what the agent was thinking.
| Agents as a team: lifecycle, merge queue, billing and a new shell | 1 | import { |
| 2 | Check, | |
| 3 | CircleDashed, | |
| 4 | GitCommitHorizontal, | |
| 5 | GitMerge, | |
| 6 | Layers, | |
| 7 | Loader2, | |
| 8 | Minus, | |
| 9 | X, | |
| 10 | } from "lucide-react"; | |
| 11 | import { useEffect } from "react"; | |
| 12 | import { Link, useRevalidator } from "react-router"; | |
| 13 | ||
| 14 | import type { QueueEntry, QueueState } from "@g1t/contracts"; | |
| 15 | ||
| 16 | import type { Route } from "./+types/queue"; | |
| 17 | import { Avatar, ButtonLink, EmptyState, TimeAgo } from "../../components/ui"; | |
| 18 | import { repos, work } from "../../lib/services.server"; | |
| 19 | import { getViewer, roleIn, unwrap } from "../../lib/session.server"; | |
| 20 | ||
| 21 | const REFRESH_MS = 4000; | |
| 22 | ||
| 23 | export function meta({ params }: Route.MetaArgs) { | |
| 24 | return [{ title: `Merge queue · ${params.owner}/${params.repo} · g1t` }]; | |
| 25 | } | |
| 26 | ||
| 27 | export async function loader({ params, context }: Route.LoaderArgs) { | |
| 28 | const viewer = getViewer(context); | |
| 29 | const path = { namespace: params.owner, name: params.repo }; | |
| 30 | const [queue, repo] = await Promise.all([work.queue(path, viewer), repos.get(path, viewer)]); | |
| 31 | return { | |
| 32 | queue: unwrap(queue), | |
| 33 | defaultBranch: unwrap(repo).defaultBranch, | |
| 34 | member: roleIn(viewer, params.owner) != null, | |
| 35 | }; | |
| 36 | } | |
| 37 | ||
| 38 | const STATE: Record<QueueState, { label: string; tone: string; icon: React.ReactNode }> = { | |
| 39 | waiting: { label: "Waiting", tone: "text-muted border-line", icon: <CircleDashed size={13} /> }, | |
| 40 | testing: { | |
| 41 | label: "Testing", | |
| 42 | tone: "text-accent border-accent/40 bg-accent/10", | |
| 43 | icon: <Loader2 size={13} className="animate-spin" />, | |
| 44 | }, | |
| 45 | passed: { label: "Passed", tone: "text-accent border-accent/40 bg-accent/10", icon: <Check size={13} /> }, | |
| 46 | failed: { label: "Failed", tone: "text-danger border-danger/40 bg-danger/10", icon: <X size={13} /> }, | |
| 47 | landed: { label: "Landed", tone: "text-merged border-merged/40 bg-merged/10", icon: <GitMerge size={13} /> }, | |
| 48 | removed: { label: "Removed", tone: "text-faint border-line", icon: <Minus size={13} /> }, | |
| 49 | }; | |
| 50 | ||
| 51 | function StateBadge({ state }: { state: QueueState }) { | |
| 52 | const { label, tone, icon } = STATE[state]; | |
| 53 | return ( | |
| 54 | <span className={`inline-flex shrink-0 items-center gap-1.5 rounded-full border px-2 py-0.5 text-xs ${tone}`}> | |
| 55 | {icon} | |
| 56 | {label} | |
| 57 | </span> | |
| 58 | ); | |
| 59 | } | |
| 60 | ||
| 61 | /** `main + #12 + #14`: the state an entry is being tested in. */ | |
| 62 | function TestedAs({ entry, branch }: { entry: QueueEntry; branch: string }) { | |
| 63 | return ( | |
| 64 | <span className="flex flex-wrap items-center gap-1 font-mono text-xs text-muted"> | |
| 65 | <span className="rounded border border-line px-1.5 py-px">{branch}</span> | |
| 66 | {[...entry.ahead, entry.number].map((number) => ( | |
| 67 | <span key={number} className="flex items-center gap-1"> | |
| 68 | <span className="text-faint">+</span> | |
| 69 | <span | |
| 70 | className={`rounded border px-1.5 py-px ${ | |
| 71 | number === entry.number ? "border-accent/40 text-fg" : "border-line" | |
| 72 | }`} | |
| 73 | > | |
| 74 | #{number} | |
| 75 | </span> | |
| 76 | </span> | |
| 77 | ))} | |
| 78 | </span> | |
| 79 | ); | |
| 80 | } | |
| 81 | ||
| 82 | function Entry({ entry, base, branch, position }: { entry: QueueEntry; base: string; branch: string; position?: number }) { | |
| 83 | const ran = entry.results.length; | |
| 84 | const passed = entry.results.filter((result) => result.passed).length; | |
| 85 | return ( | |
| 86 | <li className="relative pl-10"> | |
| 87 | {/* Its place on the rail. */} | |
| 88 | <span | |
| 89 | className={`absolute top-4 left-[13px] size-3 rounded-full border-2 ${ | |
| 90 | entry.state === "testing" | |
| 91 | ? "animate-pulse border-accent bg-accent/30" | |
| 92 | : entry.state === "passed" || entry.state === "landed" | |
| 93 | ? "border-accent bg-accent" | |
| 94 | : entry.state === "failed" | |
| 95 | ? "border-danger bg-danger" | |
| 96 | : "border-line-strong bg-bg" | |
| 97 | }`} | |
| 98 | /> | |
| 99 | <div className="rounded-xl border border-line bg-surface p-4 transition-colors hover:border-line-strong"> | |
| 100 | <div className="flex flex-wrap items-center gap-x-3 gap-y-2"> | |
| 101 | {position != null && <span className="font-mono text-xs text-faint">{position}</span>} | |
| 102 | <Link to={`${base}/pull/${entry.number}`} prefetch="intent" className="min-w-0 grow font-medium hover:text-accent"> | |
| 103 | {entry.title} <span className="font-normal text-faint">#{entry.number}</span> | |
| 104 | </Link> | |
| 105 | <StateBadge state={entry.state} /> | |
| 106 | </div> | |
| 107 | <div className="mt-2.5 flex flex-wrap items-center gap-x-4 gap-y-2 text-xs text-muted"> | |
| 108 | {(entry.state === "testing" || entry.state === "passed" || entry.state === "failed") && ( | |
| 109 | <TestedAs entry={entry} branch={branch} /> | |
| 110 | )} | |
| 111 | {ran > 0 && ( | |
| 112 | <span className={passed === ran ? "text-accent" : "text-danger"}> | |
| 113 | {passed}/{ran} checks passed | |
| 114 | </span> | |
| 115 | )} | |
| 116 | <span className="flex items-center gap-1.5"> | |
| 117 | <Avatar name={entry.agent} size={14} /> | |
| 118 | {entry.agent} | |
| 119 | </span> | |
| 120 | <span> | |
| 121 | queued by {entry.enqueuedBy} <TimeAgo at={entry.createdAt} /> | |
| 122 | </span> | |
| 123 | {entry.combinedCommit && ( | |
| 124 | <span className="flex items-center gap-1 font-mono"> | |
| 125 | <GitCommitHorizontal size={12} /> | |
| 126 | {entry.combinedCommit.slice(0, 7)} | |
| 127 | </span> | |
| 128 | )} | |
| 129 | </div> | |
| 130 | {entry.error && <p className="mt-2.5 text-xs text-danger">{entry.error}</p>} | |
| 131 | {entry.state === "failed" && | |
| 132 | entry.results | |
| 133 | .filter((result) => !result.passed) | |
| 134 | .slice(0, 2) | |
| 135 | .map((result) => ( | |
| 136 | <details key={result.command} className="mt-2"> | |
| 137 | <summary className="cursor-pointer font-mono text-xs text-danger">{result.command}</summary> | |
| Fix a hydration mismatch in output that starts with a blank line | 138 | <pre className="mt-1.5 max-h-48 overflow-auto rounded-lg bg-bg p-3 text-xs text-muted"><code>{result.output}</code></pre> |
| Agents as a team: lifecycle, merge queue, billing and a new shell | 139 | </details> |
| 140 | ))} | |
| 141 | </div> | |
| 142 | </li> | |
| 143 | ); | |
| 144 | } | |
| 145 | ||
| 146 | export default function Queue({ loaderData, params }: Route.ComponentProps) { | |
| 147 | const { queue, defaultBranch, member } = loaderData; | |
| 148 | const base = `/${params.owner}/${params.repo}`; | |
| 149 | const revalidator = useRevalidator(); | |
| 150 | const moving = queue.active.length > 0; | |
| 151 | useEffect(() => { | |
| 152 | if (!moving) return; | |
| 153 | const timer = setInterval(() => { | |
| 154 | if (document.visibilityState === "visible") revalidator.revalidate(); | |
| 155 | }, REFRESH_MS); | |
| 156 | return () => clearInterval(timer); | |
| 157 | }, [moving, revalidator]); | |
| 158 | ||
| 159 | const testing = queue.active.filter((entry) => entry.state !== "waiting").length; | |
| 160 | return ( | |
| 161 | <div className="max-w-4xl"> | |
| 162 | <div className="flex flex-wrap items-start justify-between gap-4"> | |
| 163 | <div> | |
| 164 | <h2 className="flex items-center gap-2 text-xl font-semibold tracking-tight"> | |
| 165 | <Layers size={19} className="text-accent" /> | |
| 166 | Merge queue | |
| 167 | </h2> | |
| 168 | <p className="mt-1.5 max-w-2xl text-sm text-muted"> | |
| 169 | Each pull request is tested together with everything ahead of it, several | |
| 170 | combinations at once, and {defaultBranch} only ever moves to a combination that | |
| 171 | passed. One that fails goes back to its author; the ones behind it are tested | |
| 172 | again without it. | |
| 173 | </p> | |
| 174 | </div> | |
| 175 | {member && ( | |
| 176 | <ButtonLink to={`${base}/settings`}>{queue.enabled ? "Settings" : "Turn it on"}</ButtonLink> | |
| 177 | )} | |
| 178 | </div> | |
| 179 | ||
| 180 | {!queue.enabled && queue.active.length === 0 && queue.recent.length === 0 ? ( | |
| 181 | <div className="mt-8"> | |
| 182 | <EmptyState title="This repository merges directly"> | |
| 183 | Turn on <b>Merge through a queue</b> in the repository's settings, and merging a | |
| 184 | pull request adds it here instead of changing {defaultBranch} at once. | |
| 185 | </EmptyState> | |
| 186 | </div> | |
| 187 | ) : ( | |
| 188 | <> | |
| 189 | <section className="mt-8"> | |
| 190 | <div className="flex items-baseline justify-between"> | |
| 191 | <h3 className="text-sm font-medium">In the queue</h3> | |
| 192 | <span className="text-xs text-muted"> | |
| 193 | {queue.active.length} waiting to land{testing > 0 && `, ${testing} being tested now`} | |
| 194 | </span> | |
| 195 | </div> | |
| 196 | <ol className="relative mt-3 space-y-3 before:absolute before:top-0 before:bottom-4 before:left-[18px] before:w-px before:bg-line"> | |
| 197 | <li className="relative flex items-center gap-2 pl-10 text-xs text-muted"> | |
| 198 | <span className="absolute left-[11px] flex size-4 items-center justify-center rounded-full bg-raised ring-1 ring-line-strong"> | |
| 199 | <GitCommitHorizontal size={10} /> | |
| 200 | </span> | |
| 201 | <span className="font-mono text-fg">{defaultBranch}</span> | |
| 202 | {queue.active[0]?.baseCommit && ( | |
| 203 | <span className="font-mono">at {queue.active[0].baseCommit.slice(0, 7)}</span> | |
| 204 | )} | |
| 205 | </li> | |
| 206 | {queue.active.map((entry, index) => ( | |
| 207 | <Entry key={entry.id} entry={entry} base={base} branch={defaultBranch} position={index + 1} /> | |
| 208 | ))} | |
| 209 | {queue.active.length === 0 && ( | |
| 210 | <li className="pl-10 text-sm text-muted">Nothing is waiting. Merged pull requests appear here.</li> | |
| 211 | )} | |
| 212 | </ol> | |
| 213 | </section> | |
| 214 | ||
| 215 | {queue.recent.length > 0 && ( | |
| 216 | <section className="mt-10"> | |
| 217 | <h3 className="text-sm font-medium">Recently</h3> | |
| 218 | <ol className="mt-3 space-y-3"> | |
| 219 | {queue.recent.map((entry) => ( | |
| 220 | <Entry key={entry.id} entry={entry} base={base} branch={defaultBranch} /> | |
| 221 | ))} | |
| 222 | </ol> | |
| 223 | </section> | |
| 224 | )} | |
| 225 | </> | |
| 226 | )} | |
| 227 | </div> | |
| 228 | ); | |
| 229 | } |