hollware 1.0.0-rc.1 → 1.0.0-rc.2

package/dist/{d1-BvAz-iyW.mjs → d1-B6dc_ugC.mjs}

@@ -1,6 +1,6 @@
 import { n as UsageError, t as CliError } from "./errors-DJX_jiSP.mjs";
 import { t as printable } from "./format-Dvk_h5ys.mjs";
-import { n as failureReason } from "./wrangler-DO3h-eNH.mjs";
+import { n as failureReason } from "./wrangler-C0QYL8dC.mjs";
 import { t as parseJsonc } from "./jsonc-CA2ezIB6.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";

package/dist/{deploy-DsHNryRG.mjs → deploy-sYjaZ0d4.mjs}

@@ -1,9 +1,9 @@
 import { t as CliError } from "./errors-DJX_jiSP.mjs";
-import { i as stripAnsi, n as failureReason } from "./wrangler-DO3h-eNH.mjs";
+import { i as stripAnsi, n as failureReason } from "./wrangler-C0QYL8dC.mjs";
 import { t as parseFlags } from "./args-D42wi6n2.mjs";
-import { f as ownerQuery, i as resolveDatabase, r as query } from "./d1-BvAz-iyW.mjs";
+import { f as ownerQuery, i as resolveDatabase, r as query } from "./d1-B6dc_ugC.mjs";
 import { t as publicUrlOf } from "./public-url-d_yOsEMO.mjs";
