kizlo 0.22.0 → 0.22.1

package/dist/cli/commands/dev.js

@@ -41,17 +41,18 @@ function note(text) {
 	process.stdout.write(`   ${dim}${text}${reset}\n`);
 }
 /**
-* Print the connection summary as an aligned, Next.js-style block. Shows the wp-admin URL on
-* the loopback ("Local") and — when local WordPress is installed on a LAN address rather than
-* localhost — on the network, so it can be opened from other devices. On a fresh install, also
-* show the default wp-admin login. The MCP row is the address to paste into a harness's own
+* Print the connection summary as an aligned, Next.js-style block. Shows the login URL on the
+* loopback ("Local"), and on the network too when local WordPress is installed on a LAN address
+* rather than localhost, so it can be opened from other devices. That path comes from the stack
+* (`adminPath`), since Headless Mode's login rename moves it off `/wp-admin`. On a fresh install,
+* also show the default wp-admin login. The MCP row is the address to paste into a harness's own
 * configuration: nothing writes one, because each harness reads a different file.
 */
 function printSummary(info, mcpUrl) {
 	const { cyan, dim, reset } = palette();
 	const { port, hostname } = new URL(info.url);
-	const rows = [["WP Local", `http://localhost:${port}/wp-admin`]];
-	if (hostname !== "localhost") rows.push(["WP Network", `${info.url}/wp-admin`]);
+	const rows = [["WP Local", `http://localhost:${port}${info.adminPath}`]];
+	if (hostname !== "localhost") rows.push(["WP Network", `${info.url}${info.adminPath}`]);
 	rows.push(["Database Connection", `127.0.0.1:${info.dbPort}`]);
 	if (mcpUrl) rows.push(["MCP", mcpUrl]);
 	const width = Math.max(...rows.map(([label]) => label.length)) + 1;

package/dist/cli/wp/compose/docker-compose.test.ts

@@ -7,6 +7,7 @@ interface Service {
 	environment?: Record<string, string>
 	ports?: string[]
 	volumes?: string[]
+	healthcheck?: { test: string[] }
 }
 
 const wordpress = (): Service => parse(fs.readFileSync(COMPOSE_FILE, "utf8")).services.wordpress
@@ -41,6 +42,26 @@ describe("base compose wordpress service", () => {
 		expect(wordpress().ports).toContain("${WP_PORT:-8080}:80")
 	})
 
+	describe("healthcheck", () => {
+		const probe = (): string => wordpress().healthcheck?.test?.at(-1) ?? ""
+
+		test("requires the WordPress install wp-cli depends on", () => {
+			expect(probe()).toContain("test -f /var/www/html/wp-includes/version.php")
+		})
+
+		test("probes HTTP for liveness without asserting a successful status", () => {
+			expect(probe()).toContain("curl ")
+			expect(probe()).toContain("http://localhost/")
+			// `-f`/`--fail` turns any non-2xx into a probe failure, which is the bug being fixed:
+			// Headless Mode 404s pages by design, and a live server answering 404 is still live.
+			expect(probe().slice(probe().indexOf("curl "))).not.toMatch(/(?:^|\s)--?\S*f/)
+		})
+
+		test("references no WordPress application page, so a 404 from one can't fail it", () => {
+			expect(probe()).not.toMatch(/wp-login\.php|wp-admin|wp-json|feed|xmlrpc/)
+		})
+	})
+
 	test("mounts both local-only config assets read-only", () => {
 		const volumes = wordpress().volumes ?? []
 		expect(volumes).toContain("./uploads.ini:/usr/local/etc/php/conf.d/zz-kizlo-uploads.ini:ro")

package/dist/cli/wp/compose/docker-compose.yml

@@ -67,9 +67,14 @@ services:
       - ./uploads.ini:/usr/local/etc/php/conf.d/zz-kizlo-uploads.ini:ro
       - ./apache-listen.conf:/etc/apache2/conf-enabled/zz-kizlo-listen.conf:ro
     healthcheck:
-      # wp-login.php always returns 200 unauthenticated; /wp-json can be gated to 401
-      # by plugins, so it's not a reliable liveness probe.
-      test: ["CMD-SHELL", "curl -sf http://localhost/wp-login.php > /dev/null || exit 1"]
+      # Liveness, not a status assertion: the install is in place (what wp-cli needs before
+      # it can run anything) and the server answers HTTP at all. Deliberately status-agnostic,
+      # because Kizlo's own Headless Mode legitimately 404s the front page, the feeds and the
+      # login path. Requiring a 2xx from any WordPress page (`curl -f`) makes an install that is
+      # working as configured look dead, and every service gated on this one never starts.
+      # curl's own limit is a second under `timeout` below, so a server that accepts the connection
+      # and then stalls is reported by curl rather than killed by docker with nothing to show.
+      test: ["CMD-SHELL", "test -f /var/www/html/wp-includes/version.php && curl -s -o /dev/null -m 4 http://localhost/"]
       interval: 5s
       timeout: 5s
       retries: 60

package/dist/cli/wp/dev.js

@@ -32,6 +32,37 @@ function devUrl(port) {
 	return `http://${lanAddress() ?? "localhost"}:${port}`;
 }
 /**
+* Where the login screen actually lives, read from the raw `kizlo_settings_headless` option. Mirrors
+* the plugin's `HeadlessSettings::isLoginRenameActive()`: the master switch, the rename toggle and a
+* non-empty slug must all hold, so a half-configured feature still points at `/wp-admin`. Anything
+* unreadable (option unset, plugin absent, output not JSON) falls back the same way, which is what a
+* project that never touches the setting gets.
+*/
+function resolveAdminPath(option) {
+	if (!option) return "/wp-admin";
+	let settings;
+	try {
+		settings = JSON.parse(option);
+	} catch {
+		return "/wp-admin";
+	}
+	const slug = typeof settings?.login_slug === "string" ? settings.login_slug.trim() : "";
+	return settings?.enabled === true && settings.rename_login === true && slug !== "" ? `/${slug}` : "/wp-admin";
+}
+/** The Headless Mode option as wp-cli prints it; undefined when it's unset or wp-cli couldn't answer. */
+async function readHeadlessOption() {
+	try {
+		return await wpCli([
+			"option",
+			"get",
+			"kizlo_settings_headless",
+			"--format=json"
+		]);
+	} catch {
+		return;
+	}
+}
+/**
 * Seed `dev.fixtures` into freshly installed local WordPress, reusing the test seeding
 * primitives: seed the default subscriber so `ctx.userId` exists, then run each `seed`
 * over REST. Plugins are already active (`bootstrapDev` ensures them before seeding).
@@ -106,12 +137,14 @@ async function bootstrapDev(cfg) {
 	});
 	const seeded = !installed && cfg.fixtures.length ? await seedDevFixtures(cfg, url) : 0;
 	const appPassword = !installed ? await createAdminAppPassword("kizlo-dev") : void 0;
+	const adminPath = resolveAdminPath(await readHeadlessOption());
 	return {
 		url,
 		username: TEST_ADMIN.username,
 		dbPort: cfg.dbPort,
 		seeded,
 		appPassword,
+		adminPath,
 		adminPassword: !installed ? TEST_ADMIN.password : void 0
 	};
 }

package/dist/cli/wp/docker.js

@@ -90,6 +90,50 @@ async function stackStatus(project) {
 		return await dockerStatus() === "running" ? "unknown" : "stopped";
 	}
 }
+/**
+* How long `composeUp` waits for every service to report healthy. The `wordpress` probe's own
+* verdict lands anywhere from ~330s (a 30s start period, then 60 retries 5s apart) to ~630s when
+* every attempt burns its full 5s timeout, so this cap sits inside that range on purpose: a stack
+* that is still coming up is never cut off, while one that will never converge is reported at
+* roughly six minutes rather than eleven. Past the cap the error names each service's state at that
+* moment instead of the healthcheck's final verdict, which is the trade this bound accepts.
+*/
+const WAIT_TIMEOUT_SECONDS = 360;
+/** Cap on a healthcheck's reported output; docker keeps up to 4 KB per probe, far more than reads. */
+const PROBE_OUTPUT_LIMIT = 500;
+/**
+* Compose's per-resource progress chatter, which it writes to stderr even when the command works:
+* `Container x Created`, `Volume y Removed`. A failed `up --wait` buries its real message under a
+* dozen of these, so they are dropped and the lines that say what went wrong survive: `Container x
+* Error …`, `dependency failed to start: …`, a denied mount. An unrecognised verb just costs one
+* noise line, and anything carrying trailing text is kept, so this can only under-filter.
+*/
+const COMPOSE_PROGRESS_LINE = /^(?:Container|Network|Volume|Image)\s+\S+\s+(?:Creating|Created|Recreate|Recreated|Starting|Started|Stopping|Stopped|Removing|Removed|Waiting|Healthy|Running|Pulling|Pulled|Building|Built|Skipped)$/;
+/** Docker's own message for a failed command, with its progress chatter removed. */
+function dockerMessage(res) {
+	return (res.stderr || res.stdout).split("\n").map((line) => line.trim()).filter((line) => line !== "" && !COMPOSE_PROGRESS_LINE.test(line)).join("\n");
+}
+/**
+* Whether compose reports a container's healthcheck as passing, or as having none to report. The
+* field is empty for a service without a healthcheck and absent altogether on some compose builds,
+* and neither is a failure, so both read as healthy here.
+*/
+function isHealthy(health) {
+	return !health || health === "healthy";
+}
+/** Containers from `compose ps --format json`: one object per line, or a single array on older builds. */
+function parseComposePs(stdout) {
+	const trimmed = stdout.trim();
+	if (!trimmed) return [];
+	return (trimmed.startsWith("[") ? [trimmed] : trimmed.split("\n")).flatMap((chunk) => {
+		try {
+			const parsed = JSON.parse(chunk);
+			return Array.isArray(parsed) ? parsed : [parsed];
+		} catch {
+			return [];
+		}
+	});
+}
 function bind(stack) {
 	const base = [
 		"compose",
@@ -104,13 +148,68 @@ function bind(stack) {
 	};
 	const compose$1 = (args, opts) => run("docker", [...base, ...args], env, opts);
 	const composePull$1 = (services = []) => compose$1(["pull", ...services]);
+	/**
+	* The last line a container's healthcheck printed, as `exit <code>: <output>`. Undefined when
+	* the container declares no healthcheck, has not run one yet, or docker could not answer. In all
+	* of those the caller has nothing to add beyond the service's state.
+	*/
+	const lastProbe = async (container) => {
+		const res = await run("docker", [
+			"inspect",
+			"--format",
+			"{{json .State.Health}}",
+			container
+		], env);
+		if (res.code !== 0) return void 0;
+		let health;
+		try {
+			health = JSON.parse(res.stdout.trim());
+		} catch {
+			return;
+		}
+		const last = health?.Log?.at(-1);
+		if (!last) return void 0;
+		const output = (last.Output ?? "").trim().replace(/\s*\n\s*/g, " ").slice(0, PROBE_OUTPUT_LIMIT);
+		return output ? `exit ${last.ExitCode}: ${output}` : `exit ${last.ExitCode}`;
+	};
+	const describe = async (container) => {
+		const state = container.Health ? `${container.State} (${container.Health})` : container.State;
+		const probe = await lastProbe(container.Name);
+		return `  ${container.Service}: ${state}${probe ? `, healthcheck ${probe}` : ""}`;
+	};
+	/**
+	* Why the stack did not come up, in terms the user can act on: every service that isn't running
+	* and healthy, with the last thing its healthcheck reported. `compose up --wait` only says that
+	* waiting failed, and a probe failing quietly (a 404, a refused connection) leaves no trace in
+	* its stderr, so the container's own health log is the only place that answer exists.
+	*
+	* Never throws. This runs while a failure is already being reported, so a second fault here
+	* (docker gone, a health log shaped differently) must cost the explanation, not replace it.
+	*/
+	const diagnose = async () => {
+		try {
+			const failing = parseComposePs((await compose$1([
+				"ps",
+				"--all",
+				"--format",
+				"json"
+			])).stdout).filter((container) => container.State !== "running" || !isHealthy(container.Health));
+			return (await Promise.all(failing.map(describe))).join("\n");
+		} catch {
+			return "";
+		}
+	};
 	const composeUp$1 = async () => {
 		const res = await compose$1([
 			"up",
 			"-d",
-			"--wait"
+			"--wait",
+			"--wait-timeout",
+			String(WAIT_TIMEOUT_SECONDS)
 		]);
-		if (res.code !== 0) throw new Error(`docker compose up failed:\n${res.stderr}`);
+		if (res.code === 0) return;
+		const detail = [dockerMessage(res), await diagnose()].filter(Boolean).join("\n");
+		throw new Error(`docker compose up failed (waited up to ${WAIT_TIMEOUT_SECONDS}s for healthy services):\n${detail}`);
 	};
 	const composeDown$1 = async (opts) => {
 		const args = ["down"];

package/dist/package.js

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "0.22.0";
+var version = "0.22.1";
 
 //#endregion
 export { version };

package/dist/procedures.d.ts

@@ -44,7 +44,7 @@ declare const CORE_PROCEDURES: {
         include?: string | number | (string | number)[] | undefined;
         offset?: string | number | undefined;
         order?: "asc" | "desc" | undefined;
-        orderby?: "id" | "date" | "slug" | "parent" | "title" | "author" | "include" | "modified" | "relevance" | "include_slugs" | undefined;
+        orderby?: "date" | "id" | "slug" | "parent" | "title" | "author" | "include" | "modified" | "relevance" | "include_slugs" | undefined;
         searchColumns?: ("post_title" | "post_content" | "post_excerpt")[] | undefined;
         slug?: string | string[] | undefined;
         taxRelation?: "AND" | "OR" | undefined;
@@ -99,7 +99,7 @@ declare const CORE_PROCEDURES: {
         include?: string | number | (string | number)[] | undefined;
         offset?: string | number | undefined;
         order?: "asc" | "desc" | undefined;
-        orderby?: "id" | "date" | "slug" | "parent" | "title" | "author" | "include" | "modified" | "relevance" | "include_slugs" | "menu_order" | undefined;
+        orderby?: "date" | "id" | "slug" | "parent" | "title" | "author" | "include" | "modified" | "relevance" | "include_slugs" | "menu_order" | undefined;
         searchColumns?: ("post_title" | "post_content" | "post_excerpt")[] | undefined;
         slug?: string | string[] | undefined;
         parent?: string | number | (string | number)[] | undefined;
@@ -136,7 +136,7 @@ declare const CORE_PROCEDURES: {
         exclude?: string | number | (string | number)[] | undefined;
         include?: string | number | (string | number)[] | undefined;
         order?: "asc" | "desc" | undefined;
-        orderBy?: "id" | "count" | "slug" | "name" | "description" | "include" | "include_slugs" | "term_group" | undefined;
+        orderBy?: "count" | "id" | "slug" | "name" | "description" | "include" | "include_slugs" | "term_group" | undefined;
         hideEmpty?: string | boolean | undefined;
         parent?: string | number | undefined;
         post?: string | number | undefined;
@@ -172,7 +172,7 @@ declare const CORE_PROCEDURES: {
         exclude?: string | number | (string | number)[] | undefined;
         include?: string | number | (string | number)[] | undefined;
         order?: "asc" | "desc" | undefined;
-        orderBy?: "id" | "count" | "slug" | "name" | "description" | "include" | "include_slugs" | "term_group" | undefined;
+        orderBy?: "count" | "id" | "slug" | "name" | "description" | "include" | "include_slugs" | "term_group" | undefined;
         hideEmpty?: string | boolean | undefined;
         post?: string | number | undefined;
         slug?: string | string[] | undefined;
@@ -292,7 +292,7 @@ declare const CORE_PROCEDURES: {
           include?: string | number | (string | number)[] | undefined;
           offset?: string | number | undefined;
           order?: "asc" | "desc" | undefined;
-          orderby?: "id" | "date" | "slug" | "parent" | "title" | "author" | "include" | "relevance" | "include_slugs" | "menu_order" | undefined;
+          orderby?: "date" | "id" | "slug" | "parent" | "title" | "author" | "include" | "relevance" | "include_slugs" | "menu_order" | undefined;
           searchColumns?: ("post_title" | "post_content" | "post_excerpt")[] | undefined;
           slug?: string | string[] | undefined;
           taxRelation?: "AND" | "OR" | undefined;
@@ -371,7 +371,7 @@ declare const CORE_PROCEDURES: {
           include?: string | number | (string | number)[] | undefined;
           offset?: string | number | undefined;
           order?: "asc" | "desc" | undefined;
-          orderby?: "id" | "date" | "slug" | "parent" | "title" | "author" | "include" | "relevance" | "include_slugs" | "menu_order" | undefined;
+          orderby?: "date" | "id" | "slug" | "parent" | "title" | "author" | "include" | "relevance" | "include_slugs" | "menu_order" | undefined;
           searchColumns?: ("post_title" | "post_content" | "post_excerpt")[] | undefined;
           slug?: string | string[] | undefined;
           taxRelation?: "AND" | "OR" | undefined;
@@ -507,7 +507,7 @@ declare const CORE_PROCEDURES: {
         include?: string | number | (string | number)[] | undefined;
         offset?: string | number | undefined;
         order?: "asc" | "desc" | undefined;
-        orderby?: "id" | "date" | "parent" | "include" | "post" | undefined;
+        orderby?: "date" | "id" | "parent" | "include" | "post" | undefined;
         parent?: string | number | (string | number)[] | undefined;
         parentExclude?: string | number | (string | number)[] | undefined;
         post?: string | number | (string | number)[] | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kizlo",
-  "version": "0.22.0",
+  "version": "0.22.1",
   "type": "module",
   "description": "A headless WordPress framework for TypeScript.",
   "keywords": [