mailwoman 9.0.0 → 9.1.0

package/cli-kit/index.ts

@@ -2,157 +2,6 @@
  * @copyright Sister Software
  * @license AGPL-3.0
  * @author Teffen Ellis, et al.
- *
- *   The command toolkit for `mailwoman/commands/*` — Pastel/Ink helper types, the one-shot
- *   {@linkcode useCommandTask} runner, and the {@linkcode CheckList} renderer. Lives OUTSIDE
- *   `commands/` (Pastel treats every file there as a command) and OUTSIDE `sdk/` (`sdk/` submodules
- *   mean data acquisition). Built with `createElement`, not JSX, so the module stays plain `.ts` —
- *   importable under node's type stripping (the dev `node →` exports condition).
  */
 
-import { type PlacetypeRole, PlacetypeRoles } from "@mailwoman/core"
-import { Box, Text } from "ink"
-import { createElement as h, useEffect, useState } from "react"
-import type * as React from "react"
-import type * as zod from "zod"
-
-/**
- * Type-helper to infer the positional arguments of a command.
- */
-export interface PositionalArguments<T extends zod.ZodTypeAny> {
-	args: zod.infer<T>
-}
-
-/**
- * React component for a command with positional arguments.
- */
-export type PositionalCommandComponent<T extends zod.ZodTypeAny> = React.FC<PositionalArguments<T>>
-
-/**
- * Type-helper to infer the options of a command.
- */
-export interface CommandProps<
-	OptionProps extends zod.ZodObject,
-	PositionalProps extends zod.ZodTypeAny | unknown = unknown,
-> {
-	options: zod.infer<OptionProps>
-	args: PositionalProps extends zod.ZodTypeAny ? zod.infer<PositionalProps> : unknown[]
-}
-
-/**
- * React component for a command with options.
- */
-export type CommandComponent<
-	OptionProps extends zod.ZodObject,
-	PositionalProps extends zod.ZodTypeAny | unknown = unknown,
-> = React.FC<CommandProps<OptionProps, PositionalProps>>
-
-/**
- * The lifecycle of a command's one-shot async task.
- */
-export type CommandTaskState<T> =
-	| { status: "running" }
-	| { status: "done"; result: T }
-	| { status: "error"; message: string }
-
-/**
- * Run a command's one-shot async task and own the exit-code discipline: rejection renders the error state and exits 1;
- * resolution exits with `exitCode(result)` (default 0) — always AFTER the final frame committed. Replaces the
- * copy-pasted useEffect/useState/setImmediate dance in every command.
- */
-/* oxlint-disable react-hooks/exhaustive-deps -- One-shot by design: the task/exitCode closures
-   capture their options at mount; tracking them (fresh closure per render) would re-run the task
-   every render. The empty/[state] deps are the point. */
-export function useCommandTask<T>(task: () => Promise<T>, exitCode?: (result: T) => number): CommandTaskState<T> {
-	const [state, setState] = useState<CommandTaskState<T>>({ status: "running" })
-
-	useEffect(() => {
-		void task().then(
-			(result) => setState({ status: "done", result }),
-			(error: unknown) =>
-				setState({ status: "error", message: error instanceof Error ? (error.stack ?? error.message) : String(error) })
-		)
-	}, [])
-
-	useEffect(() => {
-		if (state.status === "running") return
-		const code = state.status === "error" ? 1 : (exitCode?.(state.result) ?? 0)
-		setImmediate(() => process.exit(code))
-	}, [state])
-
-	return state
-}
-
-/* oxlint-enable react-hooks/exhaustive-deps */
-
-/**
- * Build a guidance-grade error whose rendered form is exactly `message` — no stack. {@linkcode useCommandTask} renders
- * `error.stack ?? error.message`, which is right for unexpected failures but turns deliberate user-facing guidance
- * ("Set $MAILWOMAN_WOF_DB…") into a stack dump. Throw `commandError(msg)` for those instead of `new Error(msg)`.
- */
-export function commandError(message: string): Error {
-	const error = new Error(message)
-	error.stack = message
-
-	return error
-}
-
-/**
- * One ✓/✗ line in a {@linkcode CheckList}.
- */
-export interface Check {
-	ok: boolean
-	check: string
-	detail?: string
-}
-
-/**
- * The ✓/✗ check-list + PASS/FAIL renderer (extracted from `gazetteer verify`). Pass `verdict` to append the summary
- * line.
- */
-export function CheckList({ checks, verdict }: { checks: readonly Check[]; verdict?: boolean }): React.ReactElement {
-	const lines = checks.map((c, i) =>
-		h(
-			Text,
-			{ key: i, color: c.ok ? "green" : "red" },
-			`${c.ok ? "✓" : "✗"} ${c.check}${c.detail ? `: ${c.detail}` : ""}`
-		)
-	)
-
-	const summary =
-		verdict === undefined
-			? null
-			: h(
-					Text,
-					{ color: verdict ? "green" : "red" },
-					`${verdict ? "PASS" : "FAIL"} (${checks.filter((c) => c.ok).length}/${checks.length} checks)`
-				)
-
-	return h(Box, { flexDirection: "column" }, ...lines, summary)
-}
-
-/**
- * Parse a `--roles a,b,c` flag into validated {@link PlacetypeRole}s, or `undefined` when the flag is absent (which
- * every caller reads as "all roles").
- *
- * Rejects an unknown role with {@link commandError} rather than silently filtering it — a typo in a role name would
- * otherwise produce an empty, entirely plausible-looking result.
- */
-export function parseRoles(raw: string | undefined): PlacetypeRole[] | undefined {
-	if (!raw) return undefined
-
-	const valid = new Set<string>(PlacetypeRoles)
-
-	const parsed = raw
-		.split(",")
-		.map((s) => s.trim())
-		.filter(Boolean)
-
-	for (const role of parsed) {
-		if (!valid.has(role)) {
-			throw commandError(`Unknown placetype role '${role}'. Valid roles: ${PlacetypeRoles.join(", ")}.`)
-		}
-	}
-
-	return parsed as PlacetypeRole[]
-}
+export * from "./shared.ts"