-import { i as migrate } from "./migrate-D2QcagMk.mjs";
+import { i as migrate } from "./migrate-Dx-imcel.mjs";
 import { existsSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 //#region src/commands/deploy.ts
@@ -16,13 +16,30 @@ const DEPLOY_USAGE = [
 	"",
 	"HOLLWARE_PUBLIC_URL must be the public URL of the Worker. While it is a localhost URL, the",
 	"workers.dev URL that wrangler prints is written into wrangler.jsonc, and the Worker is deployed",
-	"again with it. Run \"wrangler login\" first.",
+	"again with it. A URL on a domain of your own (not workers.dev) also gets a route in",
+	"wrangler.jsonc that serves the Worker there as a custom domain: Cloudflare makes its DNS record",
+	"and its certificate, in a zone of the same account. Run \"wrangler login\" first.",
 	"",
 	"Options:",
 	"  --url <url>  The public URL of the Worker, such as https://cms.example.com (default: the",
 	"               HOLLWARE_PUBLIC_URL of wrangler.jsonc, or the workers.dev URL)",
 	"  --help       Show this help"
 ].join("\n");
+/** "Run wrangler login" only when wrangler says so: another failure has nothing to do with it. */
+function loginHint(result) {
+	return /not logged in|log ?in|authenticat|oauth|api token/i.test(`${result.stdout}\n${result.stderr}`) ? " Is wrangler logged in (\"wrangler login\")?" : "";
+}
+/**
+* `wrangler types` after deploy rewrote wrangler.jsonc: the types of the Worker hold the value of
+* HOLLWARE_PUBLIC_URL, and `wrangler types --check` fails on the old one. A project without the
+* generated file has nothing to keep current.
+*/
+async function regenerateTypes(io) {
+	if (!existsSync(join(io.cwd, "worker-configuration.d.ts"))) return;
+	const typed = await io.wrangler(["types"]);
+	if (typed.code !== 0) throw new CliError(`wrangler could not write the types of the Worker: ${failureReason(typed)}`);
+	io.out("Wrote worker-configuration.d.ts again, for the new wrangler.jsonc.");
+}
 /** The workers.dev URL that `wrangler deploy` prints, or `undefined`. */
 function workersDevUrlOf(stdout) {
 	const match = /https:\/\/[a-z0-9-]+(?:\.[a-z0-9-]+)*\.workers\.dev(?![\w.-])/i.exec(stripAnsi(stdout));
@@ -33,6 +50,24 @@ function isLoopback(url) {
 	const { hostname } = new URL(url);
 	return hostname === "localhost" || hostname === "127.0.0.1" || hostname === "[::1]";
 }
+/** The host of a public URL on a domain of its own: neither this machine nor workers.dev. */
+function customDomainOf(url) {
+	if (isLoopback(url)) return void 0;
+	const { hostname } = new URL(url);
+	return /(?:^|\.)workers\.dev$/i.test(hostname) ? void 0 : hostname;
+}
+const ROUTES_KEY = /^\s*"routes"\s*:/m;
+/** The first key of the starter's wrangler.jsonc, at the top level of the object. */
+const TOP_LEVEL_NAME = /^ {2}"name"\s*:\s*"[^"\n]*",[^\n]*\n/m;
+/**
+* `wrangler.jsonc` with a route that serves the Worker at `host` as a custom domain, after its
+* `name`, and everything else as it was. A config with routes of its own is left as it is.
+*/
+function withCustomDomain(text, host) {
+	if (ROUTES_KEY.test(text)) return text;
+	if (!TOP_LEVEL_NAME.test(text)) throw new CliError(`wrangler.jsonc has no "name" at its top. Add "routes": [{ "pattern": "${host}", "custom_domain": true }] to it.`);
+	return text.replace(TOP_LEVEL_NAME, (line) => `${line}  // The custom domain of the Worker: Cloudflare makes its DNS record and its certificate.\n  "routes": [{ "pattern": ${JSON.stringify(host)}, "custom_domain": true }],\n`);
+}
 const PUBLIC_URL_VALUE = /("HOLLWARE_PUBLIC_URL"\s*:\s*)"[^"\n]*"/;
 /**
 * `wrangler.jsonc` with `HOLLWARE_PUBLIC_URL` set to `url`, and everything else as it was: its
@@ -44,7 +79,7 @@ function withPublicUrl(text, url) {
 }
 async function wranglerDeploy(io) {
 	const deployed = await io.wrangler(["deploy"]);
-	if (deployed.code !== 0) throw new CliError(`wrangler could not deploy: ${failureReason(deployed)}. Is wrangler logged in ("wrangler login")?`);
+	if (deployed.code !== 0) throw new CliError(`wrangler could not deploy: ${failureReason(deployed).replace(/\.$/, "")}.${loginHint(deployed)}`);
 	return deployed.stdout;
 }
 async function deploy(argv, io) {
@@ -65,14 +100,29 @@ async function deploy(argv, io) {
 	const configured = publicUrlOf(io.cwd, void 0);
 	const asked = values.url === void 0 ? void 0 : publicUrlOf(io.cwd, values.url);
 	const database = resolveDatabase(io.cwd, void 0);
+	const known = asked ?? (configured !== void 0 && !isLoopback(configured) ? configured : void 0);
+	const domain = known === void 0 ? void 0 : customDomainOf(known);
+	let written = configured;
+	if (known !== void 0 && domain !== void 0) {
+		const before = readFileSync(file, "utf8");
+		const withUrl = known === configured ? before : withPublicUrl(before, known);
+		const after = withCustomDomain(withUrl, domain);
+		if (after === withUrl && !withUrl.includes(JSON.stringify(domain))) io.out(`wrangler.jsonc has routes of its own and none for ${domain}: add { "pattern": "${domain}", "custom_domain": true } to them.`);
+		if (after !== before) {
+			writeFileSync(file, after);
+			io.out(`Serving the Worker at ${domain}: set HOLLWARE_PUBLIC_URL and its route in wrangler.jsonc.`);
+			await regenerateTypes(io);
+		}
+		written = known;
+	}
 	io.out("Deploying with wrangler ...");
 	const printed = await wranglerDeploy(io);
-	let url = asked ?? (configured !== void 0 && !isLoopback(configured) ? configured : void 0);
-	url ??= workersDevUrlOf(printed);
+	const url = known ?? workersDevUrlOf(printed);
 	if (url === void 0) throw new CliError("wrangler deployed the Worker but printed no workers.dev URL. Run \"hollware deploy --url <the public URL of the Worker>\".");
-	if (url !== configured) {
+	if (url !== written) {
 		writeFileSync(file, withPublicUrl(readFileSync(file, "utf8"), url));
 		io.out(`Set HOLLWARE_PUBLIC_URL to ${url} in wrangler.jsonc. Deploying again with it ...`);
+		await regenerateTypes(io);
 		await wranglerDeploy(io);
 	}
 	await ensureMasterSecret(io);
@@ -88,7 +138,7 @@ async function deploy(argv, io) {
 		`  MCP    ${url}/mcp`,
 		`  Admin  ${url}/admin/`,
 		"",
-		"Commit wrangler.jsonc: it holds the ids of what the deploy created, and the public URL.",
+		"Commit wrangler.jsonc: it holds the public URL, and any id wrangler wrote into it.",
 		...owners.length === 0 ? [
 			"",
 			"Next: create your site and its owner in the remote database. It prints a token for your",

package/dist/{dev--aG_y4gx.mjs → dev-B2gk-YHQ.mjs}

@@ -1,5 +1,5 @@
 import { n as UsageError, t as CliError } from "./errors-DJX_jiSP.mjs";
-import { r as findBin } from "./wrangler-DO3h-eNH.mjs";
+import { r as findBin } from "./wrangler-C0QYL8dC.mjs";
 import { t as parseFlags } from "./args-D42wi6n2.mjs";
 import { t as publicUrlOf } from "./public-url-d_yOsEMO.mjs";
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
@@ -16,10 +16,13 @@ const DEV_USAGE = [
 	"With --detach it starts the server in the background, writes its process id and URL to",
 	`.wrangler/hollware-dev.json, prints the ready line and exits 0. "hollware dev --stop" stops what`,
 	"that file names.",
+	"Once \"hollware deploy\" has written the public URL into wrangler.jsonc, the local server still",
+	"answers at localhost: the vite.config.ts of the project sets HOLLWARE_PUBLIC_URL to it in",
+	"development, and hollware dev waits for it there.",
 	"",
 	"Options:",
-	"  --url <url>          Where the server listens (default: HOLLWARE_PUBLIC_URL of wrangler.jsonc,",
-	"                       else http://localhost:5199)",
+	"  --url <url>          Where the server listens (default: HOLLWARE_PUBLIC_URL of wrangler.jsonc",
+	"                       when it is a localhost URL, else http://localhost:5199)",
 	"  --timeout <seconds>  How long to wait for /health, 1 to 600 (default: 60)",
 	"  --detach             Start it in the background and exit",
 	"  --stop               Stop the server that --detach started",
@@ -56,7 +59,8 @@ async function dev(argv, io) {
 		return stop(io, host, json);
 	}
 	const timeout = timeoutOf(values.timeout);
-	const url = (publicUrlOf(io.cwd, values.url) ?? DEFAULT_URL).replace(/\/$/, "");
+	const configured = publicUrlOf(io.cwd, void 0);
+	const url = values.url !== void 0 ? publicUrlOf(io.cwd, values.url) ?? DEFAULT_URL : configured !== void 0 && isLoopback(configured) ? configured : DEFAULT_URL;
 	const bin = findBin(io.cwd, "vp");
 	if (bin === void 0) throw new CliError(`vp is not installed in ${io.cwd} or any directory above it. Install the dependencies of the project (for example "pnpm install") and run hollware dev from the project directory.`);
 	const detach = values.detach === true;
@@ -103,6 +107,11 @@ async function dev(argv, io) {
 		off();
 	}
 }
+/** Whether a URL is this machine's. */
+function isLoopback(url) {
+	const { hostname } = new URL(url);
+	return hostname === "localhost" || hostname === "127.0.0.1" || hostname === "[::1]";
+}
 async function stop(io, host, json) {
 	const state = readState(io.cwd);
 	if (state === void 0) {

package/dist/{doctor-fpXiQgnU.mjs → doctor-DjRkQKrh.mjs}

@@ -1,9 +1,9 @@
 import { t as CliError } from "./errors-DJX_jiSP.mjs";
-import { n as failureReason } from "./wrangler-DO3h-eNH.mjs";
+import { n as failureReason } from "./wrangler-C0QYL8dC.mjs";
 import { t as parseFlags } from "./args-D42wi6n2.mjs";
 import { t as parseJsonc } from "./jsonc-CA2ezIB6.mjs";
-import { f as ownerQuery, r as query, t as chooseTarget } from "./d1-BvAz-iyW.mjs";
-import { a as parsePendingMigrations } from "./migrate-D2QcagMk.mjs";
+import { f as ownerQuery, r as query, t as chooseTarget } from "./d1-B6dc_ugC.mjs";
+import { a as parsePendingMigrations } from "./migrate-Dx-imcel.mjs";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { join } from "node:path";
 //#region src/commands/doctor.ts
@@ -59,6 +59,10 @@ function checkConfig(cwd, config) {
 	findings.push(db === void 0 ? fail("d1-binding", `there is no D1 binding "DB"`, "Add it to d1_databases in wrangler.jsonc, as the starter has it.") : migrations.length === 0 ? fail("d1-binding", `the D1 binding "DB" has no migrations in its migrations_dir`, "Set migrations_dir to \"node_modules/@hollware/server/migrations\", and install the dependencies.") : pass("d1-binding", `the D1 binding "DB" has ${migrations.length} migrations`));
 	const kv = records(config["kv_namespaces"]).some((entry) => entry["binding"] === "OAUTH_KV");
 	findings.push(kv ? pass("kv-binding", "the KV binding \"OAUTH_KV\" is there") : fail("kv-binding", "there is no KV binding \"OAUTH_KV\", which the OAuth server needs", "Add { \"binding\": \"OAUTH_KV\" } to kv_namespaces in wrangler.jsonc."));
+	const media = records(config["r2_buckets"]).some((entry) => entry["binding"] === "MEDIA");
+	findings.push(media ? pass("media-bucket", "the R2 bucket \"MEDIA\" keeps the images of the sites") : fail("media-bucket", "there is no R2 bucket \"MEDIA\", so upload_asset answers unavailable", "Add { \"binding\": \"MEDIA\", \"bucket_name\": \"<name>-media\" } to r2_buckets in wrangler.jsonc; hollware deploy creates the bucket."));
+	const images = isRecord(config["images"]) && config["images"]["binding"] === "IMAGES";
+	findings.push(pass("images-binding", images ? "the Images binding \"IMAGES\" converts each image once, by the media setting of its site" : "there is no Images binding \"IMAGES\": images are kept as they come, unconverted (add \"images\": { \"binding\": \"IMAGES\" } to convert them)"));
 	const assets = isRecord(config["assets"]) ? config["assets"] : void 0;
 	const directory = typeof assets?.["directory"] === "string" ? assets["directory"] : void 0;
 	const admin = directory !== void 0 && existsSync(join(cwd, directory, "admin"));

package/dist/{export-Ims-m9Rl.mjs → export-HsextQcU.mjs}

@@ -2,15 +2,15 @@ import { n as UsageError, t as CliError } from "./errors-DJX_jiSP.mjs";
 import { t as printable } from "./format-Dvk_h5ys.mjs";
 import { t as readVersion } from "./version-BMhdZaNo.mjs";
 import { t as parseFlags } from "./args-D42wi6n2.mjs";
-import { a as redact, c as openSession, i as readToken, o as withoutToken, r as mcpEndpoint, s as ToolFailure } from "./import-CR4G8q5W.mjs";
+import { a as redact, c as openSession, i as readToken, o as withoutToken, r as mcpEndpoint, s as ToolFailure } from "./import-BpIvnM-l.mjs";
 import { mkdirSync, readdirSync, writeFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
-import { describeSite, getEntry, listEntries, schemas } from "@hollware/core";
+import { EXTENSIONS, describeSite, getAsset, getEntry, listEntries, schemas } from "@hollware/core";
 //#region src/commands/export.ts
 const EXPORT_USAGE = [
 	"Usage: hollware export <directory> --url <hollware url> (--token-file <file> | token on stdin)",
 	"                       [--site <key>] [--collection <name>]... [--locale <code>]...",
-	"                       [--published] [--dry-run]",
+	"                       [--published] [--assets <dir> --assets-url <path>] [--dry-run]",
 	"",
 	"Writes the entries of a running Hollware, read over MCP, as Markdown files at",
 	"<directory>/<collection>/<locale>/<slug>.md: the layout \"hollware import\" reads. Each file is",
@@ -26,6 +26,11 @@ const EXPORT_USAGE = [
 	"  --locale <code>      Export only this locale; repeat it for several",
 	"  --published          Export only the published entries, as they are published; by default the",
 	"                       latest revision of every entry, drafts included",
+	"  --assets <dir>       Write the images the entries show to <dir>, as the site serves them,",
+	"                       and point each asset: reference at --assets-url: for a site that",
+	"                       serves its images itself. Without it, the images go to <directory>/_assets",
+	"                       as they were uploaded, with assets.json, which \"hollware import\" uploads again",
+	"  --assets-url <path>  With --assets: the path the site serves <dir> at, such as /images/cms/",
 	"  --dry-run            List the files it would write, and write nothing",
 	"  --help               Show this help",
 	"",
@@ -55,6 +60,8 @@ async function exportContent(argv, io) {
 				multiple: true
 			},
 			published: { type: "boolean" },
+			assets: { type: "string" },
+			"assets-url": { type: "string" },
 			"dry-run": { type: "boolean" },
 			help: { type: "boolean" }
 		}
@@ -66,9 +73,16 @@ async function exportContent(argv, io) {
 	const [directory, ...extra] = positionals;
 	if (directory === void 0 || extra.length > 0) throw new UsageError("export takes one directory: hollware export <directory> --url <url>.");
 	if (values.url === void 0) throw new UsageError("--url is required: the address of your Hollware, such as https://cms.example.com.");
+	if (values.assets === void 0 !== (values["assets-url"] === void 0)) throw new UsageError("--assets and --assets-url go together: where to write the images, and the path the site serves them at.");
 	const endpoint = mcpEndpoint(values.url);
 	const root = resolve(io.cwd, directory);
 	checkTarget(root, directory);
+	const assets = values.assets === void 0 || values["assets-url"] === void 0 ? void 0 : {
+		root: resolve(io.cwd, values.assets),
+		directory: values.assets,
+		url: values["assets-url"]
+	};
+	if (assets !== void 0) checkTarget(assets.root, assets.directory);
 	const token = await readToken(io, values["token-file"]);
 	try {
 		return await exportEntries({
@@ -81,6 +95,7 @@ async function exportContent(argv, io) {
 			collections: values.collection,
 			locales: values.locale,
 			published: values.published === true,
+			assets,
 			dryRun: values["dry-run"] === true
 		});
 	} catch (error) {
@@ -100,6 +115,8 @@ function checkTarget(root, directory) {
 	}
 	if (names.length > 0) throw new CliError(`${printable(directory)} is not empty: export into a new or an empty directory, so that no file is overwritten. Nothing was written.`);
 }
+/** Every `asset:` reference in Markdown, by id (ADR-038). */
+const ASSET_REFERENCE = /asset:(ast_[0-9a-f]{26})/g;
 /**
 * Reads everything first, then writes: a call that fails stops the export before any file is
 * written.
@@ -109,12 +126,14 @@ async function exportEntries(plan) {
 	const out = (message) => io.out(redact(message, token));
 	const session = await openSession(plan.endpoint, token, readVersion());
 	let files;
+	let images;
 	let siteKey;
 	try {
 		const { site } = await session.call(describeSite, {});
 		siteKey = site.key;
 		if (plan.site !== void 0 && plan.site !== site.key) throw new CliError(`the token is of the site ${printable(JSON.stringify(site.key))}, not ${printable(JSON.stringify(plan.site))}: a personal token reads the one site it is of. Use a token of ${printable(plan.site)}.`);
 		files = await readAll(session, await listAll(session, chosen("collection", site.collections.map((collection) => collection.name), plan.collections), plan.locales === void 0 ? [void 0] : chosen("locale", site.locales, plan.locales), published), published);
+		images = await readImages(session, plan, files);
 	} finally {
 		await session.close();
 	}
@@ -123,8 +142,10 @@ async function exportEntries(plan) {
 		out(`No entries to export from the site ${printable(siteKey)} (${view}). Nothing was written.`);
 		return 0;
 	}
+	const imagesRoot = plan.assets?.root ?? join(root, "_assets");
+	const imagesShown = plan.assets?.directory ?? join(directory, "_assets");
 	if (dryRun) {
-		out(files.map((file) => `would write  ${printable(file.path)}`).join("\n"));
+		out([...files.map((file) => `would write  ${printable(file.path)}`), ...images.map((image) => `would write  ${printable(join(imagesShown, image.path))}`)].join("\n"));
 		out(`Dry run: ${count(files.length, "entry", "entries")} of the site ${printable(siteKey)} would be written to ${printable(directory)} (${view}):\n${groupSummary(files)}\nNothing was written.`);
 		return 0;
 	}
@@ -139,6 +160,16 @@ async function exportEntries(plan) {
 		}
 		written += 1;
 	}
+	for (const image of images) {
+		const target = join(imagesRoot, image.path);
+		try {
+			mkdirSync(dirname(target), { recursive: true });
+			writeFileSync(target, image.bytes, { flag: "wx" });
+		} catch (error) {
+			throw new CliError(`could not write ${printable(join(imagesShown, image.path))}: ${error instanceof Error ? error.message : String(error)}. Remove ${printable(directory)} and run the export again.`);
+		}
+	}
+	if (images.length > 0) out(`Wrote ${count(images.filter((image) => image.path !== "assets.json").length, "image")} to ${printable(imagesShown)}.`);
 	out(`Exported ${count(files.length, "entry", "entries")} of the site ${printable(siteKey)} to ${printable(directory)} (${view}):\n${groupSummary(files)}`);
 	return 0;
 }
@@ -213,6 +244,55 @@ async function readAll(session, listed, published) {
 	}
 	return files;
 }
+/**
+* The images the entries show (ADR-038). With --assets: each as the site serves it, at
+* `<id>.<ext>`, and every `asset:` reference of the files pointed at `<assets-url><id>.<ext>`.
+* Without it: each as it was uploaded, at `_assets/<id>.<ext>`, and `assets.json` with what
+* `hollware import` needs to upload it again under the same id. Reads everything before it
+* writes, as the entries are read.
+*/
+async function readImages(session, plan, files) {
+	const ids = [...new Set(files.flatMap((file) => [...file.markdown.matchAll(ASSET_REFERENCE)].map((match) => match[1] ?? "")))].sort();
+	if (ids.length === 0) return [];
+	const images = [];
+	const manifest = {};
+	const urls = /* @__PURE__ */ new Map();
+	for (const id of ids) {
+		const answer = await session.call(getAsset, { id });
+		const asset = answer.asset;
+		if (answer.outcome !== "ok" || asset === void 0) throw new CliError(`an entry shows the image ${id}, which the site does not have. Nothing was written.`);
+		if (plan.assets !== void 0) {
+			const name = `${id}.${EXTENSIONS[asset.format]}`;
+			images.push({
+				path: name,
+				bytes: await download(new URL(asset.url), null, id)
+			});
+			urls.set(id, `${plan.assets.url}${name}`);
+		} else {
+			const original = new URL(`/v1/assets/${id}/original`, plan.endpoint);
+			const name = `${id}.${EXTENSIONS[asset.originalFormat]}`;
+			images.push({
+				path: name,
+				bytes: await download(original, plan.token, id)
+			});
+			manifest[name] = {
+				alt: asset.alt,
+				filename: asset.filename
+			};
+		}
+	}
+	if (plan.assets !== void 0) for (const file of files) file.markdown = file.markdown.replace(ASSET_REFERENCE, (reference, id) => urls.get(id) ?? reference);
+	else images.push({
+		path: "assets.json",
+		bytes: new TextEncoder().encode(`${JSON.stringify(manifest, null, 2)}\n`)
+	});
+	return images;
+}
+async function download(url, token, id) {
+	const response = await fetch(url, token === null ? {} : { headers: { authorization: `Bearer ${token}` } });
+	if (!response.ok) throw new CliError(`could not download the image ${id} (${response.status} from ${url.pathname}). Nothing was written.`);
+	return new Uint8Array(await response.arrayBuffer());
+}
 function sentence(message) {
 	return message.replace(/[\s.]+$/, "");
 }

package/dist/{import-CR4G8q5W.mjs → import-BpIvnM-l.mjs}

@@ -2,9 +2,9 @@ import { n as UsageError, t as CliError } from "./errors-DJX_jiSP.mjs";
 import { t as printable } from "./format-Dvk_h5ys.mjs";
 import { t as readVersion } from "./version-BMhdZaNo.mjs";
 import { t as parseFlags } from "./args-D42wi6n2.mjs";
-import { readFileSync, readdirSync, statSync } from "node:fs";
+import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { join, resolve } from "node:path";
-import { REFUSAL_CONTRACT_IDS, createDraft, getEntry, isPersonalToken, publish, schemas, updateDraft, validate } from "@hollware/core";
+import { REFUSAL_CONTRACT_IDS, createDraft, getEntry, isPersonalToken, publish, schemas, updateDraft, uploadAsset, validate } from "@hollware/core";
 import { Client, InsufficientScopeError, ProtocolError, SdkError, SdkErrorCode, SdkHttpError, StreamableHTTPClientTransport, UnauthorizedError } from "@modelcontextprotocol/client";
 //#region src/import/session.ts
 /** A tool failed and said so in words, instead of answering with one of its outcomes. */
@@ -338,6 +338,7 @@ async function importContent(argv, io) {
 			token,
 			endpoint,
 			directory,
+			root,
 			corpus,
 			publish: values.publish === true,
 			dryRun: values["dry-run"] === true
@@ -359,7 +360,7 @@ function withoutToken(error, token) {
 function sourceOf(from, root, options) {
 	return from === "markdown" ? readCorpus(root) : corpusFromNuxtContent(root, options);
 }
-async function importFiles({ io, token, endpoint, directory, corpus, publish: publishToo, dryRun }) {
+async function importFiles({ io, token, endpoint, directory, root, corpus, publish: publishToo, dryRun }) {
 	const out = (message) => io.out(redact(message, token));
 	if (corpus.files.length === 0 && corpus.problems.length === 0) throw new CliError(`no entries in ${directory}: expected Markdown files at <collection>/<locale>/<slug>.md, such as blog/en/hello.md.`);
 	if (corpus.files.length > 0) out(`Found ${count(corpus.files.length, "entry", "entries")} in ${directory} (${collectionSummary(corpus.files)}).`);
@@ -371,6 +372,7 @@ async function importFiles({ io, token, endpoint, directory, corpus, publish: pu
 	].join("\n"));
 	const session = await openSession(endpoint, token, readVersion());
 	try {
+		await uploadImages(session, root, directory, dryRun, out);
 		const checks = await validateAll(session, corpus.files);
 		if (dryRun) out(dryRunReport(checks));
 		const refused = checks.filter((check) => check.refusals.length > 0 || check.failure !== void 0);
@@ -668,5 +670,42 @@ function listSome(paths) {
 	const shown = paths.slice(0, 5).map(printable);
 	return paths.length > shown.length ? `${shown.join(", ")} and ${paths.length - shown.length} more` : shown.join(", ");
 }
+/**
+* The images an export kept in `_assets/` (ADR-038), uploaded before the entries that show them:
+* each is the file as it was uploaded, so it gets its id again and every `asset:` reference of the
+* entries still names it. An image the site has already is `exists`, and nothing changes.
+*/
+async function uploadImages(session, root, directory, dryRun, out) {
+	const manifestFile = join(root, "_assets", "assets.json");
+	if (!existsSync(manifestFile)) return;
+	let manifest;
+	try {
+		manifest = JSON.parse(readFileSync(manifestFile, "utf8"));
+	} catch {
+		throw new CliError(`${directory}/_assets/assets.json is not JSON. Nothing was sent.`);
+	}
+	const names = Object.keys(manifest).sort();
+	if (dryRun) {
+		out(`Would upload ${count(names.length, "image")} of ${directory}/_assets.`);
+		return;
+	}
+	let created = 0;
+	let existing = 0;
+	for (const name of names) {
+		const { alt, filename } = manifest[name] ?? {};
+		if (!/^ast_[0-9a-f]{26}\.[a-z]+$/.test(name) || typeof alt !== "string") throw new CliError(`${directory}/_assets/assets.json names ${printable(name)} without its alt, or not as an export writes it. Nothing more was sent.`);
+		const data = readFileSync(join(root, "_assets", name)).toString("base64");
+		const answer = await session.call(uploadAsset, {
+			filename: typeof filename === "string" && filename !== "" ? filename : name,
+			alt,
+			data
+		});
+		if (answer.outcome === "created") created += 1;
+		else if (answer.outcome === "exists") existing += 1;
+		else throw new CliError(`could not upload ${printable(name)}: ${answer.problem?.message ?? answer.outcome} ${answer.problem?.fix ?? ""}`.trim());
+		if (answer.asset !== void 0 && `${answer.asset.id}.` !== name.slice(0, answer.asset.id.length + 1)) throw new CliError(`${printable(name)} came back as ${answer.asset.id}: the file is not the one the export wrote.`);
+	}
+	out(`Images: ${created} uploaded, ${existing} already there.`);
+}
 //#endregion
 export { redact as a, openSession as c, readToken as i, importContent as n, withoutToken as o, mcpEndpoint as r, ToolFailure as s, IMPORT_USAGE as t };

package/dist/import-CsbL7X6d.mjs

@@ -0,0 +1 @@
+export { n as importContent } from "./import-BpIvnM-l.mjs";

package/dist/index.mjs

@@ -2,7 +2,7 @@
 import { n as UsageError, t as CliError } from "./errors-DJX_jiSP.mjs";
 import { t as printable } from "./format-Dvk_h5ys.mjs";
 import { t as readVersion } from "./version-BMhdZaNo.mjs";
-import { t as createWranglerRunner } from "./wrangler-DO3h-eNH.mjs";
+import { t as createWranglerRunner } from "./wrangler-C0QYL8dC.mjs";
 import { spawn } from "node:child_process";
 import { mkdtempSync, realpathSync } from "node:fs";
 import { tmpdir } from "node:os";
@@ -114,16 +114,16 @@ async function main(argv, io) {
 }
 async function run(command, args, io) {
 	switch (command) {
-		case "init": return (await import("./init-BozoqmFw.mjs")).init(args, io);
-		case "dev": return (await import("./dev--aG_y4gx.mjs")).dev(args, io);
+		case "init": return (await import("./init-A7Un-Ng_.mjs")).init(args, io);
+		case "dev": return (await import("./dev-B2gk-YHQ.mjs")).dev(args, io);
 		case "mcp-config": return (await import("./mcp-config-CDOUrEpU.mjs")).mcpConfig(args, io);
-		case "migrate": return (await import("./migrate-B2GrwRh4.mjs")).migrate(args, io);
-		case "deploy": return (await import("./deploy-DsHNryRG.mjs")).deploy(args, io);
-		case "doctor": return (await import("./doctor-fpXiQgnU.mjs")).doctor(args, io);
-		case "token": return (await import("./token-BG3q6bWZ.mjs")).token(args, io);
-		case "invite": return (await import("./invite-tg1_MWv-.mjs")).invite(args, io);
-		case "export": return (await import("./export-Ims-m9Rl.mjs")).exportContent(args, io);
-		default: return (await import("./import-D4_IhUC7.mjs")).importContent(args, io);
+		case "migrate": return (await import("./migrate-C15IVa7w.mjs")).migrate(args, io);
+		case "deploy": return (await import("./deploy-sYjaZ0d4.mjs")).deploy(args, io);
+		case "doctor": return (await import("./doctor-DjRkQKrh.mjs")).doctor(args, io);
+		case "token": return (await import("./token-DG5H7VPC.mjs")).token(args, io);
+		case "invite": return (await import("./invite-CsGI2Gut.mjs")).invite(args, io);
+		case "export": return (await import("./export-HsextQcU.mjs")).exportContent(args, io);
+		default: return (await import("./import-CsbL7X6d.mjs")).importContent(args, io);
 	}
 }
 function isEntryPoint() {

package/dist/{init-BozoqmFw.mjs → init-A7Un-Ng_.mjs}

@@ -1,6 +1,6 @@
 import { n as UsageError, t as CliError } from "./errors-DJX_jiSP.mjs";
 import { t as parseFlags } from "./args-D42wi6n2.mjs";
-import { _ as parseSiteKey, a as runFile, c as insertInvitation, f as ownerQuery, h as parseOwnerName, i as resolveDatabase, n as describeDatabase, o as anotherSiteScript, r as query, s as initScript, t as chooseTarget } from "./d1-BvAz-iyW.mjs";
+import { _ as parseSiteKey, a as runFile, c as insertInvitation, f as ownerQuery, h as parseOwnerName, i as resolveDatabase, n as describeDatabase, o as anotherSiteScript, r as query, s as initScript, t as chooseTarget } from "./d1-B6dc_ugC.mjs";
 import { n as setupLink, t as publicUrlOf } from "./public-url-d_yOsEMO.mjs";
 import { a as newInvitationSecret, i as newId, n as tokenFileOf, o as newPersonalToken, r as inDays, t as deliverToken } from "./token-output-DTn4X40H.mjs";
 import { a as mcpJson, i as claudeAddLine, o as setVariableLine } from "./mcp-config-BU2YmmGE.mjs";

package/dist/{invite-tg1_MWv-.mjs → invite-CsGI2Gut.mjs}

@@ -1,9 +1,9 @@
 import { n as UsageError, t as CliError } from "./errors-DJX_jiSP.mjs";
 import { t as parseFlags } from "./args-D42wi6n2.mjs";
-import { _ as parseSiteKey, c as insertInvitation, d as ownerOfSiteQuery, i as resolveDatabase, p as parseExpiresInDays, r as query, t as chooseTarget, x as sitesQuery } from "./d1-BvAz-iyW.mjs";
+import { _ as parseSiteKey, c as insertInvitation, d as ownerOfSiteQuery, i as resolveDatabase, p as parseExpiresInDays, r as query, t as chooseTarget, x as sitesQuery } from "./d1-B6dc_ugC.mjs";
 import { n as setupLink, t as publicUrlOf } from "./public-url-d_yOsEMO.mjs";
 import { a as newInvitationSecret, i as newId, r as inDays } from "./token-output-DTn4X40H.mjs";
-import { o as WHERE_OPTIONS, s as chooseSite } from "./token-B0UKrZBf.mjs";
+import { o as WHERE_OPTIONS, s as chooseSite } from "./token-BxAQXSQO.mjs";
 import { hashPersonalToken } from "@hollware/core";
 //#region src/commands/invite.ts
 const INVITE_USAGE = [

package/dist/migrate-C15IVa7w.mjs

@@ -0,0 +1 @@
+export { i as migrate } from "./migrate-Dx-imcel.mjs";

package/dist/{migrate-D2QcagMk.mjs → migrate-Dx-imcel.mjs}

@@ -1,7 +1,7 @@
 import { t as CliError } from "./errors-DJX_jiSP.mjs";
-import { i as stripAnsi, n as failureReason } from "./wrangler-DO3h-eNH.mjs";
+import { i as stripAnsi, n as failureReason } from "./wrangler-C0QYL8dC.mjs";
 import { t as parseFlags } from "./args-D42wi6n2.mjs";
-import { i as resolveDatabase, n as describeDatabase, t as chooseTarget } from "./d1-BvAz-iyW.mjs";
+import { i as resolveDatabase, n as describeDatabase, t as chooseTarget } from "./d1-B6dc_ugC.mjs";
 import { existsSync, mkdirSync, statSync } from "node:fs";
 import { dirname, join } from "node:path";
 //#region src/commands/migrate.ts

package/dist/{token-B0UKrZBf.mjs → token-BxAQXSQO.mjs}

@@ -1,7 +1,7 @@
 import { n as UsageError, t as CliError } from "./errors-DJX_jiSP.mjs";
 import { n as table, t as printable } from "./format-Dvk_h5ys.mjs";
 import { t as parseFlags } from "./args-D42wi6n2.mjs";
-import { _ as parseSiteKey, b as sitesAndOwnerQuery, g as parseScopes, i as resolveDatabase, l as insertToken, m as parseLabel, p as parseExpiresInDays, r as query, t as chooseTarget, u as listTokens, v as parseTokenId, x as sitesQuery, y as revokeToken } from "./d1-BvAz-iyW.mjs";
+import { _ as parseSiteKey, b as sitesAndOwnerQuery, g as parseScopes, i as resolveDatabase, l as insertToken, m as parseLabel, p as parseExpiresInDays, r as query, t as chooseTarget, u as listTokens, v as parseTokenId, x as sitesQuery, y as revokeToken } from "./d1-B6dc_ugC.mjs";
 import { t as publicUrlOf } from "./public-url-d_yOsEMO.mjs";
 import { i as newId, n as tokenFileOf, o as newPersonalToken, r as inDays, s as newReadToken, t as deliverToken } from "./token-output-DTn4X40H.mjs";
 import { hashPersonalToken } from "@hollware/core";

package/dist/token-DG5H7VPC.mjs

@@ -0,0 +1 @@
+export { c as token } from "./token-BxAQXSQO.mjs";

package/dist/{wrangler-DO3h-eNH.mjs → wrangler-C0QYL8dC.mjs}

@@ -80,12 +80,18 @@ function failureReason(result) {
 	const stderr = stripAnsi(result.stderr);
 	const fromJson = jsonError(stdout.trim());
 	if (fromJson !== void 0) return oneLine(fromJson);
-	const stderrLines = linesOf(stderr);
-	for (const line of stderrLines) {
+	const raw = stderr.split("\n").map((line) => line.trim());
+	for (const [index, line] of raw.entries()) {
 		const message = /^\W*\[ERROR\]\s*(.+)$/.exec(line)?.[1];
-		if (message !== void 0) return oneLine(message);
+		if (message === void 0) continue;
+		const parts = [message];
+		for (const next of raw.slice(index + 1)) {
+			if (next === "" || /^\W*\[(?:ERROR|WARNING|INFO)\]/.test(next)) break;
+			parts.push(next);
+		}
+		return oneLine(parts.join(" "));
 	}
-	return oneLine(stderrLines.at(-1) ?? linesOf(stdout).at(-1) ?? `wrangler exited with code ${result.code} and printed nothing`);
+	return oneLine(linesOf(stderr).at(-1) ?? linesOf(stdout).at(-1) ?? `wrangler exited with code ${result.code} and printed nothing`);
 }
 function linesOf(text) {
 	return text.split("\n").map((line) => line.trim()).filter((line) => line !== "" && !line.includes("Logs were written to"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hollware",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0-rc.2",
   "description": "The Hollware CLI: init, migrate, token, import and export.",
   "homepage": "https://hollware.com",
   "bugs": {
@@ -31,7 +31,7 @@
     "provenance": true
   },
   "dependencies": {
-    "@hollware/core": "1.0.0-rc.1",
+    "@hollware/core": "1.0.0-rc.2",
     "@modelcontextprotocol/client": "2.3.1",
     "zod": "4.6.7"
   },

package/dist/import-D4_IhUC7.mjs

@@ -1 +0,0 @@
-export { n as importContent } from "./import-CR4G8q5W.mjs";

package/dist/migrate-B2GrwRh4.mjs

@@ -1 +0,0 @@
-export { i as migrate } from "./migrate-D2QcagMk.mjs";

package/dist/token-BG3q6bWZ.mjs

@@ -1 +0,0 @@
-export { c as token } from "./token-B0UKrZBf.mjs";