Merge commit '56d37d0d5d1a23b179ee018f701eb99a2a25bd24' into trunk

Author: dmsnell

.github/scripts/docs-playground-preview/build.mjs

@@ -646,6 +646,10 @@ echo "Reference API navigation seeded.\\n";
 async function validateSnapshotWithServer(deps, snapshotPath, logDir, manifest) {
 	const restoreBlueprint = path.join(path.dirname(snapshotPath), 'restore-blueprint.json');
 	const pathInZip = await detectPathInZip(snapshotPath);
+	const smokeResult = {
+		ok: false,
+		pathInZip: pathInZip || '',
+	};
 	const blueprint = {
 		$schema: deps.playground.blueprintSchema,
 		preferredVersions: {
@@ -688,6 +692,7 @@ async function validateSnapshotWithServer(deps, snapshotPath, logDir, manifest)
 	child.stdout.on('data', (chunk) => { output += chunk.toString(); });
 	child.stderr.on('data', (chunk) => { output += chunk.toString(); });
 
+	let smokeError = null;
 	try {
 		await waitForHttp(`http://127.0.0.1:${port}/reference/`, 180_000);
 		const routeResults = {};
@@ -701,12 +706,23 @@ async function validateSnapshotWithServer(deps, snapshotPath, logDir, manifest)
 			}
 			routeResults[route] = { bytes: body.length };
 		}
+		smokeResult.ok = true;
+		smokeResult.routes = routeResults;
 		manifest.checks.routes = routeResults;
 		manifest.checks.pathInZip = pathInZip || '';
+	} catch (error) {
+		smokeError = error;
+		smokeResult.error = error instanceof Error ? error.message : String(error);
 	} finally {
 		child.kill('SIGTERM');
 		await fs.writeFile(path.join(logDir, 'restore-smoke.log'), output);
 	}
+
+	manifest.checks.restoreSmoke = smokeResult;
+	if (smokeError) {
+		console.warn(`Warning: docs Playground restore smoke failed: ${smokeResult.error}`);
+		logGroup('Docs Playground restore smoke output', output);
+	}
 }
 
 async function normalizeSnapshotArchive(inputZip, outputZip) {
@@ -874,7 +890,8 @@ async function fetchText(url) {
 			res.on('data', (chunk) => { body += chunk; });
 			res.on('end', () => {
 				if ((res.statusCode || 0) >= 400) {
-					reject(new Error(`${url} returned ${res.statusCode}`));
+					const excerpt = bodyExcerpt(body);
+					reject(new Error(`${url} returned ${res.statusCode}${excerpt ? `\nResponse body:\n${excerpt}` : ''}`));
 				} else {
 					resolve(body);
 				}
@@ -887,6 +904,30 @@ async function fetchText(url) {
 	});
 }
 
+function bodyExcerpt(body, limit = 4000) {
+	const clean = String(body || '').replace(/\0/g, '');
+	if (!clean) {
+		return '';
+	}
+	if (clean.length <= limit) {
+		return clean;
+	}
+	return `${clean.slice(0, limit)}\n...[truncated ${clean.length - limit} chars]`;
+}
+
+function logGroup(title, body, limit = 20000) {
+	const clean = String(body || '').trim();
+	if (!clean) {
+		return;
+	}
+	const excerpt = clean.length > limit
+		? `${clean.slice(clean.length - limit)}\n...[truncated ${clean.length - limit} earlier chars]`
+		: clean;
+	console.log(`::group::${title}`);
+	console.log(excerpt);
+	console.log('::endgroup::');
+}
+
 async function getFreePort() {
 	return new Promise((resolve, reject) => {
 		const server = http.createServer();

.github/workflows/docs-playground-preview-build.yml

@@ -24,7 +24,9 @@ jobs:
     permissions:
       contents: read
     with:
-      artifacts: docs-playground-snapshot=build/docs-playground-snapshot.zip
+      artifacts: |
+        docs-playground-snapshot=build/docs-playground-snapshot.zip
+        docs-preview-diagnostics=build/docs-preview-diagnostics.zip
       node-version: '20'
       php-version: '8.4'
       build-command: |
@@ -34,3 +36,7 @@ jobs:
           --out "$GITHUB_WORKSPACE/build" \
           --pr-number "${{ github.event.pull_request.number }}" \
           --head-sha "${{ github.event.pull_request.head.sha }}"
+        (
+          cd "$GITHUB_WORKSPACE/build"
+          zip -rq docs-preview-diagnostics.zip docs-preview-manifest.json restore-blueprint.json logs
+        )