package/cli-kit/shared.ts

@@ -0,0 +1,176 @@
+/**
+ * @copyright Sister Software
+ * @license AGPL-3.0
+ * @author Teffen Ellis, et al.
+ *
+ *   The command toolkit for `mailwoman/commands/*` — Pastel/Ink helper types, the one-shot
+ *   {@linkcode useCommandTask} runner, and the {@linkcode CheckList} renderer. Lives OUTSIDE
+ *   `commands/` (Pastel treats every file there as a command) and OUTSIDE `sdk/` (`sdk/` submodules
+ *   mean data acquisition). Built with `createElement`, not JSX, so the module stays plain `.ts` —
+ *   importable under node's type stripping (the dev `node →` exports condition).
+ */
+
+import { type PlacetypeRole, PlacetypeRoles } from "@mailwoman/core"
+import { Box, Text } from "ink"
+import { createElement as h, useEffect, useState } from "react"
+import type * as React from "react"
+import type * as zod from "zod"
+
+/**
+ * Type-helper to infer the positional arguments of a command.
+ */
+export interface PositionalArguments<T extends zod.ZodTypeAny> {
+	args: zod.infer<T>
+}
+
+/**
+ * React component for a command with positional arguments.
+ */
+export type PositionalCommandComponent<T extends zod.ZodTypeAny> = React.FC<PositionalArguments<T>>
+
+/**
+ * Type-helper to infer the options of a command.
+ */
+export interface CommandProps<
+	OptionProps extends zod.ZodObject,
+	PositionalProps extends zod.ZodTypeAny | unknown = unknown,
+> {
+	options: zod.infer<OptionProps>
+	args: PositionalProps extends zod.ZodTypeAny ? zod.infer<PositionalProps> : unknown[]
+}
+
+/**
+ * React component for a command with options.
+ */
+export type CommandComponent<
+	OptionProps extends zod.ZodObject,
+	PositionalProps extends zod.ZodTypeAny | unknown = unknown,
+> = React.FC<CommandProps<OptionProps, PositionalProps>>
+
+/**
+ * The lifecycle of a command's one-shot async task.
+ */
+export type CommandTaskState<T> =
+	| { status: "running" }
+	| { status: "done"; result: T }
+	| { status: "error"; message: string }
+
+/**
+ * Run a command's one-shot async task and own the exit-code discipline: rejection renders the error state and exits 1;
+ * resolution exits with `exitCode(result)` (default 0) — always AFTER the final frame committed. Replaces the
+ * copy-pasted useEffect/useState/setImmediate dance in every command.
+ */
+/* oxlint-disable react-hooks/exhaustive-deps -- One-shot by design: the task/exitCode closures
+	 capture their options at mount; tracking them (fresh closure per render) would re-run the task
+	 every render. The empty/[state] deps are the point. */
+export function useCommandTask<T>(task: () => Promise<T>, exitCode?: (result: T) => number): CommandTaskState<T> {
+	const [state, setState] = useState<CommandTaskState<T>>({ status: "running" })
+
+	useEffect(() => {
+		void task().then(
+			(result) => setState({ status: "done", result }),
+			(error: unknown) =>
+				setState({ status: "error", message: error instanceof Error ? (error.stack ?? error.message) : String(error) })
+		)
+	}, [])
+
+	useEffect(() => {
+		if (state.status === "running") return
+		const code = state.status === "error" ? 1 : (exitCode?.(state.result) ?? 0)
+		setImmediate(() => process.exit(code))
+	}, [state])
+
+	return state
+}
+
+/* oxlint-enable react-hooks/exhaustive-deps */
+
+/**
+ * Emit a command's final output as raw bytes, bypassing Ink's `<Text>` renderer.
+ *
+ * Ink word-wraps rendered text at the terminal width — and at 80 columns when stdout is piped — which corrupts
+ * machine-readable output: a JSON string value longer than the width gets real newlines inserted mid-string, breaking
+ * the document (observed 2026-08-07: `geocode --format json` on "Toledo Ohio" wrapped `intent_markers[].message` at 80
+ * cols). Machine formats (json/jsonld/xml/tuple, `--json` flags) must never pass through `<Text>`.
+ *
+ * Returns `null` so the caller can `return writeRawStdout(result)` from the done branch. Safe to call from render:
+ * {@linkcode useCommandTask} renders the done frame exactly once before its `process.exit`. Same pattern as
+ * `commands/gazetteer/inspect/graph.tsx`.
+ */
+export function writeRawStdout(text: string): null {
+	process.stdout.write(text + "\n")
+
+	return null
+}
+
+/**
+ * Build a guidance-grade error whose rendered form is exactly `message` — no stack. {@linkcode useCommandTask} renders
+ * `error.stack ?? error.message`, which is right for unexpected failures but turns deliberate user-facing guidance
+ * ("Set $MAILWOMAN_WOF_DB…") into a stack dump. Throw `commandError(msg)` for those instead of `new Error(msg)`.
+ */
+export function commandError(message: string): Error {
+	const error = new Error(message)
+	error.stack = message
+
+	return error
+}
+
+/**
+ * One ✓/✗ line in a {@linkcode CheckList}.
+ */
+export interface Check {
+	ok: boolean
+	check: string
+	detail?: string
+}
+
+/**
+ * The ✓/✗ check-list + PASS/FAIL renderer (extracted from `gazetteer verify`). Pass `verdict` to append the summary
+ * line.
+ */
+export function CheckList({ checks, verdict }: { checks: readonly Check[]; verdict?: boolean }): React.ReactElement {
+	const lines = checks.map((c, i) =>
+		h(
+			Text,
+			{ key: i, color: c.ok ? "green" : "red" },
+			`${c.ok ? "✓" : "✗"} ${c.check}${c.detail ? `: ${c.detail}` : ""}`
+		)
+	)
+
+	const summary =
+		verdict === undefined
+			? null
+			: h(
+					Text,
+					{ color: verdict ? "green" : "red" },
+					`${verdict ? "PASS" : "FAIL"} (${checks.filter((c) => c.ok).length}/${checks.length} checks)`
+				)
+
+	return h(Box, { flexDirection: "column" }, ...lines, summary)
+}
+
+/**
+ * Parse a `--roles a,b,c` flag into validated {@link PlacetypeRole}s, or `undefined` when the flag is absent (which
+ * every caller reads as "all roles").
+ *
+ * Rejects an unknown role with {@link commandError} rather than silently filtering it — a typo in a role name would
+ * otherwise produce an empty, entirely plausible-looking result.
+ */
+export function parseRoles(raw: string | undefined): PlacetypeRole[] | undefined {
+	if (!raw) return undefined
+
+	const valid = new Set<string>(PlacetypeRoles)
+
+	const parsed = raw
+		.split(",")
+		.map((s) => s.trim())
+		.filter(Boolean)
+
+	for (const role of parsed) {
+		if (!valid.has(role)) {
+			throw commandError(`Unknown placetype role '${role}'. Valid roles: ${PlacetypeRoles.join(", ")}.`)
+		}
+	}
+
+	return parsed as PlacetypeRole[]
+}

