Skip to content
Sign up

flagon-io/g1t

public
0
614 linesCodeBlameRaw

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.

Merge branch 'worktree-agent-aa68cf6ecc03dffaf'1/**
2 * Coordinating work, drawn: claims, harness sessions, dependencies,
3 * integration failures and decision records, as the issue page, the pull
4 * request page, the Work page and the why panel show them. What each says
5 * is worked out in lib/coordination.ts.
6 */
7import {
8 Activity,
9 ArrowRightLeft,
10 CircleCheck,
11 CircleDot,
12 CircleX,
13 GitBranch,
14 GitCommitHorizontal,
15 GitMerge,
16 Hand,
17 Layers,
18 Link2,
19 MessageSquare,
20 Pencil,
21 Play,
22 Square,
23 Timer,
24 TriangleAlert,
25} from "lucide-react";
26import { Fragment, type ReactNode } from "react";
27import { Form, Link } from "react-router";
28
29import type {
30 Blocker,
31 Claim,
32 Decision,
33 DecisionConfidence,
34 Harness,
35 SessionState,
36 State,
37 WorkContext,
38 WorkSession,
39} from "@g1t/contracts";
40
41import {
42 CLAIM_ENDED,
43 CONFIDENCE,
44 DECISION_KINDS,
45 type FeedLine,
46 SESSION_STATES,
47 checkHref,
48 evidenceOf,
49 expiresIn,
50 harnessName,
51 numberedParts,
52} from "../lib/coordination";
53import { Input, SubmitButton, TimeAgo } from "./ui";
54import { Alert, AlertDescription, AlertTitle } from "./ui/alert";
55import { Avatar } from "./ui/avatar";
56import { Badge, type BadgeTone } from "./ui/badge";
57import { Button } from "./ui/button";
58import { Card } from "./ui/card";
59import { Hint } from "./ui/hint";
60import { Label } from "./ui/label";
61import { Popover, PopoverContent, PopoverTrigger } from "./ui/popover";
62import { PersonLink } from "./work";
63import { IssueIcon } from "./work-icons";
64
65/** Text with each `#N` linked to that issue or pull request (the issue's address leads to a pull request too). */
66export function NumberedText({ text, base }: { text: string; base: string }) {
67 return (
68 <>
69 {numberedParts(text).map((part, index) =>
70 typeof part === "number" ? (
71 <Link key={index} to={`${base}/issues/${part}`} className="font-medium text-fg hover:text-accent">
72 #{part}
73 </Link>
74 ) : (
75 <Fragment key={index}>{part}</Fragment>
76 ),
77 )}
78 </>
79 );
80}
81
82/** The harness a session or claim came from. */
83export function HarnessBadge({ harness }: { harness: Harness | null | undefined }) {
84 const name = harnessName(harness);
85 if (!name) return null;
86 return <Badge>{name}</Badge>;
87}
88
89/** Who did it: an agent's avatar when it came through a harness (a person's token, the harness declared), else theirs. */
90export function Actor({ username, harness, size = 20 }: { username: string; harness?: Harness | null; size?: number }) {
91 return <Avatar name={username} size={size} agent={harness != null} />;
92}
93
94const SESSION_TONE: Record<SessionState, BadgeTone> = { active: "success", idle: "warn", ended: "neutral" };
95
96export function SessionStateBadge({ state }: { state: SessionState }) {
97 const { label, hint } = SESSION_STATES[state];
98 return (
99 <Hint label={hint}>
100 <Badge tone={SESSION_TONE[state]}>{label}</Badge>
101 </Hint>
102 );
103}
104
105/** How sure a decision is: claimed, tested and approved read apart at a glance. */
106export function ConfidenceBadge({ confidence }: { confidence: DecisionConfidence }) {
107 const { label, hint, tone } = CONFIDENCE[confidence];
108 const Icon = confidence === "approved" ? CircleCheck : confidence === "tested" ? Layers : MessageSquare;
109 return (
110 <Hint label={hint}>
111 <Badge tone={tone}>
112 <Icon size={11} />
113 {label}
114 </Badge>
115 </Hint>
116 );
117}
118
119/** One claim: who, from which harness, since when, and when it lapses; one no longer active is muted. */
120export function ClaimLine({ claim, now, showIssue, base }: { claim: Claim; now: number; showIssue?: boolean; base: string }) {
121 const active = claim.state === "active";
122 const left = expiresIn(claim, now);
123 return (
124 <div className={active ? "flex items-start gap-2.5" : "flex items-start gap-2.5 opacity-60"}>
125 <Actor username={claim.actor.username} harness={claim.harness} />
126 <div className="min-w-0 grow">
127 <p className="flex flex-wrap items-center gap-x-1.5 gap-y-1 text-sm">
128 <PersonLink name={claim.actor.username} className="font-medium hover:underline" />
129 {showIssue ? (
130 <span className="text-muted">
131 claimed{" "}
132 <Link to={`${base}/issues/${claim.issue}`} className="font-medium text-fg hover:text-accent">
133 #{claim.issue}
134 </Link>
135 </span>
136 ) : null}
137 <HarnessBadge harness={claim.harness} />
138 {!active && <Badge>{CLAIM_ENDED[claim.state as Exclude<Claim["state"], "active">]}</Badge>}
139 </p>
140 <p className="mt-0.5 flex flex-wrap items-center gap-x-1.5 text-xs text-muted">
141 <span>
142 since <TimeAgo at={claim.createdAt} />
143 </span>
144 {left && (
145 <span className="inline-flex items-center gap-1" suppressHydrationWarning>
146 · <Timer size={11} />
147 {left}
148 </span>
149 )}
150 {!active && claim.state === "handed_off" && <span>· to {claim.handoffTo ?? "anyone"}</span>}
151 </p>
152 {claim.note && <p className="mt-1 text-xs text-fg-soft">{claim.note}</p>}
153 </div>
154 </div>
155 );
156}
157
158/** One harness session: who, which harness, where it stands, when it was last heard from, linked to its page. */
159export function SessionLine({
160 session,
161 base,
162 showWhere = true,
163 showBranch = true,
164}: {
165 session: WorkSession;
166 base: string;
167 /** Its pull request and branch; not where they are already said. */
168 showWhere?: boolean;
169 /** Its branch; not in a narrow sidebar. */
170 showBranch?: boolean;
171}) {
172 return (
173 <div className="flex items-start gap-2.5">
174 <Actor username={session.actor.username} harness={session.harness} />
175 <div className="min-w-0 grow">
176 <p className="flex flex-wrap items-center gap-x-1.5 gap-y-1 text-sm">
177 <Link to={`${base}/work/sessions/${session.id}`} prefetch="intent" className="font-medium hover:text-accent">
178 {session.title ?? `${session.actor.username}'s session`}
179 </Link>
180 <HarnessBadge harness={session.harness} />
181 <SessionStateBadge state={session.state} />
182 </p>
183 <p className="mt-0.5 flex flex-wrap items-center gap-x-1.5 text-xs text-muted">
184 <PersonLink name={session.actor.username} className="hover:text-fg" />
185 <span>
186 · {session.state === "ended" ? "ended" : "last seen"} <TimeAgo at={session.endedAt ?? session.lastSeenAt} />
187 </span>
188 {showWhere && session.pull != null && (
189 <span>
190 · on{" "}
191 <Link to={`${base}/pull/${session.pull}`} className="text-fg hover:text-accent">
192 #{session.pull}
193 </Link>
194 </span>
195 )}
196 {showWhere && showBranch && session.branch && (
197 <span className="inline-flex min-w-0 items-center gap-1 font-mono">
198 · <GitBranch size={11} />
199 <span className="truncate">{session.branch}</span>
200 </span>
201 )}
202 </p>
203 </div>
204 </div>
205 );
206}
207
208const KIND_ICON: Record<Decision["kind"], ReactNode> = {
209 proposal: <MessageSquare size={14} />,
210 claim: <MessageSquare size={14} />,
211 integration_failure: <CircleX size={14} className="text-danger" />,
212 integration_passed: <Layers size={14} className="text-success" />,
213 fix: <Link2 size={14} className="text-accent" />,
214 approval: <CircleCheck size={14} className="text-success" />,
215 merge: <GitMerge size={14} className="text-merged" />,
216 note: <MessageSquare size={14} />,
217};
218
219/** The pull requests tested together, in queue order: `#41 + #44`. */
220export function Combination({ numbers, base, culprit }: { numbers: number[]; base: string; culprit?: number | null }) {
221 return (
222 <span className="inline-flex flex-wrap items-center gap-1">
223 {numbers.map((number, index) => (
224 <Fragment key={number}>
225 {index > 0 && <span className="text-faint">+</span>}
226 <Link to={`${base}/pull/${number}`}>
227 <Badge shape="tag" tone={number === culprit ? "danger" : "neutral"} className="font-mono hover:border-line-strong">
228 #{number}
229 </Badge>
230 </Link>
231 </Fragment>
232 ))}
233 </span>
234 );
235}
236
237/** The check a decision rests on, linked where it can be seen. */
238function CheckLink({ check }: { check: { name: string; conclusion: string; url: string | null } }) {
239 const href = checkHref(check.url);
240 const text = (
241 <>
242 <span className="font-mono">{check.name}</span> {check.conclusion}
243 </>
244 );
245 if (!href) return <span>{text}</span>;
246 return href.startsWith("/") ? (
247 <Link to={href} className="text-fg underline-offset-2 hover:underline">
248 {text}
249 </Link>
250 ) : (
251 <a href={href} className="text-fg underline-offset-2 hover:underline" rel="noreferrer" target="_blank">
252 {text}
253 </a>
254 );
255}
256
257/** One decision record: its kind, how sure it is, the sentence, who and when, and what it rests on. */
258export function DecisionLine({ decision, base }: { decision: Decision; base: string }) {
259 const evidence = evidenceOf(decision);
260 return (
261 <div className="flex items-start gap-2.5">
262 <span className="mt-0.5 shrink-0 text-faint">{KIND_ICON[decision.kind]}</span>
263 <div className="min-w-0 grow">
264 <p className="flex flex-wrap items-center gap-1.5 text-xs">
265 <span className="font-medium text-fg">{DECISION_KINDS[decision.kind]}</span>
266 <ConfidenceBadge confidence={decision.confidence} />
267 {decision.pull != null && (
268 <Link to={`${base}/pull/${decision.pull}`} className="text-muted hover:text-fg">
269 #{decision.pull}
270 </Link>
271 )}
272 </p>
273 <p className="mt-1 text-sm wrap-break-word">
274 <NumberedText text={decision.summary} base={base} />
275 </p>
276 <p className="mt-1 flex flex-wrap items-center gap-x-1.5 gap-y-1 text-xs text-muted">
277 <span>{decision.actor ?? "g1t"}</span>
278 <span>
279 · <TimeAgo at={decision.createdAt} />
280 </span>
281 {evidence.combination.length > 1 && (
282 <span className="inline-flex items-center gap-1.5">
283 · tested as <Combination numbers={evidence.combination} base={base} culprit={decision.kind === "integration_failure" ? decision.pull : null} />
284 </span>
285 )}
286 {evidence.check && decision.kind === "integration_failure" && (
287 <span>
288 · <CheckLink check={evidence.check} />
289 </span>
290 )}
291 {evidence.commit && (
292 <span className="inline-flex items-center gap-1 font-mono">
293 · <GitCommitHorizontal size={11} />
294 {evidence.commit.slice(0, 7)}
295 </span>
296 )}
297 </p>
298 </div>
299 </div>
300 );
301}
302
303/** Decision records, as a list in a card. */
304export function DecisionList({ decisions, base }: { decisions: Decision[]; base: string }) {
305 return (
306 <Card asChild divided>
307 <ol>
308 {decisions.map((decision) => (
309 <li key={decision.id} className="px-4 py-3">
310 <DecisionLine decision={decision} base={base} />
311 </li>
312 ))}
313 </ol>
314 </Card>
315 );
316}
317
318/**
319 * A combination that failed in the merge queue: which pull requests were
320 * tested together, the check that failed, which ones it fails with, and
321 * whether it has been answered since.
322 */
323export function IntegrationFailure({
324 failure,
325 base,
326 fixed,
327 branch = "main",
328 className,
329}: {
330 failure: Decision;
331 base: string;
332 /** The branch the combination was built on. */
333 branch?: string;
334 /** A fix or a passing combination since, when there is one. */
335 fixed?: Decision | null;
336 className?: string;
337}) {
338 const evidence = evidenceOf(failure);
339 return (
340 <Alert tone={fixed ? "info" : "danger"} className={className}>
341 <AlertTitle className="flex flex-wrap items-center gap-x-2 gap-y-1 text-fg">
342 {failure.pull != null ? (
343 <span>
344 <TriangleAlert size={15} className={`mr-2 inline align-[-3px] ${fixed ? "text-info" : "text-danger"}`} />
345 <Link to={`${base}/pull/${failure.pull}`} className="hover:underline">
346 #{failure.pull}
347 </Link>{" "}
348 failed in the merge queue {evidence.combination.length > 1 ? "together with others" : "on its own"}
349 </span>
350 ) : (
351 <span>A combination failed in the merge queue</span>
352 )}
353 <ConfidenceBadge confidence={failure.confidence} />
354 <span className="text-xs font-normal text-muted">
355 <TimeAgo at={failure.createdAt} />
356 </span>
357 </AlertTitle>
358 <AlertDescription className="space-y-1.5">
359 {evidence.combination.length > 0 && (
360 <p className="flex flex-wrap items-center gap-1.5 text-xs">
361 Tested as <span className="font-mono text-fg">{branch}</span> <span className="text-faint">+</span>
362 <Combination numbers={evidence.combination} base={base} culprit={failure.pull} />
363 </p>
364 )}
365 {evidence.check && (
366 <p className="text-xs">
367 Failing check: <CheckLink check={evidence.check} />
368 </p>
369 )}
370 <p className="text-xs">
371 {evidence.suspects.length > 0 ? (
372 <>
373 Fails with{" "}
374 <NumberedText text={evidence.suspects.map((n) => `#${n}`).join(", ")} base={base} />
375 {evidence.bisected ? ", narrowed down by building smaller combinations." : "."}
376 </>
377 ) : (
378 "It fails by itself: the change is the cause."
379 )}
380 </p>
381 {fixed && (
382 <p className="text-xs text-fg">
383 <CircleCheck size={13} className="mr-1.5 inline align-[-2px] text-success" />
384 {fixed.kind === "integration_passed" ? "Passed together since" : "Fixed since"}:{" "}
385 <span className="text-muted">
386 <NumberedText text={fixed.summary} base={base} />
387 </span>
388 </p>
389 )}
390 </AlertDescription>
391 </Alert>
392 );
393}
394
395const FEED_ICON: Record<FeedLine["type"], ReactNode> = {
396 "work.claimed": <Hand size={14} />,
397 "work.released": <Hand size={14} />,
398 "work.claim_expired": <Timer size={14} />,
399 "work.handoff_requested": <ArrowRightLeft size={14} />,
400 "session.started": <Play size={14} />,
401 "session.ended": <Square size={14} />,
402 "dependency.changed": <Link2 size={14} />,
403 "overlap.detected": <TriangleAlert size={14} />,
404 "integration.failed": <CircleX size={14} />,
405 "integration.passed": <Layers size={14} />,
406 "decision.recorded": <CircleDot size={14} />,
407};
408
409const FEED_TONE: Record<FeedLine["tone"], string> = {
410 neutral: "text-faint",
411 accent: "text-accent",
412 success: "text-success",
413 warn: "text-warn",
414 danger: "text-danger",
415 info: "text-info",
416};
417
418/** Recent coordination events, newest first, one line each. */
419export function CoordinationFeed({ lines, base }: { lines: FeedLine[]; base: string }) {
420 return (
421 <Card asChild divided>
422 <ol>
423 {lines.map((line) => (
424 <li key={line.id} className="flex items-start gap-3 px-4 py-2.5 text-sm">
425 <span className={`mt-0.5 shrink-0 ${FEED_TONE[line.tone]}`}>{FEED_ICON[line.type]}</span>
426 <p className="min-w-0 grow wrap-break-word text-muted">
427 <PersonLink name={line.who ?? "g1t"} className="font-medium text-fg hover:underline" />
428 {line.harness && <span className="text-faint"> via {harnessName(line.harness)}</span>}{" "}
429 <NumberedText text={line.text} base={base} />
430 </p>
431 <span className="shrink-0 text-xs text-faint">
432 <TimeAgo at={line.time} />
433 </span>
434 </li>
435 ))}
436 </ol>
437 </Card>
438 );
439}
440
441/** An issue's place among others: one it waits on, or one waiting on it. */
442function DependencyLine({ base, number, title, state, detail }: { base: string; number: number; title: string; state: State; detail?: ReactNode }) {
443 return (
444 <li className="flex items-start gap-2">
445 <span className="mt-0.5">
446 <IssueIcon issue={{ state, reason: null }} size={14} />
447 </span>
448 <span className="min-w-0 grow">
449 <Link to={`${base}/issues/${number}`} className="block truncate text-sm hover:text-accent">
450 {title} <span className="text-faint">#{number}</span>
451 </Link>
452 {detail && <span className="block text-xs text-muted">{detail}</span>}
453 </span>
454 </li>
455 );
456}
457
458/** Where a blocker stands, in a few words: landed, being worked on, or waiting. */
459export function blockerDetail(blocker: Blocker): string {
460 if (blocker.pulls.some((pull) => pull.status === "merged")) return "Merged";
461 if (blocker.state === "closed") return "Closed";
462 const open = blocker.pulls.filter((pull) => pull.status === "open" || pull.status === "draft");
463 const who = blocker.claims.map((claim) => claim.actor.username);
464 return [
465 who.length > 0 ? `Claimed by ${who.join(", ")}` : "Not claimed",
466 open.length > 0 ? `${open.length} pull ${open.length === 1 ? "request" : "requests"} open` : null,
467 ]
468 .filter(Boolean)
469 .join(" · ");
470}
471
472/** A part of the Work panel, under a rule. */
473function PanelPart({ title, action, children }: { title: ReactNode; action?: ReactNode; children: ReactNode }) {
474 return (
475 <div className="border-t border-line pt-3">
476 <div className="flex min-h-7 items-center justify-between gap-2">
477 <p className="text-xs font-medium text-muted">{title}</p>
478 {action}
479 </div>
480 <div className="mt-1.5">{children}</div>
481 </div>
482 );
483}
484
485/**
486 * The Work panel of an issue's sidebar: who has claimed it, the sessions on
487 * it, what it waits on and what waits on it, and for those who may, the
488 * blockers to change.
489 */
490export function IssueWorkPanel({
491 work,
492 ended,
493 base,
494 now,
495 canEdit,
496 error,
497}: {
498 work: WorkContext;
499 /** Claims on it that ended lately, shown muted. */
500 ended: Claim[];
501 base: string;
502 now: number;
503 canEdit: boolean;
504 error?: string | null;
505}) {
506 const open = work.issue.state === "open";
507 const sessions = work.sessions.slice(0, 5);
508 const waiting = work.blockedBy.filter((blocker) => blocker.state === "open").length;
509 return (
510 <Card asChild className="space-y-4 p-4">
511 <section aria-label="Work">
512 <h3 className="flex items-center gap-2 text-sm font-medium">
513 <Activity size={14} className="text-accent" />
514 Work
515 </h3>
516
517 <div className="space-y-3">
518 {work.claims.length === 0 && ended.length === 0 ? (
519 <p className="text-xs text-muted">
520 {open ? (
521 <>
522 Nobody has claimed it. Claim it from your harness, or with <code className="font-mono text-fg-soft">g1t work claim {work.issue.number}</code>.
523 </>
524 ) : (
525 "Nobody is working on it."
526 )}
527 </p>
528 ) : (
529 [...work.claims, ...ended.slice(0, 3)].map((claim) => <ClaimLine key={claim.id} claim={claim} now={now} base={base} />)
530 )}
531 {work.claims.length > 1 && (
532 <Alert tone="warn" className="flex items-start gap-1.5 px-2.5 py-1.5 text-xs">
533 <TriangleAlert size={13} className="mt-0.5 shrink-0 text-warn" />
534 {work.claims.length} claims stand on it: they may be doing the same work.
535 </Alert>
536 )}
537 </div>
538
539 {sessions.length > 0 && (
540 <PanelPart title="Sessions">
541 <ul className="space-y-3">
542 {sessions.map((session) => (
543 <li key={session.id}>
544 <SessionLine session={session} base={base} showBranch={false} />
545 </li>
546 ))}
547 </ul>
548 {work.sessions.length > sessions.length && (
549 <Link to={`${base}/work`} className="mt-2 inline-block text-xs text-muted hover:text-fg">
550 {work.sessions.length - sessions.length} more on the Work page
551 </Link>
552 )}
553 </PanelPart>
554 )}
555
556 <PanelPart
557 title={
558 <>
559 Blocked by
560 {waiting > 0 && <span className="text-warn"> · {waiting} open</span>}
561 </>
562 }
563 action={canEdit ? <BlockedByEditor current={work.issue.blockedBy} /> : undefined}
564 >
565 {work.blockedBy.length === 0 ? (
566 <p className="text-xs text-faint">Nothing. It can start now.</p>
567 ) : (
568 <ul className="space-y-2">
569 {work.blockedBy.map((blocker) => (
570 <DependencyLine key={blocker.number} base={base} number={blocker.number} title={blocker.title} state={blocker.state} detail={blockerDetail(blocker)} />
571 ))}
572 </ul>
573 )}
574 {error && <p className="mt-2 text-xs text-danger">{error}</p>}
575 </PanelPart>
576
577 {work.blocks.length > 0 && (
578 <PanelPart title="Blocks">
579 <ul className="space-y-2">
580 {work.blocks.map((issue) => (
581 <DependencyLine key={issue.number} base={base} number={issue.number} title={issue.title} state={issue.state} />
582 ))}
583 </ul>
584 </PanelPart>
585 )}
586 </section>
587 </Card>
588 );
589}
590
591/** Changing what an issue waits on: the whole list, as numbers. */
592function BlockedByEditor({ current }: { current: number[] }) {
593 return (
594 <Popover>
595 <PopoverTrigger asChild>
596 <Button variant="ghost" size="xs">
597 <Pencil size={12} />
598 Edit
599 </Button>
600 </PopoverTrigger>
601 <PopoverContent align="end">
602 <Form method="post" className="space-y-2.5">
603 <input type="hidden" name="action" value="blocked-by" />
604 <Label htmlFor="blocked-by">Blocked by</Label>
605 <Input id="blocked-by" name="blocked_by" defaultValue={current.map((n) => `#${n}`).join(", ")} placeholder="#12, #14" autoComplete="off" />
606 <p className="text-xs text-muted">Issues of this repository that have to land first. Leave it empty for none.</p>
607 <SubmitButton size="sm" match={{ action: "blocked-by" }} pending="Saving…">
608 Save
609 </SubmitButton>
610 </Form>
611 </PopoverContent>
612 </Popover>
613 );
614}

This file's history is long; its oldest lines are credited to the oldest commit read.