mailwoman 10.4.0 → 10.6.0

package/cli/commands/corpus/download.tsx

@@ -13,6 +13,7 @@
  */
 
 import { dataRootPath } from "@mailwoman/core/data-root"
+import { runProcess } from "@mailwoman/core/process"
 import { Box, Text } from "ink"
 import { useState } from "react"
 
@@ -52,17 +53,26 @@ const CorpusDownload: CommandComponent<typeof spec> = ({ options }) => {
 	}
 
 	useCommandTask(async () => {
-		const { $ } = await import("zx")
-
 		const rcloneBase = `:s3:${options.bucket}`
-		const dryFlag = options.dryRun ? "--dry-run" : ""
+		const dryFlag = options.dryRun ? ["--dry-run"] : []
 		const out = options.outDir
 
 		// Step 0: Download v0.3.0 corpus
 		updateStep(0, { status: "running" })
 
 		try {
-			await $`rclone sync ${rcloneBase}/corpus/v0.3.0/ ${out}/corpus/versioned/v0.3.0/corpus-v0.3.0/ --progress --transfers 8 --checkers 16 ${dryFlag}`.quiet()
+			await runProcess("rclone", [
+				"sync",
+				`${rcloneBase}/corpus/v0.3.0/`,
+				`${out}/corpus/versioned/v0.3.0/corpus-v0.3.0/`,
+				"--progress",
+				"--transfers",
+				"8",
+				"--checkers",
+				"16",
+				...dryFlag,
+			])
+
 			updateStep(0, { status: "done" })
 		} catch (error: unknown) {
 			const e = error as Record<string, unknown>
@@ -75,7 +85,16 @@ const CorpusDownload: CommandComponent<typeof spec> = ({ options }) => {
 		updateStep(1, { status: "running" })
 
 		try {
-			await $`rclone sync ${rcloneBase}/corpus/v0.4.0/ ${out}/corpus/versioned/v0.4.0/corpus-v0.4.0/ --progress --transfers 4 ${dryFlag}`.quiet()
+			await runProcess("rclone", [
+				"sync",
+				`${rcloneBase}/corpus/v0.4.0/`,
+				`${out}/corpus/versioned/v0.4.0/corpus-v0.4.0/`,
+				"--progress",
+				"--transfers",
+				"4",
+				...dryFlag,
+			])
+
 			updateStep(1, { status: "done" })
 		} catch (error: unknown) {
 			const e = error as Record<string, unknown>
@@ -88,7 +107,14 @@ const CorpusDownload: CommandComponent<typeof spec> = ({ options }) => {
 		updateStep(2, { status: "running" })
 
 		try {
-			await $`rclone sync ${rcloneBase}/models/tokenizer/ ${out}/models/tokenizer/ --progress ${dryFlag}`.quiet()
+			await runProcess("rclone", [
+				"sync",
+				`${rcloneBase}/models/tokenizer/`,
+				`${out}/models/tokenizer/`,
+				"--progress",
+				...dryFlag,
+			])
+
 			updateStep(2, { status: "done" })
 		} catch (error: unknown) {
 			const e = error as Record<string, unknown>
@@ -101,7 +127,7 @@ const CorpusDownload: CommandComponent<typeof spec> = ({ options }) => {
 		updateStep(3, { status: "running" })
 
 		try {
-			await $`rclone sync ${rcloneBase}/corpus-python/ ./corpus-python/ --progress ${dryFlag}`.quiet()
+			await runProcess("rclone", ["sync", `${rcloneBase}/corpus-python/`, "./corpus-python/", "--progress", ...dryFlag])
 			updateStep(3, { status: "done" })
 		} catch (error: unknown) {
 			const e = error as Record<string, unknown>

package/cli/commands/corpus/fetch.tsx

@@ -132,6 +132,7 @@ async function runSource(source: FetchSourceID, options: Options): Promise<Fetch
 	const { fetchCORDIS } = await import("@mailwoman/corpus/tools/fetch/cordis")
 	const { fetchAnnuaireEducationOverseas } = await import("@mailwoman/corpus/fr/tools/fetch/annuaire-education")
 	const { fetchFinessOverseas } = await import("@mailwoman/corpus/fr/tools/fetch/finess")
+	const { fetchGBOSOpen } = await import("@mailwoman/corpus/gb/tools/fetch/os-open")
 	const { fetchGLEIF } = await import("@mailwoman/corpus/tools/fetch/gleif")
 	const { fetchVaris } = await import("@mailwoman/corpus/lv/tools/fetch/varis")
 	const { fetchVlaanderenAD } = await import("@mailwoman/corpus/tools/fetch/vlaanderen-ad")
@@ -185,6 +186,8 @@ async function runSource(source: FetchSourceID, options: Options): Promise<Fetch
 			return fetchAnnuaireEducationOverseas(base, reportToStderr)
 		case "fr-finess-overseas":
 			return fetchFinessOverseas(base, reportToStderr)
+		case "gb-os-open":
+			return fetchGBOSOpen(base, reportToStderr)
 		case "gleif":
 			return fetchGLEIF(base, reportToStderr)
 		case "ro-retea-scolara":

package/cli/commands/corpus/sub/venue/extract.tsx

@@ -40,12 +40,12 @@ export const spec = {
 
 const CorpusSubVenueExtract: CommandComponent<typeof spec> = ({ options }) => {
 	const state = useCommandTask(async () => {
-		// @mailwoman/osm is a devDependency only. It is unpublished (ODbL counsel sign-off pending,
-		// see osm/readme.md), so a static import here breaks every clean install of the published CLI (the 2026-08-05 smoke failure). Lazy-load it and fail with provenance when absent.
+		// @mailwoman/osm is an optional peer that an operator installs to opt in to OpenStreetMap data, so a
+		// static import would break every install without it. Lazy-load it and say how to install it when absent.
 		const { writeSubVenueJSONL } = await import("@mailwoman/osm/sdk/extract/subvenue").catch(() => {
 			throw new Error(
-				"corpus sub-venue-extract requires @mailwoman/osm, which is not yet published — " +
-					"run this command from the mailwoman monorepo (osm/README.md has the publish status)."
+				"corpus sub-venue-extract requires @mailwoman/osm, an optional package — install it with " +
+					"`npm install @mailwoman/osm` (its README states the OpenStreetMap license terms)."
 			)
 		})
 

package/cli/commands/corpus/upload.tsx

@@ -9,6 +9,7 @@
 
 import { dataRootPath } from "@mailwoman/core/data-root"
 import { pathExists } from "@mailwoman/core/fs/readers/stat"
+import { runProcess } from "@mailwoman/core/process"
 import { extractDelimited } from "@mailwoman/core/scripting/arguments"
 import { childEnv } from "@mailwoman/core/scripting/utils"
 import type { BuildCorpusManifest } from "@mailwoman/corpus/build"
@@ -235,8 +236,6 @@ const CorpusUpload: CommandComponent<typeof spec> = ({ options }) => {
 	const [steps, setSteps] = useState<Step[]>([])
 
 	const state = useCommandTask(async () => {
-		const { $ } = await import("zx")
-
 		const corpusRoot = PathBuilder.from(options.corpusDir ?? dataRootPath("corpus", "versioned"))
 
 		const directories = extractDelimited(options.corpusDirectory)
@@ -350,9 +349,11 @@ const CorpusUpload: CommandComponent<typeof spec> = ({ options }) => {
 			update(index, { status: "running" })
 
 			try {
-				await $({
-					env,
-				})`rclone sync ${job.source.toString()} ${job.dest} ${job.extra} ${dry} ${R2_RETRIES} --stats-one-line`.quiet()
+				await runProcess(
+					"rclone",
+					["sync", job.source.toString(), job.dest, ...job.extra, ...dry, ...R2_RETRIES, "--stats-one-line"],
+					{ env }
+				)
 
 				update(index, { status: "done", detail: options.dryRun ? "would sync" : "synced" })
 			} catch (error: unknown) {

package/cli/commands/eval/pins.tsx

@@ -17,8 +17,8 @@
 import { gitHead } from "@mailwoman/core/git"
 import { parseJSONStrict, stringifyJSON } from "@mailwoman/core/json"
 import { repoRootPath } from "@mailwoman/core/paths"
+import { runProcess } from "@mailwoman/core/process"
 import { Box, Text } from "ink"
-import { $ } from "zx"
 
 import { type CommandSpec, CommandTaskResult, type CommandComponent, useCommandTask } from "#cli-kit"
 
@@ -68,17 +68,17 @@ async function reportStalePins(drift: string, testPath: string): Promise<string>
 		`Run \`mailwoman eval pins --update\`, commit ${testPath}, and this issue closes on the next green audit.`
 
 	const search = `in:title ${stringifyJSON(STALE_PIN_ISSUE_TITLE)}`
-	const issueList = await $`gh issue list --state open --search ${search} --json number`.quiet()
+	const issueList = await runProcess("gh", ["issue", "list", "--state", "open", "--search", search, "--json", "number"])
 	const existing = parseJSONStrict<Array<{ number: number }>>(issueList.stdout)
 	const first = existing[0]
 
 	if (first) {
-		await $`gh issue comment ${first.number} --body ${body}`.quiet()
+		await runProcess("gh", ["issue", "comment", String(first.number), "--body", body])
 
 		return `updated issue #${first.number}`
 	}
 
-	await $`gh issue create --title ${STALE_PIN_ISSUE_TITLE} --body ${body}`.quiet()
+	await runProcess("gh", ["issue", "create", "--title", STALE_PIN_ISSUE_TITLE, "--body", body])
 
 	return "opened the audit issue"
 }

package/cli/commands/gazetteer/build/poi/coverage.tsx

@@ -117,8 +117,8 @@ const GazetteerBuildPOICoverage: CommandComponent<typeof spec> = ({ options }) =
 		const out = options.out ?? poiDatabasePath(`poi-coverage-${options.category}-${slugify(region)}.db`)
 		const buildSHA = resolveBuildSHA(repoRootPath())
 
-		// Dynamic import is required: @mailwoman/osm is unpublished, so a top-level
-		// import breaks the published CLI on a clean install.
+		// Dynamic import is required: @mailwoman/osm is an optional peer, so a top-level
+		// import breaks the published CLI on an install without it.
 		const [{ extractOSMBoundary }, { extractOSMPOIs, tagRuleFromOSMTag }] = await Promise.all([
 			import("@mailwoman/osm/sdk/extract/boundary"),
 			import("@mailwoman/osm/sdk/extract/poi"),

package/cli/commands/gazetteer/build/poi/index.tsx

@@ -115,10 +115,10 @@ const GazetteerBuildPOI: CommandComponent<typeof spec> = ({ options }) => {
 			// twice, once here to derive coverage, once as buildPOIDatabase's `rows` injection point.
 			const rows: POISourceRow[] = []
 
-			// dynamic import, required: @mailwoman/osm is unpublished
-			// (ODbL counsel sign-off pending — see osm/readme.md), and this dependency belongs
-			// only on the selected build path, so a top-level import breaks the whole published
-			// CLI on a clean install — the smoke test's clean-install leg is what catches it.
+			// Dynamic import, required: @mailwoman/osm is an optional peer that an operator installs
+			// to opt in to OpenStreetMap data, and this dependency belongs only on the selected build
+			// path, so a top-level import breaks the whole published CLI on an install without it.
+			// The smoke test's clean-install leg is what catches it.
 			// The osm source branch is build-local by design.
 			// It may only resolve its SDK when a run selects it.
 			const { extractOSMPOIs } = await import("@mailwoman/osm/sdk/extract/poi")

package/cli/commands/gazetteer/inspect/sync/index.tsx

@@ -21,6 +21,9 @@ import { ProgressBar } from "@inkjs/ui"
 import type { RepositorySource, SynchronizeAction } from "@mailwoman/core"
 import { wofReposPath } from "@mailwoman/core/data-root"
 import { ByteFormatter } from "@mailwoman/core/fs/formatters"
+import { GitClient } from "@mailwoman/core/git"
+import { parseJSONStrict } from "@mailwoman/core/json"
+import { runFile } from "@mailwoman/core/process"
 import { formatQuantity } from "@mailwoman/core/resources/locale"
 import { CommandError } from "@mailwoman/core/scripting/command"
 import { Box, Text } from "ink"
@@ -33,7 +36,9 @@ import {
 	type CommandSpec,
 	CommandTaskResult,
 	type CommandComponent,
+	ProgressLines,
 	useCommandTask,
+	useProgressFeed,
 } from "#cli-kit"
 import {
 	assertDestinationNotARepoName,
@@ -92,12 +97,25 @@ interface SyncPlan {
  * failure surfaces as an opaque spawn error from deep inside the task.
  */
 async function discoverRepos(): Promise<DiscoveredRepo[]> {
-	const { $ } = await import("zx")
-
 	try {
-		return $.sync`gh repo list ${WOF_REPO_OWNER} --no-archived --limit 1000 --json name --json url --json diskUsage`
-			.json<Array<{ name: string; url: string; diskUsage: number }>>()
-			.map(({ name, url, diskUsage }) => ({ name, url, diskUsageKB: diskUsage }))
+		const { stdout } = await runFile("gh", [
+			"repo",
+			"list",
+			WOF_REPO_OWNER,
+			"--no-archived",
+			"--limit",
+			"1000",
+			"--json",
+			"name",
+			"--json",
+			"url",
+			"--json",
+			"diskUsage",
+		])
+
+		return parseJSONStrict<Array<{ name: string; url: string; diskUsage: number }>>(stdout).map(
+			({ name, url, diskUsage }) => ({ name, url, diskUsageKB: diskUsage })
+		)
 	} catch (error) {
 		throw new CommandError(
 			`Could not list ${WOF_REPO_OWNER} through \`gh\`. Install the GitHub CLI and run \`gh auth login\`.`,
@@ -110,6 +128,7 @@ const WOFSync: CommandComponent<typeof spec, [string?]> = ({ options, args }) =>
 	const [plan, setPlan] = useState<SyncPlan>()
 	const [active, setActive] = useState<readonly string[]>([])
 	const [doneCount, setDoneCount] = useState(0)
+	const progress = useProgressFeed()
 
 	const state = useCommandTask(
 		async () => {
@@ -197,11 +216,18 @@ const WOFSync: CommandComponent<typeof spec, [string?]> = ({ options, args }) =>
 					let action: SynchronizeAction | null = null
 					let failure: string | null = null
 
+					await using client = new GitClient({ cwd: destination })
+
+					const unwatch = progress.watch(client, source.name)
+
 					try {
-						action = await synchronizeRepo(source, destination)
+						action = await synchronizeRepo(source, destination, client)
 					} catch (error) {
 						ok = false
 						failure = error instanceof Error ? error.message : String(error)
+					} finally {
+						unwatch()
+						progress.clear(source.name)
 					}
 
 					const elapsed = `${((performance.now() - startedAt) / 1000).toFixed(1)}s`
@@ -260,12 +286,16 @@ const WOFSync: CommandComponent<typeof spec, [string?]> = ({ options, args }) =>
 				{ByteFormatter.formatSI(plan.selection.totalDiskUsageKB * 1024)}
 			</Text>
 
-			{active.map((name) => (
-				<Text key={name} color="cyan">
-					{" "}
-					⠋ {name}
-				</Text>
-			))}
+			{active
+				.filter((name) => !progress.entries.has(name))
+				.map((name) => (
+					<Text key={name} color="cyan">
+						{" "}
+						⠋ {name}
+					</Text>
+				))}
+
+			<ProgressLines entries={progress.entries} />
 
 			<Box paddingX={1}>
 				<ProgressBar value={percentage} />

package/cli/commands/gazetteer/repos-sync.tsx

@@ -9,12 +9,19 @@
 
 import { pathExists } from "@mailwoman/core/fs/readers/stat"
 import { makeDirectories, writeLocalJSONFile } from "@mailwoman/core/fs/writers"
-import { git } from "@mailwoman/core/git"
+import { GitClient } from "@mailwoman/core/git"
 import { extractDelimited } from "@mailwoman/core/scripting/arguments"
 import { Box, Text } from "ink"
-import { dirname, PathBuilder } from "path-ts"
-
-import { type CommandSpec, CommandTaskResult, type CommandComponent, useCommandTask } from "#cli-kit"
+import { PathBuilder } from "path-ts"
+
+import {
+	type CommandSpec,
+	CommandTaskResult,
+	type CommandComponent,
+	ProgressLines,
+	useCommandTask,
+	useProgressFeed,
+} from "#cli-kit"
 import type { RepoSyncPlan } from "#gazetteer/repos/sync"
 
 /**
@@ -43,11 +50,13 @@ const ACTION_MARK: Record<string, string> = {
 }
 
 const GazetteerReposSync: CommandComponent<typeof spec> = ({ options }) => {
+	const progress = useProgressFeed()
+
 	const state = useCommandTask(async () => {
 		const { wofReposPath } = await import("@mailwoman/core/data-root")
 		const { wofDatabasePath } = await import("@mailwoman/resolver-wof-sqlite/paths")
 		const { auditReposRoot } = await import("#gazetteer/repos/audit")
-		const { planReposSync, SyncAction, syncSentence } = await import("#gazetteer/repos/sync")
+		const { applyRepoSyncPlan, planReposSync, syncSentence } = await import("#gazetteer/repos/sync")
 		const { githubForkProbe, UPSTREAM_ORG } = await import("#gazetteer/wof/repo-origin")
 
 		const root = PathBuilder.from(options.root ?? wofReposPath())
@@ -79,39 +88,33 @@ const GazetteerReposSync: CommandComponent<typeof spec> = ({ options }) => {
 			probe: githubForkProbe,
 			directoryFor: (repo) => directories.get(repo)!,
 			fetchFirst: !options.offline,
+			watch: (client) => progress.watch(client, PathBuilder.from(client.cwd).basename()),
 		})
 
+		for (const repo of repos) {
+			progress.clear(repo)
+		}
+
 		const performed: string[] = []
 
 		if (options.apply) {
 			for (const plan of plans) {
+				await using client = new GitClient({ cwd: root })
+
+				const unwatch = progress.watch(client, plan.repo)
+
 				try {
-					if (plan.action === SyncAction.Clone) {
-						await makeDirectories(dirname(plan.directory))
-						await git(["clone", "--depth", "1", plan.origin.url, plan.directory])
-						performed.push(`cloned ${plan.repo} from ${plan.origin.source}`)
-					} else if (plan.action === SyncAction.FastForward) {
-						await git(["-C", plan.directory, "merge", "--ff-only", "origin/HEAD"])
-						performed.push(`fast-forwarded ${plan.repo}`)
-					} else if (plan.action === SyncAction.RepointRequired && options.repoint) {
-						// The next upstream sync would need a guess without the fork's address.
-						await git(["-C", plan.directory, "remote", "rename", "origin", "upstream"])
-						await git(["-C", plan.directory, "remote", "add", "origin", plan.origin.url])
-						await git(["-C", plan.directory, "fetch", "--quiet", "origin"])
-
-						// The rename preserved `branch.<name>.remote`, so without re-pointing tracking the
-						// next `git pull` here pulls upstream over the corrections this command preserves.
-						const branch = await git(["-C", plan.directory, "rev-parse", "--abbrev-ref", "HEAD"])
-
-						if (branch && branch !== "HEAD") {
-							await git(["-C", plan.directory, "branch", `--set-upstream-to=origin/${branch}`, branch])
-						}
-
-						performed.push(`re-pointed ${plan.repo} at ${plan.origin.org} (previous remote kept as upstream)`)
+					const sentence = await applyRepoSyncPlan(plan, { client, repoint: options.repoint })
+
+					if (sentence) {
+						performed.push(sentence)
 					}
 				} catch (error) {
 					// oxlint-disable-next-line mailwoman/prefer-spliterator -- one git error message, read for its first line only
 					performed.push(`FAILED ${plan.repo}: ${(error as Error).message.split("\n")[0]}`)
+				} finally {
+					unwatch()
+					progress.clear(plan.repo)
 				}
 			}
 		}
@@ -140,7 +143,16 @@ const GazetteerReposSync: CommandComponent<typeof spec> = ({ options }) => {
 		return { plans, sentence: syncSentence(plans), performed, vintagePath, applied: options.apply }
 	})
 
-	if (state.status !== "done") return <CommandTaskResult state={state} running="Resolving WOF repo origins…" />
+	if (state.status === "running") {
+		return (
+			<Box flexDirection="column">
+				<Text color="gray">Resolving WOF repo origins…</Text>
+				<ProgressLines entries={progress.entries} />
+			</Box>
+		)
+	}
+
+	if (state.status !== "done") return <CommandTaskResult state={state} />
 
 	const { plans, sentence, performed, vintagePath, applied } = state.result
 

package/cli/commands/release/merge-admin.tsx

@@ -14,8 +14,8 @@
 import { gitHead } from "@mailwoman/core/git"
 import { parseJSONStrict, stringifyJSON } from "@mailwoman/core/json"
 import { repoRootPath } from "@mailwoman/core/paths"
+import { runProcess } from "@mailwoman/core/process"
 import { Box, Text } from "ink"
-import { $ } from "zx"
 
 import { type CommandSpec, CommandTaskResult, CLIUsageError, type CommandComponent, useCommandTask } from "#cli-kit"
 
@@ -64,7 +64,7 @@ async function mergeAdmin(prNumber: string, method: string): Promise<MergeAdminR
 		throw new CLIUsageError(`--method ${stringifyJSON(method)} is not one of ${MERGE_METHODS.join("|")}`)
 	}
 
-	const prView = await $`gh pr view ${prNumber} --json state,title,headRefOid,files`.quiet()
+	const prView = await runProcess("gh", ["pr", "view", String(prNumber), "--json", "state,title,headRefOid,files"])
 
 	const pr = parseJSONStrict<{
 		state: string
@@ -109,7 +109,7 @@ async function mergeAdmin(prNumber: string, method: string): Promise<MergeAdminR
 	}
 
 	const methodFlag = `--${method}`
-	const merged = await $`gh pr merge ${prNumber} --admin ${methodFlag}`.quiet()
+	const merged = await runProcess("gh", ["pr", "merge", String(prNumber), "--admin", methodFlag])
 
 	return { prNumber, title: pr.title, method, ranChecks, mergeOutput: merged.stdout.trim() }
 }

package/cli/doctor/checks.ts

@@ -12,9 +12,9 @@ import {
 	docsSiteURL,
 	isSelfServicePayload,
 	chooseLicenseBranch,
+	LicenseObligation,
 	summarizeLicense,
 	type LicenseKeyVerification,
-	type LicenseObligation,
 } from "@mailwoman/core/license"
 import type { LicenseKeyPublication } from "@mailwoman/core/license/publication"
 import type { LicenseStatusAnswer } from "@mailwoman/core/license/status"
@@ -711,10 +711,27 @@ export function layerLicenseCheck(o: LayerLicenseObservation): DoctorCheck {
 		...base,
 		status: CheckStatus.OK,
 		detail: `${o.manifest.name} · ${o.manifest.license} · obligations: ${describeObligations(summary.obligations, true)}`,
+		consequence: summary.obligations.includes(LicenseObligation.ShareAlike) ? shareAlikeNotice(o.manifest) : null,
 		license,
 	}
 }
 
+/**
+ * The notice the doctor prints under a layer whose license carries share-alike.
+ *
+ * It states the credit the manifest records and what the license asks when the layer,
+ * or a database derived from it, is publicly used.
+ * Reading results from the layer for the operator's own use is not public use,
+ * so the notice states the condition rather than an obligation already owed.
+ */
+function shareAlikeNotice(manifest: LayerIdentity): string {
+	return (
+		`${manifest.name} is a database under ${manifest.license}. ` +
+		`Credit ${stringifyJSON(manifest.attribution ?? "the source the license names")} wherever its data is shown. ` +
+		"If you publicly use it, or a database derived from it, the license requires that database to be offered under the same terms."
+	)
+}
+
 /**
  * Formats obligations as a comma-separated list for a check detail.
  */
@@ -776,7 +793,8 @@ export function obligationPostureCheck(o: ObligationPostureObservation): DoctorC
 			status: CheckStatus.Degraded,
 			detail: `${refusing}: ${findings.length} finding(s) on disk — ${findings.join("; ")}`,
 			consequence:
-				"A layer on disk carries an obligation this installation declined. Reading from it takes the obligation on, " +
+				"A layer on disk carries an obligation this installation declined. Reading from it takes the obligation on. " +
+				"The geocode session refuses to start while an OpenStreetMap address-point database carrying it is on disk, " +
 				"and `mailwoman data pull` refuses the bundle that carries it.",
 			fix: "remove the layer, or drop the class from MAILWOMAN_REFUSE_OBLIGATIONS",
 		}

package/cli/doctor/runner.ts

@@ -42,9 +42,11 @@ import {
 import { type ObligationRefusal, parseObligationRefusals } from "#data/obligations"
 import { $public } from "#env"
 import {
+	addressPointDatabases,
 	layerDatabaseAlternates,
 	layerDatabasePath,
 	layerDatabases,
+	type AddressPointDatabaseRef,
 	type LayerDatabaseRef,
 	type LayerID,
 } from "#geocode/layer-paths"
@@ -102,6 +104,11 @@ export interface DoctorDeps {
 	 * `.db` files in a layer's directory other than the one the session attaches, a build under another name.
 	 */
 	layerAlternates(id: LayerID): Promise<string[]>
+	/**
+	 * The per-country address-point databases on disk, including the OpenStreetMap
+	 * databases an operator built.
+	 */
+	addressPointDatabases(): Promise<AddressPointDatabaseRef[]>
 	runtimeLicense(): Promise<string>
 	/**
 	 * The configured license key, verified offline against the trusted keys this
@@ -196,6 +203,7 @@ export async function defaultDoctorDeps(): Promise<DoctorDeps> {
 		readLayerIdentity,
 		layerDatabases: () => layerDatabases(dataRoot),
 		layerAlternates: (id) => layerDatabaseAlternates(dataRoot, id),
+		addressPointDatabases: () => addressPointDatabases(dataRoot),
 		runtimeLicense: readRuntimeLicense,
 		licenseKey: () => verifyConfiguredLicenseKey(),
 		confirmLicenseKeyPublished: (kid) => confirmLicenseKeyPublished(kid),
@@ -313,6 +321,28 @@ async function gatherLayerLicense(deps: DoctorDeps, layer: LayerDatabaseRef): Pr
 	}
 }
 
+/**
+ * The license observation for an address-point database found on disk.
+ *
+ * The file was listed from its directory, so it exists, and an unreadable manifest
+ * is reported as unreadable rather than as an absent layer.
+ */
+async function gatherAddressPointLicense(
+	deps: DoctorDeps,
+	database: AddressPointDatabaseRef
+): Promise<LayerLicenseObservation> {
+	try {
+		return { ...database, manifest: await deps.readLayerIdentity(database.path), error: null, alternates: null }
+	} catch (error) {
+		return {
+			...database,
+			manifest: null,
+			error: error instanceof Error ? error.message : String(error),
+			alternates: null,
+		}
+	}
+}
+
 async function gatherOverlay(deps: DoctorDeps, locale: string): Promise<DoctorCheck> {
 	const packageName = deps.weightsPackageName(locale)
 
@@ -373,10 +403,16 @@ export async function runDoctor(overrides?: Partial<DoctorDeps>): Promise<Doctor
 		lidStatus: lidStatus ?? null,
 	})
 
-	const layerObservations = (
+	const fixedLayerObservations = (
 		await Promise.all(deps.layerDatabases().map((layer) => gatherLayerLicense(deps, layer)))
 	).filter((o): o is LayerLicenseObservation => o !== null)
 
+	const addressPointObservations = await Promise.all(
+		(await deps.addressPointDatabases()).map((database) => gatherAddressPointLicense(deps, database))
+	)
+
+	const layerObservations = [...fixedLayerObservations, ...addressPointObservations]
+
 	const layerLicenses = layerObservations.map(layerLicenseCheck)
 
 	const posture = await gatherObligationPosture(deps, gazetteerObservation, layerObservations)