package/cli.ts

@@ -7,22 +7,66 @@
  */
 
 import { readFileSync } from "node:fs"
+import { findPackageJSON } from "node:module"
 
 import { parseJSONStrict } from "@mailwoman/core/objects"
+import { cliArguments, scriptEntryPath } from "@mailwoman/core/scripting/utils"
 import Pastel from "pastel"
 
-// Read the real version from this package's package.json rather than hardcoding it (it drifted to
-// 0.1.0 while the package shipped 4.x). `import.meta.url` points at the compiled out/cli.js, so
-// `../package.json` resolves to the installed package root in every layout (dev, tarball, global).
-const { version } = parseJSONStrict<{ version: string }>(
-	readFileSync(new URL("../package.json", import.meta.url), "utf8")
-)
+const packageJSONPath = findPackageJSON(import.meta.url)
+
+if (!packageJSONPath) {
+	throw new Error("Could not find package.json for mailwoman/cli")
+}
+
+const packageJSON = parseJSONStrict<{ version: string }>(readFileSync(packageJSONPath, "utf8"))
 
 const app = new Pastel({
 	importMeta: import.meta,
 	description: "A calibrated, retrieval-augmented postal-address parser — CLI + library.",
 	name: "Mailwoman CLI",
-	version,
+	version: packageJSON.version,
 })
 
