diff --git a/apps/web/src/build-view.css b/apps/web/src/build-view.css
index 9e5de6216..e9c513109 100644
--- a/apps/web/src/build-view.css
+++ b/apps/web/src/build-view.css
@@ -54,21 +54,196 @@
 	font-variant-numeric: tabular-nums;
 }
 
-.build-activity {
+/*
+ * The build's status card: title and count, what the agent is doing, one segment per task, then who
+ * started it, the machine it runs on and the action, under a rule that runs edge to edge.
+ */
+.build-card {
+	display: grid;
+	gap: calc(var(--spacing) * 3);
+	padding: calc(var(--spacing) * 3) calc(var(--spacing) * 4);
+	border: var(--edge-width) solid var(--color-edge);
+	border-radius: var(--radius-xl);
+	background: var(--color-inset);
+	font-size: var(--text-sm);
+}
+
+.build-card-top {
 	display: flex;
-	flex-wrap: wrap;
-	gap: var(--spacing) calc(var(--spacing) * 3);
-	margin: calc(var(--spacing) * 2) 0 0;
+	min-width: 0;
+	align-items: center;
+	gap: calc(var(--spacing) * 2);
+	margin: 0;
+}
+
+.build-card-title {
+	min-width: 0;
+	flex: 1;
+	color: var(--color-text-primary);
+	font-weight: var(--font-weight-medium);
+}
+
+.build-card-count {
+	flex: none;
+	color: var(--color-text-tertiary);
+	font-size: var(--text-xs);
+	font-variant-numeric: tabular-nums;
+}
+
+.build-card-detail {
+	display: flex;
+	min-width: 0;
+	margin: 0;
 	color: var(--color-text-secondary);
 	font-size: var(--text-xs);
-	overflow-wrap: anywhere;
 }
 
-.build-activity time {
+/* The activity line sits close under the title, above the segments. */
+.build-card-top + .build-card-detail {
+	margin-block-start: calc(var(--spacing) * -2);
+}
+
+.build-card-ticker {
+	min-width: 0;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.build-card-check {
+	width: var(--icon-size-default);
+	height: var(--icon-size-default);
+	flex: none;
+	color: var(--color-success-icon);
+}
+
+/* A build that is live breathes; the words beside it say what it is doing. */
+@keyframes build-card-breathe {
+	50% {
+		opacity: var(--opacity-quiet);
+	}
+}
+
+/* One segment per task: green when done, and green with a soft lighter sweep while it runs. */
+@keyframes build-card-sweep {
+	from {
+		background-position: 100% 0;
+	}
+	to {
+		background-position: -100% 0;
+	}
+}
+
+.build-card-segments {
+	display: flex;
+	gap: var(--spacing);
+}
+
+.build-card-segments > span {
+	height: var(--spacing);
+	flex: 1;
+	border-radius: var(--radius-full);
+	background: var(--color-selected-strong);
+	transition: background-color var(--duration-base) var(--ease-out);
+}
+
+.build-card-segments > span:is([data-state="completed"], [data-state="in_progress"]) {
+	background: var(--color-success-graphic);
+}
+
+.build-card-segments > span[data-state="blocked"] {
+	background: var(--color-warning-graphic);
+}
+
+@media (prefers-reduced-motion: no-preference) {
+	.build-card-spin {
+		animation: button-loader-spin calc(var(--duration-base) * 4) linear infinite;
+	}
+
+	.build-card-ticker {
+		animation: build-fade var(--duration-linger) var(--ease-out);
+	}
+
+	.build-card .build-glyph[data-live] {
+		animation: build-card-breathe calc(var(--duration-linger) * 6) var(--motion-move) infinite;
+	}
+
+	.build-card-segments > span[data-state="in_progress"] {
+		background: linear-gradient(
+			90deg,
+			var(--color-success-graphic) 0%,
+			var(--color-success-graphic) 30%,
+			color-mix(in srgb, var(--color-success-graphic) 55%, var(--color-page)) 50%,
+			var(--color-success-graphic) 70%,
+			var(--color-success-graphic) 100%
+		);
+		background-size: 250% 100%;
+		animation: build-card-sweep calc(var(--duration-linger) * 8) linear infinite;
+	}
+}
+
+.build-card-foot {
+	display: flex;
+	flex-wrap: wrap;
+	align-items: center;
+	gap: calc(var(--spacing) * 3) calc(var(--spacing) * 5);
+	margin-inline: calc(var(--spacing) * -4);
+	padding: calc(var(--spacing) * 3) calc(var(--spacing) * 4) 0;
+	border-block-start: var(--edge-width) solid var(--color-edge);
+	font-size: var(--text-xs);
+}
+
+.build-card-person,
+.build-card-machine {
+	display: inline-flex;
+	min-width: 0;
+	align-items: center;
+	gap: calc(var(--spacing) * 2);
+}
+
+.build-card-person-name {
+	color: var(--color-text-secondary);
+	font-weight: var(--font-weight-medium);
+}
+
+.build-card-quiet {
 	color: var(--color-text-tertiary);
 	font-variant-numeric: tabular-nums;
 }
 
+.build-card-machine {
+	color: var(--color-text-secondary);
+}
+
+.build-card-machine-name {
+	min-width: 0;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+/* A 6px state dot, smaller than the shared glyph's, ringed in the card's inset surface. */
+.build-card-machine .machine-glyph-dot {
+	width: calc(var(--spacing) * 1.5);
+	height: calc(var(--spacing) * 1.5);
+	right: calc(var(--spacing) * -0.75);
+	bottom: calc(var(--spacing) * -0.75);
+	border-width: calc(var(--spacing) * 0.375);
+	border-color: var(--color-inset);
+}
+
+/* Stop's square, drawn in the button's ink. */
+.build-card-stop {
+	width: calc(var(--spacing) * 2);
+	height: calc(var(--spacing) * 2);
+	flex: none;
+	background: currentColor;
+}
+
+.build-card + .build-tasks {
+	margin-block-start: calc(var(--spacing) * 6);
+}
+
 /* Tasks drafted for an earlier revision stay readable but recede. */
 .build-tasks[data-stale] {
 	opacity: var(--opacity-quiet);
diff --git a/apps/web/src/build-view.tsx b/apps/web/src/build-view.tsx
index 97173b0d6..1a21ddeb7 100644
--- a/apps/web/src/build-view.tsx
+++ b/apps/web/src/build-view.tsx
@@ -1,4 +1,12 @@
-import { CheckIcon } from "@chopin/icons";
+import { Face } from "@chopin/editor/face";
+import {
+	CheckIcon,
+	LoaderIcon,
+	MachineIcon,
+	ProgressRingIcon,
+	ServerIcon,
+	WarningIcon,
+} from "@chopin/icons";
 import { useEffect, useId, useState } from "react";
 
 import { BuildGlyph } from "./build-plan-button";
@@ -10,7 +18,6 @@ import {
 	buildLabel,
 	buildPhase,
 	buildProgress,
-	elapsed,
 	linkParts,
 	liveTaskGroups,
 	liveTaskState,
@@ -18,7 +25,6 @@ import {
 	pullRequestCommits,
 	pullRequestNumber,
 	retryAction,
-	startedBy,
 	TASK_STATE_LABEL,
 	taskStartsOpen,
 	unfinishedReason,
@@ -30,10 +36,58 @@ import {
 	stopBuild,
 } from "./build-start";
 import { LocalAgentNote } from "./local-agent-note";
+import { MachineGlyph } from "./machine-button";
 
 import type { ReactNode } from "react";
 import type { BuildPlan } from "./build-plan-button";
 import type { TaskState } from "./build-model";
+import type { BuildMachine, BuildRequest } from "@chopin/protocol/implementation";
+
+/** What the status card says: a title and count, one line under it, and per-task progress. */
+type Card = {
+	title: string;
+	count?: string;
+	glyph?: ReactNode;
+	detail?: ReactNode;
+	/** What the coding agent says it is doing now, in place of `detail`. */
+	activity?: string;
+	segments?: TaskState[];
+};
+
+function CardSpinner() {
+	return (
+		<span aria-hidden="true" className="build-glyph">
+			<LoaderIcon aria-hidden="true" className="build-glyph-quiet build-card-spin" />
+		</span>
+	);
+}
+
+/**
+ * The machine a build runs on, as everyone sees it. Only its starter is told whether it is
+ * online, so the state dot shows only for them.
+ */
+function MachineLabel({ machine }: { machine: BuildMachine }) {
+	let Icon = machine.service ? ServerIcon : MachineIcon;
+	return (
+		<span
+			className="build-card-machine"
+			title={machine.connected === false ? `${machine.label} is offline` : undefined}
+		>
+			{machine.connected === undefined
+				? (
+					<span aria-hidden="true" className="machine-glyph">
+						<Icon size={16} />
+					</span>
+				)
+				: (
+					<MachineGlyph
+						machine={{ service: machine.service, connected: machine.connected, reauthorize: false }}
+					/>
+				)}
+			<span className="build-card-machine-name">{machine.label}</span>
+		</span>
+	);
+}
 
 function sentence(text: string): string {
 	return text.replace(/^[a-z]/, letter => letter.toUpperCase());
@@ -145,96 +199,162 @@ export function BuildView(
 		&& !(phase.kind === "blocked" && phase.stale)
 		&& !(phase.kind === "drafting" && !staleTasks);
 
-	let status: ReactNode;
+	let outstanding = new Set(snapshot?.live?.outstandingTasks?.map(task => task.id));
+	let rebuilding = phase.kind === "live" && phase.sync.kind === "building";
+	let reportFor = (task: (typeof tasks)[number]) =>
+		phase.kind === "live"
+			? snapshot?.live?.tasks.find(item => item.id === task.id)?.progress
+			: progress?.tasks.find(item => item.id === task.id);
+	let stateFor = (task: (typeof tasks)[number], report = reportFor(task)): TaskState =>
+		phase.kind === "live"
+			? liveTaskState(report?.state ?? "queued", outstanding.has(task.id), rebuilding)
+			: report?.state ?? "queued";
+
 	let action: ReactNode;
-	let since: string | undefined;
-	if (phase.kind === "loading") {
-		status = loadError
-			? <span className="text-destructive-ink">{sentence(loadError)}</span>
-			: <span className="sr-only">Loading tasks</span>;
-	} else if (look.kind === "plan") {
-		// Built before, now back in planning: Build plan in the header builds it again.
-		if (phase.kind === "blocked") {
-			status = phase.decisions || phase.comments
-				? (
-					<span className="build-blockers">
-						{phase.decisions && (
-							<button className="build-link link" onClick={onShowDecisions} type="button">
-								{unanswered > 0
-									? `Answer ${plural(unanswered, "decision", "decisions")} first`
-									: "Answer the open decisions first"}
-							</button>
-						)}
-						{phase.comments && (
-							<button className="build-link link" onClick={onShowDocument} type="button">
-								{comments > 0
-									? `Update the document for ${
-										plural(comments, "accepted comment", "accepted comments")
-									} first`
-									: "Update the document for accepted comments first"}
-							</button>
-						)}
-					</span>
-				)
-				: "This document can’t be built yet.";
-		} else if (phase.kind === "drafting" && phase.draft === "returned") {
-			status = "Returned for changes. Build plan builds it again.";
-		} else if (phase.kind === "review") {
-			status = plural(tasks.length, "task", "tasks");
-		} else {
-			status = "Not built yet.";
+	function statusCard(): Card {
+		if (look.kind === "plan") {
+			// Built before, now back in planning: Build plan in the header builds it again.
+			if (phase.kind === "blocked") {
+				return {
+					title: "Waiting to build",
+					glyph: <span aria-hidden="true" className="build-glyph-dot" data-tone="warning" />,
+					detail: phase.decisions || phase.comments
+						? (
+							<span className="build-blockers">
+								{phase.decisions && (
+									<button className="build-link link" onClick={onShowDecisions} type="button">
+										{unanswered > 0
+											? `Answer ${plural(unanswered, "decision", "decisions")} first`
+											: "Answer the open decisions first"}
+									</button>
+								)}
+								{phase.comments && (
+									<button className="build-link link" onClick={onShowDocument} type="button">
+										{comments > 0
+											? `Update the document for ${
+												plural(comments, "accepted comment", "accepted comments")
+											} first`
+											: "Update the document for accepted comments first"}
+									</button>
+								)}
+							</span>
+						)
+						: "This document can’t be built yet.",
+				};
+			}
+			if (phase.kind === "drafting" && phase.draft === "returned") {
+				return { title: "Returned for changes", detail: "Build plan builds it again." };
+			}
+			return {
+				title: "Not built yet",
+				...(phase.kind === "review" ? { count: plural(tasks.length, "task", "tasks") } : {}),
+			};
 		}
-	} else {
-		let label = buildLabel(look);
-		let detail: string | undefined;
 		if (look.kind === "tasks") {
-			label = "Breaking the document into tasks…";
-			detail = look.tip === "Breaking the document into tasks" ? undefined : look.tip;
-		} else if (look.kind === "building") {
-			// A queued build has not started, so it has no time to count.
-			since = snapshot?.build && snapshot.build.state !== "queued"
-				? elapsed(snapshot.build.createdAt, now)
-				: undefined;
-			let who = startedBy(snapshot, userId);
-			detail = snapshot?.waitingForDocument || snapshot?.waitingForPrototype
-				? look.tip
-				: who && `started by ${who === "you" ? who : `@${who}`}`;
-		} else if (look.kind === "built") {
-			label = `Built ${plural(look.pullRequests, "pull request", "pull requests")}`;
+			return {
+				title: "Preparing tasks",
+				glyph: <CardSpinner />,
+				detail: look.tip === "Breaking the document into tasks" ? undefined : look.tip,
+			};
+		}
+		let states = tasks.map(task => stateFor(task));
+		let done = states.filter(state => state === "completed").length;
+		let count = tasks.length
+			? `${done} of ${plural(tasks.length, "task", "tasks")}`
+			: undefined;
+		let base = { count, segments: states, activity: activeBuild?.activity?.text };
+		if (look.kind === "building") {
+			let queued = activeBuild?.state === "queued";
+			return {
+				...base,
+				title: stopping ? "Stopping" : queued ? "Queued" : "Building",
+				glyph: queued
+					? <CardSpinner />
+					: (
+						<span aria-hidden="true" className="build-glyph" data-live="">
+							<ProgressRingIcon progress={Math.max(look.done / look.total, 0.08)} />
+						</span>
+					),
+				detail: snapshot?.waitingForDocument || snapshot?.waitingForPrototype
+					? look.tip
+					: undefined,
+			};
+		}
+		if (look.kind === "rebuilding") {
+			return {
+				...base,
+				title: stopping ? "Stopping" : "Building changes",
+				glyph: <CardSpinner />,
+				detail: look.tip,
+			};
+		}
+		if (look.kind === "built") {
 			let commits = snapshot?.live?.commits.length ?? 0;
-			detail = commits > 0
-				? `${plural(commits, "commit", "commits")} since first build`
-				: undefined;
-		} else if (look.kind === "agent") {
-			// The note below says how to start the agent.
-			detail = undefined;
-		} else if (
-			look.kind === "failed" && phase.kind === "live" && phase.sync.kind === "needs-attention"
-		) {
-			// The blocked row below shows the blocker, so the headline only says what to do.
-			detail = attentionHint(snapshot, true) ?? look.tip;
-		} else {
-			detail = look.tip;
+			return {
+				...base,
+				title: "Built",
+				count: plural(look.pullRequests, "pull request", "pull requests"),
+				glyph: <CheckIcon aria-hidden="true" className="build-card-check" />,
+				detail: commits > 0
+					? `${plural(commits, "commit", "commits")} since first build`
+					: undefined,
+			};
 		}
-		status = (
-			<>
-				<BuildGlyph look={look} />
-				<span className="flex min-w-0 flex-1 flex-wrap items-baseline gap-x-2">
-					{label}
-					{detail && (
-						<>
-							{" "}
-							<span className="text-text-tertiary">{detail}</span>
-						</>
-					)}
-				</span>
-			</>
-		);
+		if (look.kind === "stopped" || look.kind === "failed" || look.kind === "agent") {
+			return {
+				...base,
+				title: look.kind === "failed" && phase.kind === "live"
+					? "Rebuild failed"
+					: buildLabel(look),
+				glyph: (
+					<span aria-hidden="true" className="build-glyph">
+						<WarningIcon aria-hidden="true" className="build-glyph-warning" />
+					</span>
+				),
+				// The note below says how to start the agent; a blocked row shows the blocker.
+				detail: look.kind === "agent"
+					? undefined
+					: look.kind === "failed" && phase.kind === "live"
+							&& phase.sync.kind === "needs-attention"
+					? attentionHint(snapshot, true) ?? look.tip
+					: look.tip,
+			};
+		}
+		return {
+			...base,
+			title: buildLabel(look),
+			glyph: <BuildGlyph look={look} />,
+			detail: look.tip,
+		};
 	}
+
+	let card = phase.kind === "loading" ? undefined : statusCard();
+
+	// The build the card's footer names: the one running, else the last that ran.
+	let shown: Pick<BuildRequest, "id" | "user" | "state"> & { createdAt?: string } | undefined =
+		look.kind === "plan" || look.kind === "tasks"
+			? undefined
+			: activeBuild ?? (phase.kind === "live" && snapshot?.live
+				? snapshot.live.rebuild
+					?? (snapshot.build?.id === snapshot.live.buildId
+						? snapshot.build
+						: { id: snapshot.live.buildId, user: snapshot.live.user, state: "stopped" })
+				: snapshot?.build);
+	let login = shown && (
+		shown.id === snapshot?.build?.id
+			? snapshot.startedBy
+			: shown.user === snapshot?.live?.user
+			? snapshot.builtBy
+			: undefined
+	);
+	let machine = shown && snapshot?.buildMachines?.[shown.id];
+	// A queued build has not started, so it has no time to show.
+	let when = shown?.createdAt && shown.state !== "queued" ? ago(shown.createdAt, now) : undefined;
+
 	if (phase.kind === "stopped" && canEdit && !returning) {
 		action = (
 			<button
-				className="btn btn-md btn-outline shrink-0"
+				className="btn btn-sm btn-outline shrink-0"
 				onClick={() => setReturning(true)}
 				type="button"
 			>
@@ -246,7 +366,7 @@ export function BuildView(
 	if (phase.kind === "blocked" && canEdit && userId && snapshot?.buildRequested?.by === userId) {
 		action = (
 			<button
-				className="btn btn-md btn-outline shrink-0"
+				className="btn btn-sm btn-outline shrink-0"
 				onClick={() => {
 					setActionError(undefined);
 					cancelBuildRequest(room).then(
@@ -265,7 +385,8 @@ export function BuildView(
 		action = (
 			<button
 				aria-busy={stopping || undefined}
-				className="btn btn-md btn-outline shrink-0"
+				aria-label="Stop build"
+				className="btn btn-sm btn-ghost shrink-0"
 				disabled={stopping}
 				onClick={() => {
 					setActionError(undefined);
@@ -278,7 +399,10 @@ export function BuildView(
 				}}
 				type="button"
 			>
-				Stop build
+				{stopping
+					? <LoaderIcon aria-hidden="true" className="build-card-spin" />
+					: <span aria-hidden="true" className="build-card-stop" />}
+				{stopping ? "Stopping" : "Stop"}
 			</button>
 		);
 	}
@@ -287,18 +411,12 @@ export function BuildView(
 	// A built document lists the tasks its later rebuilds added under their own heading.
 	let groups = phase.kind === "live" ? liveTaskGroups(tasks) : { first: tasks, since: [] };
 	let noChange = phase.kind === "live" ? [...(snapshot?.live?.noChange ?? [])].toReversed() : [];
-	let outstanding = new Set(snapshot?.live?.outstandingTasks?.map(task => task.id));
-	let rebuilding = phase.kind === "live" && phase.sync.kind === "building";
 	let renderTask = (task: (typeof tasks)[number]) => {
-		let report = phase.kind === "live"
-			? snapshot?.live?.tasks.find(item => item.id === task.id)?.progress
-			: progress?.tasks.find(item => item.id === task.id);
+		let report = reportFor(task);
 		let url = report?.pullRequest?.url;
 		let commits = url && !listed.has(url) ? pullRequestCommits(snapshot, url) : [];
 		if (url) listed.add(url);
-		let state: TaskState = phase.kind === "live"
-			? liveTaskState(report?.state ?? "queued", outstanding.has(task.id), rebuilding)
-			: report?.state ?? "queued";
+		let state = stateFor(task, report);
 		// A task the build left unfinished says why where a blocked one shows its blocker.
 		let stopped = phase.kind === "live" && outstanding.has(task.id) && !report?.blocker
 				&& state === "blocked"
@@ -332,27 +450,63 @@ export function BuildView(
 	return (
 		<div className="build-view">
 			<div className="build-view-content" data-build-view-scroll="">
-				<div className="build-status">
-					<p
-						aria-live={phase.kind === "blocked" ? undefined : "polite"}
-						className="build-status-line"
-					>
-						{status}
+				{phase.kind === "loading" && (
+					<p className="build-status-line">
+						{loadError
+							? <span className="text-destructive-ink">{sentence(loadError)}</span>
+							: <span className="sr-only">Loading tasks</span>}
 					</p>
-					{/* Outside the live region, so a ticking clock is not announced. */}
-					{since && <span className="build-elapsed">{since}</span>}
-					{action}
-				</div>
-				{activeBuild?.activity && (
-					<p className="build-activity">
-						<span aria-live="polite">{activeBuild.activity.text}</span>
-						<time
-							dateTime={activeBuild.activity.at}
-							title={new Date(activeBuild.activity.at).toLocaleString()}
+				)}
+				{card && (
+					<div className="build-card">
+						<p
+							aria-live={phase.kind === "blocked" ? undefined : "polite"}
+							className="build-card-top"
 						>
-							Updated {ago(activeBuild.activity.at, now)}
-						</time>
-					</p>
+							{card.glyph}
+							<span className="build-card-title">{card.title}</span>
+							{card.count && <span className="build-card-count">{card.count}</span>}
+						</p>
+						{(card.activity ?? card.detail) && (
+							<p className="build-card-detail">
+								{card.activity
+									? (
+										<span aria-live="polite" className="build-card-ticker" key={card.activity}>
+											{card.activity}
+										</span>
+									)
+									: typeof card.detail === "string"
+									? <span className="build-card-ticker" key={card.detail}>{card.detail}</span>
+									: card.detail}
+							</p>
+						)}
+						{card.segments && card.segments.length > 0 && (
+							<div aria-hidden="true" className="build-card-segments">
+								{card.segments.map((state, index) => <span data-state={state} key={index} />)}
+							</div>
+						)}
+						{(login || machine || action) && (
+							<footer className="build-card-foot">
+								{login && shown && (
+									<span className="build-card-person">
+										<Face decorative handle={login} size={18} titled={false} />
+										<span className="build-card-person-name">
+											{shown.user === userId ? "You" : `@${login}`}
+										</span>
+										{/* Outside the live region, so a ticking clock is not announced. */}
+										{when && (
+											<span className="build-card-quiet">
+												{look.kind === "built" ? `built ${when}` : when}
+											</span>
+										)}
+									</span>
+								)}
+								{machine && <MachineLabel machine={machine} />}
+								<span className="flex-1" />
+								{action}
+							</footer>
+						)}
+					</div>
 				)}
 				{(build.needsAgent || snapshot?.localAgent === false && look.kind === "stopped") && (
 					<div className="mt-3">
diff --git a/e2e/implementation-launcher.e2e.ts b/e2e/implementation-launcher.e2e.ts
index 1cec27264..8f873bd74 100644
--- a/e2e/implementation-launcher.e2e.ts
+++ b/e2e/implementation-launcher.e2e.ts
@@ -248,7 +248,6 @@ for (let width of [1280, 390]) {
 			await page.getByRole("button", { name: "Build", exact: true }).click();
 			let view = page.getByRole("region", { name: "Build", exact: true });
 			await expect(view.getByText("Running server tests", { exact: true })).toBeVisible();
-			await expect(view.getByText(/^Updated /)).toBeVisible();
 			let stop = view.getByRole("button", { name: "Stop build", exact: true });
 			await expect(stop).toBeInViewport({ ratio: 1 });
 			await stop.focus();
@@ -349,7 +348,8 @@ for (let mode of ["block", "complete", "startup-failure", "live"] as const) {
 			let blocked = view.getByRole("button", { name: /^Connect the local agent/ });
 			let dependent = view.getByRole("button", { name: /^Review the connection/ });
 			if (mode === "complete") {
-				await expect(view).toContainText("Built 2 pull requests");
+				await expect(view.getByText("Built", { exact: true })).toBeVisible();
+				await expect(view.getByText("2 pull requests", { exact: true })).toBeVisible();
 				await expect(view.getByRole("link", { name: /^Pull request #\d+/ })).toHaveCount(2);
 				await expect(blocked).toHaveAttribute("aria-expanded", "false");
 				// The tasks the connector started, completed and opened pull requests for show under
@@ -379,7 +379,7 @@ for (let mode of ["block", "complete", "startup-failure", "live"] as const) {
 			);
 			await openBuild();
 			await expect(view).toContainText(
-				mode === "complete" ? "Built 2 pull requests" : "Blocked: Choose the next tracer",
+				mode === "complete" ? "2 pull requests" : "Blocked: Choose the next tracer",
 			);
 			if (
 				process.env.CHOPIN_LAUNCHER_SCREENSHOT
@@ -393,7 +393,8 @@ for (let mode of ["block", "complete", "startup-failure", "live"] as const) {
 					"Choose the next tracer before continuing.",
 				);
 				await view.getByRole("button", { name: "Return to planning", exact: true }).click();
-				await expect(view).toContainText("Returned for changes. Build plan builds it again.");
+				await expect(view.getByText("Returned for changes", { exact: true })).toBeVisible();
+				await expect(view.getByText("Build plan builds it again.", { exact: true })).toBeVisible();
 				await page.getByRole("group", { name: "Document view" })
 					.getByRole("button", { name: "Document", exact: true }).click();
 				await expect(content(page)).toHaveAttribute("contenteditable", "true");
@@ -747,7 +748,10 @@ test("a build in progress shows who started it and offers no action", async ({ s
 		await expect(view).toBeVisible();
 		// The capsule stays while its own view is open.
 		await expect(capsule).toBeVisible();
-		await expect(view.getByText(/^Building 0 of 2 started by you/)).toBeVisible();
+		// A build waiting for its agent to pick it up reads as queued.
+		await expect(view.getByText(/^(Building|Queued)$/)).toBeVisible();
+		await expect(view.getByText("0 of 2 tasks", { exact: true })).toBeVisible();
+		await expect(view.getByText("You", { exact: true })).toBeVisible();
 		await expect(view.getByRole("button", { name: /Retry|Return to planning/ })).toHaveCount(0);
 		await expect(view.getByRole("list", { name: "Tasks" }).locator(":scope > li")).toHaveCount(2);
 		let snapshot = await (await page.request.get(`/api/channels/${room}/implementation`)).json();