Show production commit on status page with GitHub link

packages/status/probes.node.test.ts

@@ -27,7 +27,9 @@ const packageAppOrigin = 'https://kodyapps.dev'
 
 function healthyRoutes(): Record<string, FakeRoute> {
 	return {
-		[`${primaryOrigin}/health`]: { body: { ok: true, commitSha: 'abc' } },
+		[`${primaryOrigin}/health`]: {
+			body: { ok: true, commitSha: 'abc123def4567890abcdef1234567890abcdef12' },
+		},
 		[`${primaryOrigin}/mcp`]: {
 			status: 401,
 			headers: { 'WWW-Authenticate': 'Bearer resource_metadata="..."' },
@@ -56,21 +58,24 @@ async function probe(routes: Record<string, FakeRoute>) {
 }
 
 function outcome(
-	outcomes: Awaited<ReturnType<typeof runAllProbes>>,
+	result: Awaited<ReturnType<typeof runAllProbes>>,
 	component: string,
 ) {
-	return outcomes.find((entry) => entry.component === component)
+	return result.outcomes.find((entry) => entry.component === component)
 }
 
 test('a fully healthy pass reports every component ok', async () => {
-	const outcomes = await probe(healthyRoutes())
-	expect(outcomes.map((entry) => entry.component).toSorted()).toEqual(
+	const result = await probe(healthyRoutes())
+	expect(result.outcomes.map((entry) => entry.component).toSorted()).toEqual(
 		[...statusComponentIds].toSorted(),
 	)
-	for (const entry of outcomes) {
+	for (const entry of result.outcomes) {
 		expect(entry.ok, `${entry.component} should be ok`).toBe(true)
 	}
-	expect(outcome(outcomes, 'app_db')?.latencyMs).toBe(4)
+	expect(outcome(result, 'app_db')?.latencyMs).toBe(4)
+	expect(result.productionCommitSha).toBe(
+		'abc123def4567890abcdef1234567890abcdef12',
+	)
 })
 
 test('probe failures isolate to the affected component and map error details', async () => {

packages/status/probes.ts

@@ -65,32 +65,51 @@ async function timedFetch(
 	}
 }
 
+type AppHealthBody = {
+	ok?: boolean
+	commitSha?: string
+}
+
+function readProductionCommitSha(body: AppHealthBody | null): string | null {
+	const commitSha = body?.commitSha?.trim()
+	if (!commitSha || !/^[0-9a-f]{7,40}$/i.test(commitSha)) return null
+	return commitSha.toLowerCase()
+}
+
 async function probeApp(
 	fetcher: typeof fetch,
 	primaryOrigin: string,
-): Promise<ProbeOutcome> {
+): Promise<{ outcome: ProbeOutcome; productionCommitSha: string | null }> {
 	const result = await timedFetch(fetcher, `${primaryOrigin}/health`)
 	if (!result.response) {
 		return {
-			component: 'app',
-			ok: false,
-			latencyMs: result.latencyMs,
-			detail: result.error,
+			outcome: {
+				component: 'app',
+				ok: false,
+				latencyMs: result.latencyMs,
+				detail: result.error,
+			},
+			productionCommitSha: null,
 		}
 	}
+	let body: AppHealthBody | null = null
 	let bodyOk = false
 	try {
-		const body = (await result.response.json()) as { ok?: boolean }
+		body = (await result.response.json()) as AppHealthBody
 		bodyOk = body.ok === true
 	} catch {
+		body = null
 		bodyOk = false
 	}
 	const ok = result.response.ok && bodyOk
 	return {
-		component: 'app',
-		ok,
-		latencyMs: result.latencyMs,
-		detail: ok ? null : `HTTP ${result.response.status}`,
+		outcome: {
+			component: 'app',
+			ok,
+			latencyMs: result.latencyMs,
+			detail: ok ? null : `HTTP ${result.response.status}`,
+		},
+		productionCommitSha: readProductionCommitSha(body),
 	}
 }
 
@@ -184,17 +203,22 @@ async function probeStorageComponents(
 	})
 }
 
+export type ProbeRunResult = {
+	outcomes: Array<ProbeOutcome>
+	productionCommitSha: string | null
+}
+
 export async function runAllProbes(
 	config: ProbeConfig,
-): Promise<Array<ProbeOutcome>> {
+): Promise<ProbeRunResult> {
 	const fetcher = config.fetcher ?? fetch
 	const [app, mcp, packageApps, storage] = await Promise.all([
 		probeApp(fetcher, config.primaryOrigin),
 		probeMcp(fetcher, config.primaryOrigin),
 		probePackageApps(fetcher, config.packageAppOrigin),
 		probeStorageComponents(fetcher, config.primaryOrigin),
 	])
-	const outcomes = [app, mcp, packageApps, ...storage]
+	const outcomes = [app.outcome, mcp, packageApps, ...storage]
 	const covered = new Set(outcomes.map((outcome) => outcome.component))
 	for (const component of statusComponentIds) {
 		if (!covered.has(component)) {
@@ -206,5 +230,5 @@ export async function runAllProbes(
 			})
 		}
 	}
-	return outcomes
+	return { outcomes, productionCommitSha: app.productionCommitSha }
 }

packages/status/status-page.node.test.ts

@@ -33,7 +33,7 @@ function snapshot(overrides: Partial<StatusSnapshot> = {}): StatusSnapshot {
 		openIncidents: [],
 		recentIncidents: [],
 		providerIncidents: null,
-		buildCommit: 'abc123',
+		productionCommit: 'abc123def4567890abcdef1234567890abcdef12',
 		...overrides,
 	}
 }
@@ -44,6 +44,11 @@ test('status page renders components, incidents, unknown state, and escapes deta
 		expect(healthy).toContain(component.name.replaceAll('&', '&amp;'))
 	}
 	expect(healthy).toContain('99.98% uptime')
+	expect(healthy).toContain('Production commit')
+	expect(healthy).toContain(
+		'https://github.com/kentcdodds/kody/commit/abc123def4567890abcdef1234567890abcdef12',
+	)
+	expect(healthy).toContain('>abc123d<')
 	expect(healthy).toContain('http-equiv="refresh"')
 	expect(healthy).toMatch(/operational|All systems/i)
 
@@ -133,6 +138,9 @@ test('status page renders provider incidents separately and omits them when abse
 	expect(withProvider).toContain('for context only')
 	expect(withProvider).toContain('All systems operational')
 
+	const withoutCommit = renderStatusPage(snapshot({ productionCommit: null }))
+	expect(withoutCommit).not.toContain('Production commit')
+
 	const unsafeLink = renderStatusPage(
 		snapshot({
 			providerIncidents: [

packages/status/status-page.ts

@@ -221,6 +221,20 @@ function renderProviderIncident(incident: ProviderIncident): string {
 </div>`
 }
 
+/** Public GitHub repository for the main kody worker (production deploys). */
+const productionRepo = 'kentcdodds/kody'
+
+function productionCommitLink(commitSha: string): string {
+	const shortSha = commitSha.slice(0, 7)
+	const href = `https://github.com/${productionRepo}/commit/${escapeHtml(commitSha)}`
+	return `<a href="${href}">${escapeHtml(shortSha)}</a>`
+}
+
+function renderProductionCommit(commitSha: string | null): string {
+	if (!commitSha) return ''
+	return `Production commit ${productionCommitLink(commitSha)} · `
+}
+
 function renderProviderIncidentsSection(
 	incidents: Array<ProviderIncident> | null | undefined,
 ): string {
@@ -267,7 +281,7 @@ export function renderStatusPage(snapshot: StatusSnapshot): string {
 	${providerIncidents}
 	${recentIncidents}
 	<footer>
-		Probes run every minute from an independently deployed worker.
+		${renderProductionCommit(snapshot.productionCommit)}Probes run every minute from an independently deployed worker.
 		<a href="https://heykody.app">heykody.app</a> ·
 		<a href="/status.json">JSON</a>
 	</footer>

packages/status/status-store.ts

@@ -31,6 +31,7 @@ import {
 } from './status-types.ts'
 
 const providerIncidentsMetaKey = 'provider_incidents_cache'
+const productionCommitMetaKey = 'production_commit_sha'
 
 export type StatusWorkerEnv = {
 	STATUS_STORE: DurableObjectNamespace<StatusStore>
@@ -385,11 +386,14 @@ export class StatusStore extends DurableObject<StatusWorkerEnv> {
 	}
 
 	async runProbes(): Promise<void> {
-		const outcomes = await runAllProbes({
+		const { outcomes, productionCommitSha } = await runAllProbes({
 			primaryOrigin: this.env.PRIMARY_ORIGIN,
 			packageAppOrigin: this.env.PACKAGE_APP_ORIGIN,
 		})
 		const now = Date.now()
+		if (productionCommitSha) {
+			this.setMeta(productionCommitMetaKey, productionCommitSha)
+		}
 		for (const outcome of outcomes) {
 			this.recordOutcome(outcome, now)
 		}
@@ -417,7 +421,7 @@ export class StatusStore extends DurableObject<StatusWorkerEnv> {
 			openIncidents: this.listIncidents('open'),
 			recentIncidents: this.listIncidents('resolved'),
 			providerIncidents: this.readProviderIncidents(now),
-			buildCommit: this.env.BUILD_COMMIT ?? null,
+			productionCommit: this.getMeta(productionCommitMetaKey),
 		}
 	}
 

packages/status/status-types.ts

@@ -73,5 +73,6 @@ export type StatusSnapshot = {
 	 * omits the provider section in that case (fail-soft).
 	 */
 	providerIncidents: Array<ProviderIncident> | null
-	buildCommit: string | null
+	/** Latest `commitSha` reported by production `GET /health` (main worker). */
+	productionCommit: string | null
 }