-await app.run()
+/**
+ * Commands whose bare invocation (`mailwoman <name>` and nothing else) should print their own help.
+ *
+ * Without this, commander answers a missing required operand with one unhelpful line — `error: missing required
+ * argument 'address'` — and no usage, no flags, no example (#1577). Pastel never exposes its commander `program`, so
+ * the only seam is the argv we hand `app.run`: append `--help` and let commander render the real, always-in-sync help
+ * for that subcommand.
+ *
+ * Deliberately narrow — the user arguments must be EXACTLY `[<name>]`. Deciding "no operand was given" for a richer
+ * argv would mean re-implementing commander's knowledge of which flags take values, and getting that wrong turns a real
+ * geocode into a help screen.
+ */
+const HELP_ON_BARE_INVOCATION = new Set(["geocode"])
+
+/**
+ * A bare invocation is one user argument: the command name, nothing after it.
+ */
+const BARE_INVOCATION_ARGUMENT_COUNT = 1
+
+const userArguments = cliArguments()
+
+const bareInvocation =
+	userArguments.length === BARE_INVOCATION_ARGUMENT_COUNT && HELP_ON_BARE_INVOCATION.has(userArguments[0]!)
+
+if (bareInvocation) {
+	// Commander's help handler exits 0, but a missing required operand is still a usage error — and
+	// `mailwoman data` (no subcommand) already answers help-with-exit-1, so that is the house contract.
+	// Node re-reads `process.exitCode` after emitting 'exit', so a listener can still raise it.
+	process.once("exit", () => {
+		process.exitCode = 1
+	})
+}
+
+// Rebuilt in commander's node-style shape (`[runtime, script, ...user]`) from the blessed accessors — it slices from
+// index 2 and only ever reads argv[1] as a script path. argv[0] is never consulted once `program.name()` is set, which
+// Pastel does above.
+await app.run([
+	"node",
+	scriptEntryPath(),
+	...userArguments,
+	...(bareInvocation ? (["--help"] as const) : ([] as const)),
+])

