Harden web build continuity and progress

Author: halfaipg

src/projects/cli.test.ts

@@ -38,6 +38,7 @@ function fakeClient(
 					sessionId: "sess-1",
 					projectId: "proj-1",
 					status: "building",
+					continued: !!input.projectId,
 					model: "codebase/d4f",
 				}
 			);
@@ -185,6 +186,23 @@ describe("runProjectSubcommand", () => {
 		expect(result.stdout.join("\n")).toContain("codebase project status sess-1");
 	});
 
+	it("cancels when the web API does not confirm requested project continuity", async () => {
+		const cancelled: string[] = [];
+		const client = fakeClient({
+			build: { sessionId: "wrong-session", projectId: "wrong-project", status: "building" },
+			onCancelBuild: (sessionId) => cancelled.push(sessionId),
+		});
+
+		const result = await runProject(
+			["project", "build", "--project", "proj-1", "Fix", "the", "existing", "app"],
+			client,
+		);
+
+		expect(result.code).toBe(1);
+		expect(result.stderr.join("\n")).toContain("did not confirm continuation of project proj-1");
+		expect(cancelled).toEqual(["wrong-session"]);
+	});
+
 	it("explains payment challenges from the web build endpoint", async () => {
 		const client = {
 			startBuild: async () => {
@@ -219,6 +237,48 @@ describe("runProjectSubcommand", () => {
 		expect(result.stdout.join("\n")).toContain("preview: https://codebase.design/preview/proj-1");
 	});
 
+	it("streams deduplicated file and phase progress while waiting", async () => {
+		let calls = 0;
+		const statuses: BuildStatusResponse[] = [
+			{
+				sessionId: "sess-1",
+				status: "building",
+				filesCreated: ["index.html", "index.html"],
+				timeline: [{ phase: "scaffold-copy", durationMs: 1250, success: true }],
+			},
+			{
+				sessionId: "sess-1",
+				status: "building",
+				filesCreated: ["index.html"],
+				timeline: [{ phase: "scaffold-copy", durationMs: 1250, success: true }],
+			},
+			{
+				sessionId: "sess-1",
+				status: "completed",
+				filesCreated: ["index.html", "styles.css", "styles.css"],
+				timeline: [
+					{ phase: "scaffold-copy", durationMs: 1250, success: true },
+					{ phase: "validation", skippedReason: "not-needed" },
+				],
+			},
+		];
+		const client = fakeClient({
+			status: statuses[0],
+			preview: { ok: true, previewPath: "/preview/proj-1" },
+		}) as ProjectClient;
+		client.getBuildStatus = async () => statuses[Math.min(calls++, statuses.length - 1)]!;
+
+		const result = await runProject(["project", "build", "--wait", "Build", "a", "demo"], client);
+		const output = result.stdout.join("\n");
+
+		expect(result.code).toBe(0);
+		expect(output.match(/wrote:\s+index\.html/g)).toHaveLength(1);
+		expect(output.match(/wrote:\s+styles\.css/g)).toHaveLength(1);
+		expect(output).toContain("phase:   scaffold-copy 1.3s [ok]");
+		expect(output).toContain("phase:   validation [skipped: not-needed]");
+		expect(output).toContain("still building (1 file, 1 phase)");
+	});
+
 	it("backs off and keeps waiting when build status is rate limited", async () => {
 		let calls = 0;
 		const sleeps: number[] = [];
@@ -265,10 +325,20 @@ describe("runProjectSubcommand", () => {
 	it("shows build status and cancel controls", async () => {
 		const status = await runProject(
 			["project", "status", "sess-1"],
-			fakeClient({ status: { sessionId: "sess-1", status: "failed", projectId: "proj-1" } }),
+			fakeClient({
+				status: {
+					sessionId: "sess-1",
+					status: "failed",
+					projectId: "proj-1",
+					filesCreated: ["index.html", "index.html"],
+					timeline: [{ phase: "validation", durationMs: 42, success: false }],
+				},
+			}),
 		);
 		expect(status.code).toBe(1);
 		expect(status.stdout.join("\n")).toContain("build sess-1: failed");
+		expect(status.stdout.join("\n")).toContain("files:   index.html");
+		expect(status.stdout.join("\n")).toContain("phase:   validation 42ms [failed]");
 
 		const cancel = await runProject(
 			["project", "cancel", "sess-1"],

src/projects/cli.ts

@@ -294,6 +294,13 @@ async function buildCmd(
 		scaffold: opts.scaffold,
 		projectId: opts.projectId,
 	});
+	if (opts.projectId && started.continued !== true) {
+		await client.cancelBuild(started.sessionId).catch(() => undefined);
+		throw new ProjectClientError(
+			`web build did not confirm continuation of project ${opts.projectId}; the unexpected build was cancelled`,
+			409,
+		);
+	}
 	handoffStore?.save({
 		sessionId: started.sessionId,
 		projectId: started.projectId,
@@ -314,7 +321,8 @@ async function buildCmd(
 
 	out("");
 	out("waiting for build to finish...");
-	const status = await waitForBuild(client, started.sessionId, opts.timeoutMs, opts.pollMs, sleep);
+	const reportProgress = createBuildProgressReporter(out);
+	const status = await waitForBuild(client, started.sessionId, opts.timeoutMs, opts.pollMs, sleep, reportProgress);
 	handoffStore?.update({ sessionId: started.sessionId, status: status.status, model: status.model });
 	printBuildStatus(status, out);
 	if (status.status === "completed") {
@@ -331,6 +339,7 @@ async function waitForBuild(
 	timeoutMs: number,
 	pollMs: number,
 	sleep: (ms: number) => Promise<void>,
+	onProgress?: (status: BuildStatusResponse) => void,
 ): Promise<BuildStatusResponse> {
 	const deadline = Date.now() + timeoutMs;
 	let last: BuildStatusResponse | undefined;
@@ -346,6 +355,7 @@ async function waitForBuild(
 			}
 			throw err;
 		}
+		onProgress?.(last);
 		if (last.status !== "building") return last;
 		const remaining = deadline - Date.now();
 		if (remaining <= 0) break;
@@ -356,6 +366,35 @@ async function waitForBuild(
 	);
 }
 
+function createBuildProgressReporter(out: (msg: string) => void): (status: BuildStatusResponse) => void {
+	const seenFiles = new Set<string>();
+	let seenTimelineItems = 0;
+	return (status) => {
+		let emitted = false;
+		for (const file of uniqueStrings(status.filesCreated)) {
+			if (seenFiles.has(file)) continue;
+			seenFiles.add(file);
+			out(`  wrote:   ${file}`);
+			emitted = true;
+		}
+
+		const timeline = status.timeline ?? [];
+		for (const item of timeline.slice(seenTimelineItems)) {
+			const summary = formatTimelineItem(item);
+			if (!summary) continue;
+			out(`  phase:   ${summary}`);
+			emitted = true;
+		}
+		seenTimelineItems = Math.max(seenTimelineItems, timeline.length);
+
+		if (!emitted && status.status === "building") {
+			out(
+				`  still building (${seenFiles.size} file${seenFiles.size === 1 ? "" : "s"}, ${timeline.length} phase${timeline.length === 1 ? "" : "s"})`,
+			);
+		}
+	};
+}
+
 async function statusCmd(
 	client: ProjectClient,
 	sessionId: string | undefined,
@@ -435,9 +474,47 @@ function printBuildStatus(status: BuildStatusResponse, out: (msg: string) => voi
 	out(`build ${status.sessionId}: ${status.status}`);
 	if (status.projectId) out(`  project: ${status.projectId}`);
 	if (status.model) out(`  model:   ${status.model}`);
-	if (status.filesCreated?.length) out(`  files:   ${status.filesCreated.join(", ")}`);
-	if (status.timeline?.length)
-		out(`  events:  ${status.timeline.length} timeline item${status.timeline.length === 1 ? "" : "s"}`);
+	const files = uniqueStrings(status.filesCreated);
+	if (files.length) out(`  files:   ${files.join(", ")}`);
+	for (const item of status.timeline ?? []) {
+		const summary = formatTimelineItem(item);
+		if (summary) out(`  phase:   ${summary}`);
+	}
+}
+
+function uniqueStrings(values: string[] | undefined): string[] {
+	return [
+		...new Set(
+			(values ?? []).filter((value) => typeof value === "string" && value.trim()).map((value) => value.trim()),
+		),
+	];
+}
+
+function formatTimelineItem(value: unknown): string | undefined {
+	if (!value || typeof value !== "object") return undefined;
+	const item = value as Record<string, unknown>;
+	if (typeof item.phase !== "string" || !item.phase.trim()) return undefined;
+	const parts = [cleanTimelineText(item.phase)];
+	if (typeof item.durationMs === "number" && Number.isFinite(item.durationMs) && item.durationMs > 0) {
+		parts.push(formatTimelineDuration(item.durationMs));
+	}
+	if (typeof item.skippedReason === "string" && item.skippedReason.trim()) {
+		parts.push(`[skipped: ${cleanTimelineText(item.skippedReason)}]`);
+	} else if (item.success === false) {
+		parts.push("[failed]");
+	} else if (item.success === true) {
+		parts.push("[ok]");
+	}
+	return parts.join(" ");
+}
+
+function cleanTimelineText(value: string): string {
+	return value.replace(/\s+/g, " ").trim().slice(0, 100);
+}
+
+function formatTimelineDuration(durationMs: number): string {
+	if (durationMs < 1000) return `${Math.round(durationMs)}ms`;
+	return `${(durationMs / 1000).toFixed(durationMs < 10_000 ? 1 : 0)}s`;
 }
 
 async function printPreview(

src/projects/types.ts

@@ -32,6 +32,7 @@ export interface BuildStartResponse {
 	sessionId: string;
 	projectId: string;
 	status: string;
+	continued?: boolean;
 	model?: string;
 	poll?: string;
 	events?: string;