package/commands/autocomplete.tsx

@@ -19,11 +19,10 @@ import { readFileSync } from "node:fs"
 
 import { $public } from "@mailwoman/core/env"
 import { Text } from "ink"
+import { type CommandComponent, commandError, useCommandTask, writeRawStdout } from "mailwoman/cli-kit"
 import { argument } from "pastel"
 import zod from "zod"
 
-import { type CommandComponent, commandError, useCommandTask } from "../cli-kit/index.ts"
-
 export { ArgumentsSchema as args, AutocompleteConfigSchema as options }
 
 const ArgumentsSchema = zod
@@ -63,7 +62,15 @@ export interface AutocompleteEntry {
 	name: string
 	placetype: string
 	wofID: number
-	importance: number
+	/**
+	 * The referential likelihood suggestions are ranked by (ROAD_TO_V9 §2).
+	 */
+	referential: number
+	/**
+	 * Encyclopedic importance when the artifact carries one — displayed, never ranked on. `undefined` = no article, or a
+	 * pre-v5 binary.
+	 */
+	encyclopedic?: number
 	completionTokens: string[]
 }
 
@@ -115,7 +122,8 @@ export async function runAutocomplete(
 		name: s.name,
 		placetype: s.placetype,
 		wofID: s.wofID,
-		importance: s.importance,
+		referential: s.referential,
+		...(s.encyclopedic === undefined ? {} : { encyclopedic: s.encyclopedic }),
 		completionTokens: s.completionTokens,
 	}))
 }
@@ -126,9 +134,11 @@ function formatSuggestions(entries: AutocompleteEntry[]): string {
 	return entries
 		.map((e, i) => {
 			const completion = e.completionTokens.length ? ` [+${e.completionTokens.join(" ")}]` : ""
-			const imp = e.importance.toFixed(4)
+			const ref = e.referential.toFixed(4)
+			// Absent encyclopedic prints nothing at all — "enc:0.0000" would assert an article that is not there.
+			const enc = e.encyclopedic === undefined ? "" : `, enc:${e.encyclopedic.toFixed(4)}`
 
-			return `${String(i + 1).padStart(2)}. ${e.name}${completion}  (${e.placetype}, wof:${e.wofID}, imp:${imp})`
+			return `${String(i + 1).padStart(2)}. ${e.name}${completion}  (${e.placetype}, wof:${e.wofID}, ref:${ref}${enc})`
 		})
 		.join("\n")
 }
@@ -158,6 +168,12 @@ const AutocompleteCommand: CommandComponent<typeof AutocompleteConfigSchema, typ
 		return <Text dimColor>Searching...</Text>
 	}
 
+	// --json emits a raw JSON array — bypass Ink's word-wrapping <Text> renderer, which corrupts
+	// long lines at 80 cols when piped (see writeRawStdout).
+	if (options.json) {
+		return writeRawStdout(state.result)
+	}
+
 	return <Text>{state.result}</Text>
 }
 

package/commands/clients/generate.tsx

@@ -15,9 +15,9 @@
  */
 
 import { Box, Text } from "ink"
+import { CheckList, type CommandComponent, useCommandTask } from "mailwoman/cli-kit"
 import zod from "zod"
 
-import { CheckList, type CommandComponent, useCommandTask } from "../../cli-kit/index.ts"
 import { generateClients } from "../../tools/generate-clients.ts"
 
 export const description = "Generate + verify the Python and Rust API clients from the emitted OpenAPI specs"

package/commands/corpus/align-shard.tsx

@@ -8,10 +8,9 @@
  */
 
 import { Text } from "ink"
+import { type CommandComponent, useCommandTask } from "mailwoman/cli-kit"
 import zod from "zod"
 
-import { type CommandComponent, useCommandTask } from "../../cli-kit/index.ts"
-
 const OptionsSchema = zod.object({
 	input: zod.string().describe("Canonical jsonl input"),
 	output: zod.string().describe("Labeled jsonl output"),

package/commands/corpus/audit.tsx

@@ -9,11 +9,10 @@
 
 import { audit } from "@mailwoman/corpus/tools"
 import { Text } from "ink"
+import { type CommandComponent, useCommandTask } from "mailwoman/cli-kit"
 import { argument } from "pastel"
 import zod from "zod"
 
-import { type CommandComponent, useCommandTask } from "../../cli-kit/index.ts"
-
 const ArgsSchema = zod.tuple([
 	zod.string().describe(
 		argument({

package/commands/corpus/build.tsx

@@ -18,11 +18,10 @@ import { parseJSONStrict } from "@mailwoman/core/objects"
 import { buildCorpus, defaultAdapterRegistry, type BuildStage } from "@mailwoman/corpus"
 import type { AdapterOptions } from "@mailwoman/corpus/types"
 import { Box, Text } from "ink"
+import { type CommandComponent, commandError, useCommandTask } from "mailwoman/cli-kit"
 import { useState } from "react"
 import zod from "zod"
 
-import { type CommandComponent, commandError, useCommandTask } from "../../cli-kit/index.ts"
-
 /**
  * `--inputs` accepts either:
  *

package/commands/corpus/download.tsx

@@ -13,12 +13,11 @@
  */
 
 import { Box, Text } from "ink"
+import { type CommandComponent, useCommandTask } from "mailwoman/cli-kit"
 import { useState } from "react"
 import zod from "zod"
 import { $ } from "zx"
 
-import { type CommandComponent, useCommandTask } from "../../cli-kit/index.ts"
-
 const DEFAULT_BUCKET = "mailwoman-assets"
 
 const OptionsSchema = zod.object({

package/commands/corpus/fetch.tsx

@@ -24,11 +24,10 @@ import {
 	fetchWikidataSubVenue,
 } from "@mailwoman/corpus/tools"
 import { Text } from "ink"
+import { type CommandComponent, useCommandTask } from "mailwoman/cli-kit"
 import { argument } from "pastel"
 import zod from "zod"
 
-import { type CommandComponent, useCommandTask } from "../../cli-kit/index.ts"
-
 const ArgsSchema = zod.tuple([
 	zod
 		.enum([

package/commands/corpus/golden/expand.tsx

@@ -11,10 +11,9 @@
 
 import { expandGolden } from "@mailwoman/corpus/tools"
 import { Text } from "ink"
+import { type CommandComponent, useCommandTask } from "mailwoman/cli-kit"
 import zod from "zod"
 
-import { type CommandComponent, useCommandTask } from "../../../cli-kit/index.ts"
-
 const OptionsSchema = zod.object({
 	corpus: zod
 		.string()

package/commands/corpus/golden/promote.tsx

@@ -11,10 +11,9 @@
 
 import { promoteGolden } from "@mailwoman/corpus/tools"
 import { Text } from "ink"
+import { type CommandComponent, useCommandTask } from "mailwoman/cli-kit"
 import zod from "zod"
 
-import { type CommandComponent, useCommandTask } from "../../../cli-kit/index.ts"
-
 const OptionsSchema = zod.object({
 	input: zod.string().describe("Candidates JSONL from corpus golden expand"),
 	bumpTo: zod.string().describe("Target golden version dir (e.g. v0.1.1)"),

package/commands/corpus/golden-relabel.tsx

@@ -11,10 +11,9 @@
  */
 
 import { Text } from "ink"
+import { type CommandComponent, useCommandTask } from "mailwoman/cli-kit"
 import zod from "zod"
 
-import { type CommandComponent, useCommandTask } from "../../cli-kit/index.ts"
-
 const OptionsSchema = zod.object({
 	input: zod.string().describe("Parent golden version dir (read-only), e.g. data/eval/golden/v0.1.2"),
 	output: zod.string().describe("Output golden version dir, e.g. data/eval/golden/v0.1.3"),

package/commands/corpus/ingest-csv.tsx

@@ -10,10 +10,9 @@
 
 import { ingestCSV } from "@mailwoman/corpus/tools"
 import { Text } from "ink"
+import { type CommandComponent, useCommandTask } from "mailwoman/cli-kit"
 import zod from "zod"
 
-import { type CommandComponent, useCommandTask } from "../../cli-kit/index.ts"
-
 const OptionsSchema = zod.object({
 	input: zod.string().describe("CSV file to ingest"),
 	table: zod.string().optional().describe("SQLite table name (default: derived from the input filename)"),

package/commands/corpus/overlay-manifest.tsx

@@ -8,10 +8,9 @@
  */
 
 import { Text } from "ink"
+import { type CommandComponent, useCommandTask } from "mailwoman/cli-kit"
 import zod from "zod"
 
-import { type CommandComponent, useCommandTask } from "../../cli-kit/index.ts"
-
 const OptionsSchema = zod.object({
 	base: zod.string().describe("Base corpus manifest path"),
 	newDir: zod.string().describe("New overlay corpus dir"),

package/commands/corpus/run.tsx

@@ -13,11 +13,10 @@
 import { ProgressBar } from "@inkjs/ui"
 import { defaultAdapterRegistry, runAdapter } from "@mailwoman/corpus"
 import { Box, Text } from "ink"
+import { type CommandComponent, commandError, useCommandTask } from "mailwoman/cli-kit"
 import { useState } from "react"
 import zod from "zod"
 
-import { type CommandComponent, commandError, useCommandTask } from "../../cli-kit/index.ts"
-
 const ArgumentsSchema = zod.array(zod.string().describe("Adapter id (e.g. wof-admin, ban, openaddresses)"))
 
 const RunConfigSchema = zod.object({

package/commands/corpus/shard/index.tsx

@@ -15,10 +15,9 @@ import { createWriteStream } from "node:fs"
 
 import { getShardRecipe, listShardRecipes, type ShardRecipeOpts } from "@mailwoman/corpus"
 import { Box, Text } from "ink"
+import { type CommandComponent, commandError, useCommandTask } from "mailwoman/cli-kit"
 import zod from "zod"
 
-import { type CommandComponent, commandError, useCommandTask } from "../../../cli-kit/index.ts"
-
 /**
  * Bare `mailwoman corpus shard` stays the recipe runner now that `shard/` hosts subcommands.
  */

package/commands/corpus/shard/kryptonite.tsx

@@ -10,10 +10,9 @@
 
 import { buildKryptoniteShard } from "@mailwoman/corpus/tools"
 import { Text } from "ink"
+import { type CommandComponent, useCommandTask } from "mailwoman/cli-kit"
 import zod from "zod"
 
-import { type CommandComponent, useCommandTask } from "../../../cli-kit/index.ts"
-
 const OptionsSchema = zod.object({
 	jsonl: zod.string().describe("Canonical kryptonite JSONL to shard"),
 	baseManifest: zod.string().describe("Base corpus MANIFEST.json whose shards carry forward"),

package/commands/corpus/shard/translit.tsx

@@ -11,10 +11,9 @@
 
 import { buildTranslitShard } from "@mailwoman/corpus/tools"
 import { Text } from "ink"
+import { type CommandComponent, useCommandTask } from "mailwoman/cli-kit"
 import zod from "zod"
 
-import { type CommandComponent, useCommandTask } from "../../../cli-kit/index.ts"
-
 const OptionsSchema = zod.object({
 	jsonl: zod.string().describe("Canonical transliteration JSONL to shard"),
 	baseManifest: zod.string().describe("Base corpus MANIFEST.json whose shards carry forward"),