@treeport/treeport 0.6.1 → 0.8.3

package/dist/node/cli/index.js

@@ -1,10 +1,13 @@
 #!/usr/bin/env node
-import { B as parseEventsSnapshot, H as SOCKET_IO_PATH, R as webPanelInputSchema, V as parseProductEvent, t as TERMINAL_CAPTURE_MAX_LINES } from "../../dist-Crk_Xr82.js";
-import { A as treeportVersion, C as disableTailscaleRemote, D as resolvePackagePath, E as resolveLocalApiUrl, M as parseDurationMs, O as runDoctor, S as daemonUp, T as readDaemonLogs, _ as serviceStatus, b as daemonHealth, d as serviceDisable, f as serviceDoctorCheck, g as serviceStart, h as serviceRun, k as tailscaleRemoteStatus, l as readServiceLogs, m as serviceInstalled, p as serviceEnable, s as runLocalUpdate, t as LocalUpdateError, u as serviceApply, v as serviceStop, w as enableTailscaleRemote, x as daemonStatus, y as daemonDown } from "../../update-qVp7yL5D.js";
+import { Ct as projectsResponseSchema, Dt as terminalCaptureResponseSchema, G as treeportRpcClientLayer, Gt as webPanelDefinitionsResponseSchema, K as TreeportRpcs, Lt as treeContextResponseSchema, Nt as terminalResponseSchema, Ot as terminalObservationResponseSchema, Pt as terminatedTerminalsResponseSchema, St as projectResponseSchema, Tt as removePreviewResponseSchema, U as decodeUnknownOrNull, V as webPanelInputSchema, _t as packageOperationResponseSchema, bt as packageReloadResponseSchema, dt as openBrowserPanelResponseSchema, et as browserAgentResponseSchema, ft as openWebPanelResponseSchema, gt as packageListingResponseSchema, mt as operationResponseSchema, nt as browserInstallStatusSchema, o as apiErrorBodySchema, t as TERMINAL_CAPTURE_MAX_LINES, tt as browserInstallResponseSchema, ut as okResponseSchema, vt as packageOperationsResponseSchema, yt as packageProjectResponseSchema } from "../../dist-BsLn2Gbc.js";
+import { A as runDoctor, C as daemonStatus, D as readDaemonLogs, E as enableTailscaleRemote, F as formatServiceStatus, I as humanOutput, L as stateName, M as treeportVersion, N as formatLocalUpdateError, O as resolveLocalApiUrl, P as formatLocalUpdateResult, S as daemonHealth, T as disableTailscaleRemote, _ as serviceRun, b as serviceStop, d as readServiceLogs, f as serviceApply, g as serviceInstalled, h as serviceEnable, j as tailscaleRemoteStatus, k as resolvePackagePath, l as runLocalUpdate, m as serviceDoctorCheck, p as serviceDisable, r as confirmLocalUpdate, t as LocalUpdateError, v as serviceStart, w as daemonUp, x as daemonDown, y as serviceStatus, z as parseDurationMs } from "../../update-BYHlwpAq.js";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { Command, CommanderError } from "commander";
-import { io } from "socket.io-client";
+import { RpcClient } from "@effect/rpc";
+import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
+import * as Stream from "effect/Stream";
 import { spawn } from "node:child_process";
 //#region src/cli/args.ts
 function extractJsonOutput(args) {
@@ -96,6 +99,9 @@ let writeStderr = (value) => {
 };
 let requestedExitCode = 0;
 let cliEnvironment = process.env;
+let output = humanOutput();
+let errorOutput = humanOutput();
+let updateProgressShown = false;
 var CliError = class extends Error {
 	exitCode;
 	code;
@@ -116,22 +122,6 @@ async function resolveDaemonLifecycle() {
 	}
 	return await serviceInstalled() ? "service" : "treeport";
 }
-function formatServiceStatus(status) {
-	const mode = status.mode === "headless" ? "advanced headless (starts before login)" : status.mode === "user" && status.manager === "launchd" ? "user/login (starts after login)" : status.mode === "user" ? "user service" : "not installed";
-	const lines = [
-		`Treeport service: ${status.state}`,
-		`Mode: ${mode}`,
-		`Manager: ${status.manager ?? "unsupported"}`,
-		`Starts before login: ${status.enabledAtBoot ? "yes" : "no"}`,
-		`Active: ${status.active ? "yes" : "no"}`,
-		`Definition: ${status.definitionPath ?? "not installed"}`
-	];
-	if (status.daemon?.state) lines.push(`PID: ${status.daemon.state.pid}`);
-	if (status.issues.length) lines.push(...status.issues.map((issue) => `Issue: ${issue}`));
-	if (status.administratorCommand) lines.push("Administrator action required:", status.administratorCommand, "Then run: treeport service status");
-	else if (status.recoveryCommands.length) lines.push(`Next: ${status.recoveryCommands[0]}`);
-	return lines.join("\n");
-}
 async function ensureServiceDaemon() {
 	const result = await serviceStart();
 	const state = result.status.daemon?.state;
@@ -146,7 +136,7 @@ async function ensureServiceDaemon() {
 		pid: state.pid
 	};
 }
-async function request(pathname, options = {}) {
+async function request(pathname, schema, options = {}) {
 	const controller = new AbortController();
 	const externalSignal = options.signal;
 	const abort = () => controller.abort();
@@ -164,10 +154,12 @@ async function request(pathname, options = {}) {
 		});
 		const body = await response.json().catch(() => ({}));
 		if (!response.ok) {
-			const error = body.error;
-			throw new CliError(error?.message || `HTTP ${response.status}`, 5, error?.code || "API_ERROR", error?.details);
+			const failure = decodeUnknownOrNull(apiErrorBodySchema, body);
+			throw new CliError(failure?.error.message || `HTTP ${response.status}`, 5, failure?.error.code || "API_ERROR", failure?.error.details);
 		}
-		return body;
+		const decoded = decodeUnknownOrNull(schema, body);
+		if (decoded === null) throw new CliError(`Treeport daemon returned an invalid response for ${pathname}`, 3, "DAEMON_PROTOCOL_ERROR", { pathname });
+		return decoded;
 	} catch (error) {
 		if (error instanceof CliError) throw error;
 		throw new CliError(`Cannot reach Treeport daemon at ${apiUrl}: ${error instanceof Error ? error.message : String(error)}`, 3, "DAEMON_UNREACHABLE");
@@ -177,19 +169,19 @@ async function request(pathname, options = {}) {
 	}
 }
 async function createWorktree(projectId, input) {
-	let operation = (await request(`/api/projects/${encodeURIComponent(projectId)}/worktree-operations`, {
+	let operation = (await request(`/api/projects/${encodeURIComponent(projectId)}/worktree-operations`, operationResponseSchema, {
 		method: "POST",
 		body: JSON.stringify(input)
 	})).operation;
 	while (operation.status === "pending" || operation.status === "running") {
 		await new Promise((resolve) => setTimeout(resolve, 100));
-		operation = (await request(`/api/operations/${encodeURIComponent(operation.id)}`)).operation;
+		operation = (await request(`/api/operations/${encodeURIComponent(operation.id)}`, operationResponseSchema)).operation;
 	}
 	if (operation.status === "failed") throw new CliError(operation.error ?? "Tree creation failed", 5, "WORKTREE_CREATION_FAILED");
 	if (operation.kind !== "create") throw new CliError("Tree creation returned an unexpected operation kind", 5, "INVALID_OPERATION_RESULT");
 	const worktreeId = operation.result?.worktreeId ?? operation.worktreeId;
 	if (!worktreeId) throw new CliError("Completed tree creation did not identify its tree", 5, "INVALID_OPERATION_RESULT");
-	const worktree = (await request(`/api/projects/${encodeURIComponent(projectId)}`)).project.worktrees.find((item) => item.id === worktreeId);
+	const worktree = (await request(`/api/projects/${encodeURIComponent(projectId)}`, projectResponseSchema)).project.worktrees.find((item) => item.id === worktreeId);
 	if (!worktree) throw new CliError(`Created tree ${worktreeId} was not found`, 5, "INVALID_OPERATION_RESULT");
 	const terminalId = operation.result?.terminalId ?? null;
 	return {
@@ -212,7 +204,7 @@ async function canonical(value) {
 	return fs.realpath(resolved).catch(() => resolved);
 }
 async function projects() {
-	return (await request("/api/projects")).projects;
+	return (await request("/api/projects", projectsResponseSchema)).projects;
 }
 function pathContains(candidate, parent) {
 	const relative = path.relative(parent, candidate);
@@ -240,7 +232,7 @@ async function packageSource(value) {
 	return value;
 }
 async function localPackageProjectId() {
-	return (await request(`/api/packages/project?${new URLSearchParams({ path: await canonical(workingDirectory) }).toString()}`)).project.id;
+	return (await request(`/api/packages/project?${new URLSearchParams({ path: await canonical(workingDirectory) }).toString()}`, packageProjectResponseSchema)).project.id;
 }
 async function resolveWorktree(identifier) {
 	const all = (await projects()).flatMap((project) => project.worktrees);
@@ -264,12 +256,12 @@ function parseWebPanelInput(value) {
 	} catch (error) {
 		throw new CliError(`--input must contain valid JSON: ${error instanceof Error ? error.message : String(error)}`, 2);
 	}
-	const validated = webPanelInputSchema.safeParse(parsed);
-	if (!validated.success) throw new CliError("--input must contain a JSON object", 2);
-	return validated.data;
+	const validated = decodeUnknownOrNull(webPanelInputSchema, parsed);
+	if (!validated) throw new CliError("--input must contain a JSON object", 2);
+	return validated;
 }
 async function webPanelDefinition(worktreeId, identifier) {
-	const definitions = (await request(`/api/worktrees/${encodeURIComponent(worktreeId)}/web-panel-definitions`)).definitions;
+	const definitions = (await request(`/api/worktrees/${encodeURIComponent(worktreeId)}/web-panel-definitions`, webPanelDefinitionsResponseSchema)).definitions;
 	const exact = definitions.find((definition) => definition.id === identifier);
 	if (exact) return exact;
 	const matches = definitions.filter((definition) => decodeURIComponent(definition.id.split(":").at(-1) ?? "") === identifier);
@@ -304,7 +296,7 @@ async function resolveBrowserPanel(panelId) {
 }
 async function runBrowserAgentCommand(command, args, panelId) {
 	const { panel } = await resolveBrowserPanel(panelId);
-	const result = await request(`/api/panels/${encodeURIComponent(panel.id)}/browser-agent`, {
+	const result = await request(`/api/panels/${encodeURIComponent(panel.id)}/browser-agent`, browserAgentResponseSchema, {
 		method: "POST",
 		body: JSON.stringify({
 			command,
@@ -346,7 +338,7 @@ function parseDuration(value) {
 	}
 }
 async function inspectTerminal(terminalId, signal) {
-	return request(`/api/terminals/${encodeURIComponent(terminalId)}`, signal ? { signal } : {});
+	return request(`/api/terminals/${encodeURIComponent(terminalId)}`, terminalObservationResponseSchema, signal ? { signal } : {});
 }
 async function waitForTerminal(terminalId, condition, timeoutMs) {
 	let observation = null;
@@ -378,16 +370,9 @@ async function waitForTerminal(terminalId, condition, timeoutMs) {
 		if (condition === "bell") bellBaseline = observation.metadata.bell?.sequence ?? 0;
 		const immediate = matched((/* @__PURE__ */ new Date()).toISOString());
 		if (immediate) return immediate;
-		events = io(`${apiUrl}/events`, {
-			path: SOCKET_IO_PATH,
-			transports: ["websocket"],
-			forceNew: true,
-			autoConnect: false,
-			reconnection: false,
-			retries: 0
-		});
 		return await new Promise((resolve, reject) => {
 			let settled = false;
+			let connected = false;
 			let queue = Promise.resolve();
 			const finish = (result) => {
 				if (!settled) {
@@ -405,16 +390,15 @@ async function waitForTerminal(terminalId, condition, timeoutMs) {
 				queue = queue.then(task);
 				queue.catch(fail);
 			};
-			controller.signal.addEventListener("abort", () => fail(/* @__PURE__ */ new Error("Terminal wait cancelled")), { once: true });
-			events.on("snapshot", (value) => enqueue(async () => {
-				const snapshot = parseEventsSnapshot(value);
-				if (!snapshot || !observation) throw new CliError("Treeport daemon sent an invalid event snapshot", 3, "DAEMON_PROTOCOL_ERROR");
-				const metadata = snapshot.terminalMetadata.find((item) => item.terminalId === terminalId);
+			const snapshot = async (value) => {
+				if (!observation) throw new CliError("Treeport daemon sent an invalid event snapshot", 3, "DAEMON_PROTOCOL_ERROR");
+				connected = true;
+				const metadata = value.terminalMetadata.find((item) => item.terminalId === terminalId);
 				if (metadata) observation = {
 					...observation,
 					metadata
 				};
-				const snapshotMatch = matched(snapshot.at);
+				const snapshotMatch = matched(value.at);
 				if (snapshotMatch) {
 					finish(snapshotMatch);
 					return;
@@ -423,10 +407,8 @@ async function waitForTerminal(terminalId, condition, timeoutMs) {
 				if (cancellation) throw new Error("Terminal wait cancelled");
 				const refreshedMatch = matched((/* @__PURE__ */ new Date()).toISOString());
 				if (refreshedMatch) finish(refreshedMatch);
-			}));
-			events.on("product_event", (value) => enqueue(async () => {
-				const event = parseProductEvent(value);
-				if (!event) throw new CliError("Treeport daemon sent an invalid product event", 3, "DAEMON_PROTOCOL_ERROR");
+			};
+			const productEvent = async (event) => {
 				if (event.type !== "terminal.metadata" && event.type !== "terminal.updated" && event.type !== "terminal.removed") return;
 				if (event.data.terminalId !== terminalId) return;
 				if (event.type === "terminal.removed") throw new CliError(`Terminal ${terminalId} was removed while waiting`, 5, "TERMINAL_REMOVED", {
@@ -446,10 +428,15 @@ async function waitForTerminal(terminalId, condition, timeoutMs) {
 				}
 				const result = matched(event.at);
 				if (result) finish(result);
-			}));
-			events.on("connect_error", (error) => fail(new CliError(`Cannot reach Treeport daemon at ${apiUrl}: ${error.message}`, 3, "DAEMON_UNREACHABLE")));
-			events.on("disconnect", () => fail(new CliError("Treeport daemon event channel disconnected before the condition was observed", 3, "DAEMON_DISCONNECTED")));
-			events.connect();
+			};
+			controller.signal.addEventListener("abort", () => fail(/* @__PURE__ */ new Error("Terminal wait cancelled")), { once: true });
+			const program = Effect.scoped(Effect.gen(function* () {
+				yield* (yield* RpcClient.make(TreeportRpcs)).WatchProjectEvents({ protocol: 3 }).pipe(Stream.runForEach((item) => Effect.sync(() => {
+					if (item._tag === "Snapshot") enqueue(() => snapshot(item.snapshot));
+					else enqueue(() => productEvent(item.event));
+				})));
+			})).pipe(Effect.provide(treeportRpcClientLayer(`${apiUrl}/api/rpc`)), Effect.onExit(() => Effect.sync(() => fail(connected ? new CliError("Treeport daemon event channel disconnected before the condition was observed", 3, "DAEMON_DISCONNECTED") : new CliError(`Cannot reach Treeport daemon at ${apiUrl}`, 3, "DAEMON_UNREACHABLE")))));
+			events = Effect.runFork(program);
 		});
 	} catch (error) {
 		if (cancellation === "timeout") throw new CliError(`Timed out waiting for terminal ${terminalId} to reach ${condition}`, 4, "WAIT_TIMEOUT", {
@@ -465,8 +452,7 @@ async function waitForTerminal(terminalId, condition, timeoutMs) {
 		if (timeout) clearTimeout(timeout);
 		process.off("SIGINT", interrupt);
 		controller.abort();
-		events?.removeAllListeners();
-		events?.disconnect();
+		if (events) Effect.runFork(Fiber.interrupt(events));
 	}
 }
 function print(value, human) {
@@ -475,12 +461,17 @@ function print(value, human) {
 async function main(args) {
 	const argv = args[0] === "spawn" || args[0] === "terminal" && args[1] === "create" ? commandArgv(args) : void 0;
 	let parserError = "";
-	const program = new Command().name("treeport").usage("[options] [folder] [command]").description("Manage Treeport projects, trees, and terminals.").argument("[folder]", "folder or folder inside a Git repository to open").option("--json", "emit machine-readable JSON").configureOutput({
+	const program = new Command().name("treeport").usage("[options] [folder] [command]").description("Manage Treeport projects, trees, and terminals.").version(output.heading(await treeportVersion()), "-v, --version", "show installed CLI version").argument("[folder]", "folder or folder inside a Git repository to open").option("--json", "emit machine-readable JSON").configureOutput({
+		getOutHasColors: () => output.enabled,
+		getErrHasColors: () => errorOutput.enabled,
 		writeOut: writeStdout,
 		writeErr: (value) => {
 			parserError += value;
 		}
-	}).showHelpAfterError().exitOverride();
+	}).showHelpAfterError(jsonOutput).configureHelp({
+		styleTitle: output.heading,
+		styleCommandText: output.heading
+	}).exitOverride();
 	program.action(async (folder) => {
 		if (folder === void 0) {
 			writeStdout(program.helpInformation());
@@ -499,7 +490,7 @@ async function main(args) {
 			if (!await daemonHealth(apiUrl)) throw new CliError(`Cannot reach the externally managed Treeport daemon at ${apiUrl}. Start it through the process that owns its lifecycle and retry.`, 3, "DAEMON_UNREACHABLE");
 		} else if (lifecycle === "service") await ensureServiceDaemon();
 		else await daemonUp({});
-		const registered = await request("/api/projects", {
+		const registered = await request("/api/projects", projectResponseSchema, {
 			method: "POST",
 			body: JSON.stringify({ path: canonicalFolder })
 		});
@@ -512,7 +503,7 @@ async function main(args) {
 		target.pathname = `/projects/${encodeURIComponent(registered.project.id)}/worktrees/${encodeURIComponent(targetWorktree.id)}`;
 		target.search = "";
 		target.hash = "";
-		const opened = contextTerminalId ? await request(`/api/worktrees/${encodeURIComponent(targetWorktree.id)}/open`, {
+		const opened = contextTerminalId ? await request(`/api/worktrees/${encodeURIComponent(targetWorktree.id)}/open`, okResponseSchema, {
 			method: "POST",
 			body: JSON.stringify({ sourceTerminalId: contextTerminalId })
 		}).then(() => ({ client: "current" })) : await openWorkspace(target.href).catch((error) => {
@@ -536,7 +527,7 @@ async function main(args) {
 		if (lifecycle === "service") {
 			if (options.foreground || options.host || options.port) throw new CliError("An installed service owns the listener and process mode. Run `treeport service enable` to refresh its configuration, or `treeport service disable` to return to local background mode.", 5, "DAEMON_LIFECYCLE_SERVICE");
 			const result = await serviceStart();
-			print(result, () => formatServiceStatus(result.status));
+			print(result, () => formatServiceStatus(result.status, output));
 			if (result.administratorCommand || !result.status.healthy) requestedExitCode = 1;
 			return;
 		}
@@ -544,26 +535,29 @@ async function main(args) {
 		const daemonOptions = {};
 		if (options.host !== void 0) daemonOptions.host = options.host;
 		if (port !== void 0) daemonOptions.port = port;
-		if (options.foreground !== void 0) daemonOptions.foreground = options.foreground;
+		if (options.foreground !== void 0) {
+			daemonOptions.foreground = options.foreground;
+			daemonOptions.output = output;
+		}
 		const result = await daemonUp(daemonOptions);
 		if (options.foreground) return;
-		print(result, () => `Treeport is running\n${result.apiUrl}`);
+		print(result, () => output.blocks(output.summary("Treeport is running", "success"), output.rows([["URL", result.apiUrl]])));
 	});
-	const stopCommand = program.command("stop").description("Stop the local daemon and preserve terminal sessions").option("--terminate-terminals", "terminate every Treeport-owned tmux server").option("--force", "confirm termination of all terminals").option("--json", "emit machine-readable JSON");
+	const stopCommand = program.command("stop").description("Stop the local daemon and preserve terminal sessions").option("--terminate-terminals", "terminate every Treeport-owned terminal process").option("--force", "confirm termination of all terminals").option("--json", "emit machine-readable JSON");
 	stopCommand.action(async () => {
 		const lifecycle = await resolveDaemonLifecycle();
 		if (lifecycle === "external") throw new CliError("Cannot run `treeport stop` because the daemon lifecycle is externally managed. Control the process that started Treeport instead.", 5, "DAEMON_LIFECYCLE_EXTERNAL");
 		const options = stopCommand.opts();
 		if (options.terminateTerminals && !options.force) throw new CliError("Re-run with --terminate-terminals --force to confirm termination of every terminal.", 2);
-		if (options.terminateTerminals) await request("/api/admin/terminate-terminals", { method: "POST" });
+		if (options.terminateTerminals) await request("/api/admin/terminate-terminals", terminatedTerminalsResponseSchema, { method: "POST" });
 		if (lifecycle === "service") {
 			const result = await serviceStop();
-			print(result, () => formatServiceStatus(result.status));
+			print(result, () => formatServiceStatus(result.status, output));
 			if (result.administratorCommand) requestedExitCode = 1;
 			return;
 		}
 		const result = await daemonDown();
-		print(result, () => result.wasRunning ? "Treeport is stopped" : "Treeport is already stopped");
+		print(result, () => output.summary(result.wasRunning ? "Treeport is stopped" : "Treeport is already stopped", "success"));
 	});
 	const serviceCommand = program.command("service").description("Manage opt-in OS service supervision");
 	serviceCommand.action(() => {
@@ -572,12 +566,12 @@ async function main(args) {
 	const serviceEnableCommand = serviceCommand.command("enable").description("Enable automatic startup and unexpected-exit restarts").option("--headless", "use advanced macOS startup before login (requires an administrator)").option("--json", "emit machine-readable JSON");
 	serviceEnableCommand.action(async () => {
 		const result = await serviceEnable(serviceEnableCommand.opts().headless ? "headless" : "user");
-		print(result, () => formatServiceStatus(result.status));
+		print(result, () => formatServiceStatus(result.status, output));
 		if (result.status.state === "action_required") requestedExitCode = 1;
 	});
 	serviceCommand.command("status").description("Show OS service supervision status").option("--json", "emit machine-readable JSON").action(async () => {
 		const result = await serviceStatus();
-		print(result, () => formatServiceStatus(result));
+		print(result, () => formatServiceStatus(result, output));
 		if (![
 			"disabled",
 			"healthy",
@@ -586,7 +580,7 @@ async function main(args) {
 	});
 	serviceCommand.command("disable").description("Stop and unregister OS service supervision").option("--json", "emit machine-readable JSON").action(async () => {
 		const result = await serviceDisable();
-		print(result, () => formatServiceStatus(result.status));
+		print(result, () => formatServiceStatus(result.status, output));
 		if (result.administratorCommand || result.status.state !== "disabled") requestedExitCode = 1;
 	});
 	serviceCommand.command("run", { hidden: true }).action(async () => serviceRun());
@@ -594,7 +588,7 @@ async function main(args) {
 	serviceApplyCommand.action(async () => {
 		const { request: requestPath } = serviceApplyCommand.opts();
 		const result = await serviceApply(requestPath);
-		print(result, () => `Applied Treeport service ${result.operation} request.`);
+		print(result, () => output.summary(`Applied Treeport service ${result.operation} request.`, "success"));
 	});
 	const remoteCommand = program.command("remote").description("Expose Treeport privately through Tailscale Serve");
 	remoteCommand.action(() => {
@@ -612,37 +606,48 @@ async function main(args) {
 		if (port !== void 0) remoteOptions.port = port;
 		if (serviceDaemon !== void 0) remoteOptions.daemon = serviceDaemon;
 		const result = await enableTailscaleRemote(remoteOptions);
-		print(result, () => `Treeport remote access is ${result.alreadyEnabled ? "already enabled" : "enabled"}\n${result.url}\nTailscale authenticates each remote user. Access is limited by your Tailscale policy.`);
+		print(result, () => output.blocks(output.summary(`Treeport remote access is ${result.alreadyEnabled ? "already enabled" : "enabled"}`, "success"), output.rows([["URL", result.url]]), "Tailscale authenticates each remote user. Access is limited by your Tailscale policy."));
 	});
 	remoteCommand.command("status").description("Show Tailscale remote access status").option("--json", "emit machine-readable JSON").action(async () => {
 		const result = await tailscaleRemoteStatus();
 		print(result, () => {
-			if (!result.configured) return "Treeport remote access is disabled";
-			return result.active ? `Treeport remote access is enabled\n${result.url}` : `Treeport remote access is unavailable\nExpected: ${result.url}\nThe Tailscale Serve route no longer points to Treeport.`;
+			if (!result.configured) return output.summary("Treeport remote access is disabled");
+			return output.blocks(output.summary(result.active ? "Treeport remote access is enabled" : "Treeport remote access is unavailable", result.active ? "success" : "warning"), output.rows([[result.active ? "URL" : "Expected URL", result.url ?? "Unavailable"]]), !result.active && "The Tailscale Serve route no longer points to Treeport.");
 		});
 	});
 	remoteCommand.command("disable").description("Disable Treeport Tailscale remote access").option("--json", "emit machine-readable JSON").action(async () => {
 		const result = await disableTailscaleRemote();
 		print(result, () => {
-			if (result.changedTailscale) return "Treeport remote access is disabled";
-			return result.wasEnabled ? "Treeport remote access is disabled" : "Treeport remote access was already disabled; the current Tailscale route was left unchanged.";
+			if (result.changedTailscale) return output.summary("Treeport remote access is disabled", "success");
+			return output.summary(result.wasEnabled ? "Treeport remote access is disabled" : "Treeport remote access was already disabled; the current Tailscale route was left unchanged.", "success");
 		});
 	});
 	program.command("status").description("Show local daemon status").option("--json", "emit machine-readable JSON").action(async () => {
-		const status = await daemonStatus();
+		const [cliVersion, status] = await Promise.all([treeportVersion(), daemonStatus()]);
 		const supervision = await serviceInstalled() ? await serviceStatus() : null;
+		const observed = supervision?.daemon ?? status;
+		const daemonVersion = observed.running && observed.verified ? observed.health?.version ?? null : null;
 		const projectList = status.verified ? await projects() : [];
 		const result = {
 			...status,
+			cliVersion,
+			daemonVersion,
 			service: supervision,
 			projects: projectList.length,
 			worktrees: projectList.reduce((count, project) => count + project.worktrees.length, 0),
 			terminals: projectList.reduce((count, project) => count + project.worktrees.reduce((worktreeCount, worktree) => worktreeCount + worktree.terminals.length, 0), 0)
 		};
 		print(result, () => {
-			if (!status.state) return supervision ? formatServiceStatus(supervision) : "Treeport is stopped";
-			if (!status.running || !status.verified) return `Treeport is unhealthy (PID ${status.state.pid})\nLogs: ${path.join(status.state.dataDir, "logs", "daemon.log")}`;
-			return `Treeport is running\n${status.state.apiUrl}\nLifecycle: ${status.health?.daemonLifecycle}\nVersion: ${status.health?.version}\nPID: ${status.state.pid}\nProjects: ${result.projects}\nTrees: ${result.worktrees}\nTerminals: ${result.terminals}`;
+			const healthy = observed.running && observed.verified;
+			return output.blocks(output.heading("Treeport status"), output.summary(!observed.state ? "Treeport is stopped" : healthy ? "Treeport is running" : "Treeport is unhealthy", !observed.state ? "neutral" : healthy ? "success" : "failure"), output.rows([
+				["CLI version", cliVersion],
+				["Daemon version", daemonVersion ?? "Unavailable"],
+				observed.state ? ["URL", observed.state.apiUrl] : null
+			]), daemonVersion !== null && daemonVersion !== cliVersion && output.summary("Version mismatch: CLI and daemon versions differ", "warning"), healthy && output.detail(output.rows([
+				supervision ? null : ["Lifecycle", observed.health?.daemonLifecycle === "external" ? "Externally managed" : observed.health?.daemonLifecycle === "service" ? "OS service" : "Treeport"],
+				supervision ? null : ["PID", observed.state.pid],
+				status.verified ? ["Workspace", `${result.projects} projects · ${result.worktrees} trees · ${result.terminals} terminals`] : null
+			])), !healthy && observed.state !== null && output.rows([["PID", observed.state.pid], ["Logs", path.join(observed.state.dataDir, "logs", "daemon.log")]]), supervision !== null && formatServiceStatus(supervision, output));
 		});
 	});
 	const logsCommand = program.command("logs").description("Show recent daemon logs").option("--lines <count>", "number of lines", "100");
@@ -653,7 +658,7 @@ async function main(args) {
 	});
 	program.command("doctor").description("Diagnose local requirements and paths").option("--json", "emit machine-readable JSON").action(async () => {
 		const checks = [...await runDoctor(), await serviceDoctorCheck()];
-		print(checks, () => checks.map((check) => `${check.ok ? "ok" : "error"}\t${check.name}\t${check.detail}`).join("\n"));
+		print(checks, () => output.blocks(output.heading("Treeport doctor"), output.summary(checks.every((check) => check.ok) ? "All checks passed" : "Some checks failed", checks.every((check) => check.ok) ? "success" : "failure"), ...checks.map((check) => `${output.summary(check.name, check.ok ? "success" : "failure")}\n${output.indent(check.detail.startsWith("state: ") ? stateName(check.detail.slice(7)) : check.ok ? output.detail(check.detail) : check.detail)}`)));
 		if (checks.some((check) => !check.ok)) requestedExitCode = 1;
 	});
 	program.command("version").description("Show CLI and daemon versions").option("--json", "emit machine-readable JSON").action(async () => {
@@ -662,7 +667,7 @@ async function main(args) {
 			cli,
 			daemon: status.verified ? status.health?.version ?? null : null
 		};
-		print(result, () => `CLI: ${result.cli}\nDaemon: ${result.daemon ?? "not running"}`);
+		print(result, () => output.blocks(output.heading("Treeport version"), output.rows([["CLI", result.cli], ["Daemon", result.daemon ?? "Unavailable"]]), result.daemon !== null && result.daemon !== result.cli && output.summary("Version mismatch: CLI and daemon versions differ", "warning")));
 	});
 	program.command("skills").description("Print the Treeport usage guide for AI agents").action(async () => {
 		const skill = await fs.readFile(await resolvePackagePath("skills", "treeport", "SKILL.md"), "utf8");
@@ -680,7 +685,7 @@ async function main(args) {
 			print({
 				managed: false,
 				reason: "outside_treeport"
-			}, () => "Not running in a Treeport-managed terminal.");
+			}, () => output.blocks(output.heading("Treeport context"), "Not running in a Treeport-managed terminal."));
 			return;
 		}
 		const missing = [
@@ -690,7 +695,7 @@ async function main(args) {
 			...!terminalId ? [`${contextPrefix}_TERMINAL_ID`] : []
 		];
 		if (missing.length) throw new CliError(`Incomplete Treeport context; missing ${missing.join(", ")}`, 5, "TREEPORT_CONTEXT_INCOMPLETE", { missing });
-		const project = (await request(`/api/projects/${encodeURIComponent(projectId)}`)).project;
+		const project = (await request(`/api/projects/${encodeURIComponent(projectId)}`, projectResponseSchema)).project;
 		const worktree = project.worktrees.find((candidate) => candidate.id === worktreeId);
 		if (!worktree) throw new CliError("Treeport context tree does not belong to the current project", 5, "TREEPORT_CONTEXT_INVALID", {
 			projectId,
@@ -701,7 +706,7 @@ async function main(args) {
 			worktreeId,
 			terminalId
 		});
-		const treeContext = (await request(`/api/worktrees/${encodeURIComponent(worktree.id)}/context`)).context;
+		const treeContext = (await request(`/api/worktrees/${encodeURIComponent(worktree.id)}/context`, treeContextResponseSchema)).context;
 		const context = {
 			managed: true,
 			apiUrl,
@@ -744,7 +749,12 @@ async function main(args) {
 				}).join("").split("\n");
 				return `  ${key}: ${first}${rest.length > 0 ? `\n${rest.map((line) => `    ${line}`).join("\n")}` : ""}`;
 			}).join("\n");
-			return `Treeport context\n\nProject:  ${context.project.name} (${context.project.id})\nTree:     ${context.worktree.name} (${context.worktree.id})\nPath:     ${context.worktree.path}\nContext:\n${treeContextText}\nTerminal: ${context.terminal.name} (${context.terminal.id}) — ${context.terminal.status}\nAPI:      ${context.apiUrl}\nLifecycle: ${context.daemonLifecycle === "external" ? "externally managed" : context.daemonLifecycle === "service" ? "managed by the OS service" : "managed by Treeport"}`;
+			return output.blocks(output.heading("Treeport context"), output.rows([
+				["Project", `${context.project.name} (${context.project.id})`],
+				["Tree", `${context.worktree.name} (${context.worktree.id})`],
+				["Path", context.worktree.path],
+				["Terminal", `${context.terminal.name} (${context.terminal.id}) — ${stateName(context.terminal.status)}`]
+			]), entries.length > 0 && `${output.heading("Tree context")}\n${treeContextText}`, output.detail(output.rows([["API", context.apiUrl], ["Lifecycle", context.daemonLifecycle === "external" ? "Externally managed" : context.daemonLifecycle === "service" ? "OS service" : "Treeport"]])));
 		});
 	});
 	const browserCommand = program.command("browser").description("Manage Browser and its hosted Chromium");
@@ -758,7 +768,7 @@ async function main(args) {
 			url,
 			sourceTerminalId: contextWorktreeId === worktree.id ? contextTerminalId ?? null : null
 		};
-		const result = await request(`/api/worktrees/${encodeURIComponent(worktree.id)}/browser-panels`, {
+		const result = await request(`/api/worktrees/${encodeURIComponent(worktree.id)}/browser-panels`, openBrowserPanelResponseSchema, {
 			method: "POST",
 			body: JSON.stringify(body)
 		});
@@ -769,15 +779,15 @@ async function main(args) {
 		print(output, () => `Opened ${result.panel.title} (${result.panel.id})\n${output.url}`);
 	});
 	browserCommand.command("install").description("Install the Chromium build used by Browser").option("--json", "emit machine-readable JSON").action(async () => {
-		const result = await request("/api/browser/install", { method: "POST" });
+		const result = await request("/api/browser/install", browserInstallResponseSchema, { method: "POST" });
 		print(result, () => result.message);
 	});
 	browserCommand.command("status").description("Show hosted browser installation status").option("--json", "emit machine-readable JSON").action(async () => {
-		const result = await request("/api/browser/status");
+		const result = await request("/api/browser/status", browserInstallStatusSchema);
 		print(result, () => `${result.installed ? "Chromium is installed" : "Chromium is not installed"}\nLaunch ready: ${result.launchReady ? "yes" : "no"}\nPlaywright: ${result.playwrightVersion}\nBrowser: ${result.channel} ${result.browserRevision}\nExecutable: ${result.executablePath}${result.launchError ? `\nLaunch error: ${result.launchError}` : ""}`);
 	});
 	browserCommand.command("remove").description("Remove Treeport's hosted Chromium build").option("--json", "emit machine-readable JSON").action(async () => {
-		await request("/api/browser/install", { method: "DELETE" });
+		await request("/api/browser/install", okResponseSchema, { method: "DELETE" });
 		print({ removed: true }, () => "Removed Treeport hosted Chromium");
 	});
 	browserCommand.command("list").description("List open Browser sessions").option("--json", "emit machine-readable JSON").action(async () => {
@@ -842,7 +852,7 @@ async function main(args) {
 		const options = installCommand.opts();
 		const body = { source: await packageSource(source) };
 		if (options.local) body.projectId = await localPackageProjectId();
-		const result = (await request("/api/packages/install", {
+		const result = (await request("/api/packages/install", packageOperationResponseSchema, {
 			method: "POST",
 			body: JSON.stringify(body)
 		})).result;
@@ -853,14 +863,14 @@ async function main(args) {
 		const options = removePackageCommand.opts();
 		const body = { source: await packageSource(source) };
 		if (options.local) body.projectId = await localPackageProjectId();
-		const result = (await request("/api/packages/remove", {
+		const result = (await request("/api/packages/remove", packageOperationResponseSchema, {
 			method: "POST",
 			body: JSON.stringify(body)
 		})).result;
 		print(result, () => `Removed ${result.source}`);
 	});
 	program.command("list").description("List configured Treeport packages").option("--json", "emit machine-readable JSON").action(async () => {
-		const result = await request("/api/packages");
+		const result = await request("/api/packages", packageListingResponseSchema);
 		print(result, () => {
 			const lines = result.packages.map((pkg) => {
 				return `${pkg.scope === "global" ? "global" : `project:${pkg.projectName ?? pkg.projectId}`}\t${pkg.source}\t${pkg.resources.webPanels} web panels, ${pkg.resources.terminalPresets} terminal presets`;
@@ -869,34 +879,41 @@ async function main(args) {
 			return lines.join("\n");
 		});
 	});
-	const updatePackagesCommand = program.command("update").description("Update Treeport or explicitly update configured packages").argument("[source]", "one configured npm: source").option("--packages", "update every eligible configured package").option("--json", "emit machine-readable JSON");
+	const updatePackagesCommand = program.command("update").description("Update Treeport or explicitly update configured packages").argument("[source]", "one configured npm: source").option("--packages", "update every eligible configured package").option("-y, --yes", "approve the Treeport self-update without prompting").option("--start", "start Treeport after a self-update if it was stopped").option("--json", "emit machine-readable JSON");
 	updatePackagesCommand.action(async (source) => {
 		const options = updatePackagesCommand.opts();
 		if (source && options.packages) throw new CliError("Specify a package source or --packages, not both.", 2);
+		if ((source || options.packages) && (options.yes || options.start)) throw new CliError("--yes and --start apply only to Treeport self-updates.", 2);
 		if (!source && !options.packages) {
 			if (await resolveDaemonLifecycle() === "external") throw new CliError("Cannot update Treeport because this daemon lifecycle is externally managed.", 5, "UPDATE_EXTERNAL_REFUSED");
-			const selfUpdateOptions = { environment: cliEnvironment };
-			if (!jsonOutput) selfUpdateOptions.progress = (message) => writeStderr(`${message}\n`);
-			const result = await runLocalUpdate(selfUpdateOptions).catch((error) => {
-				if (error instanceof LocalUpdateError) throw new CliError(error.message, error.exitCode, error.code, error.details);
-				throw error;
-			});
-			print(result, () => {
-				if (result.status === "current") return `Treeport ${result.toVersion} is current`;
-				return result.daemon.wasRunning ? `Updated Treeport from ${result.fromVersion} to ${result.toVersion} and restarted the ${result.daemon.lifecycle === "service" ? "service" : "daemon"}` : `Updated Treeport from ${result.fromVersion} to ${result.toVersion}; Treeport remains stopped`;
-			});
+			const selfUpdateOptions = {
+				environment: cliEnvironment,
+				yes: options.yes ?? false,
+				start: options.start ?? false
+			};
+			if (!jsonOutput && process.stdin.isTTY && process.stdout.isTTY && process.stderr.isTTY) selfUpdateOptions.confirm = (preview, signal) => confirmLocalUpdate(preview, signal, process.stdin, process.stderr, errorOutput);
+			if (!jsonOutput) selfUpdateOptions.progress = (message) => {
+				if (!updateProgressShown) {
+					writeStderr(`${errorOutput.heading("Treeport update")}\n\n`);
+					updateProgressShown = true;
+				}
+				writeStderr(`${errorOutput.indent(errorOutput.summary(message, "warning"))}\n`);
+			};
+			const result = await runLocalUpdate(selfUpdateOptions);
+			if (updateProgressShown) writeStderr("\n");
+			print(result, () => formatLocalUpdateResult(result, output));
 			return;
 		}
-		const results = (await request("/api/packages/update", {
+		const results = (await request("/api/packages/update", packageOperationsResponseSchema, {
 			method: "POST",
 			body: JSON.stringify(source ? { source: await packageSource(source) } : {})
 		})).results;
-		print(results, () => results.map((result) => `${result.status}\t${result.scope}\t${result.source ?? "packages"}${result.reason ? `\t${result.reason}` : ""}`).join("\n"));
+		print(results, () => output.blocks(output.heading("Treeport package update"), ...results.map((result) => output.blocks(output.summary(`${stateName(result.status)} ${result.source ?? "packages"}`, result.status === "skipped" ? "warning" : "success"), output.detail(output.rows([["Scope", stateName(result.scope)]])), result.reason ? output.indent(result.reason) : null))));
 	});
 	const reloadCommand = program.command("reload").description("Reload package settings and resources without restarting").option("-l, --local", "reload only the registered project containing the current directory").option("--json", "emit machine-readable JSON");
 	reloadCommand.action(async () => {
 		const options = reloadCommand.opts();
-		const result = await request("/api/packages/reload", {
+		const result = await request("/api/packages/reload", packageReloadResponseSchema, {
 			method: "POST",
 			body: JSON.stringify(options.local ? { projectId: await localPackageProjectId() } : {})
 		});
@@ -909,7 +926,7 @@ async function main(args) {
 		throw new CliError(projectCommand.helpInformation(), 2);
 	});
 	projectCommand.command("add").description("Register a folder or Git repository").argument("<path>", "folder path").option("--json", "emit machine-readable JSON").action(async (repository) => {
-		const body = await request("/api/projects", {
+		const body = await request("/api/projects", projectResponseSchema, {
 			method: "POST",
 			body: JSON.stringify({ path: await canonical(repository) })
 		});
@@ -942,25 +959,46 @@ async function main(args) {
 		const result = await createWorktree(project.id, request);
 		print(result, () => `Created tree ${result.worktree.name} (${result.worktree.id})\n${result.worktree.path}${result.setupError ? `\nSetup error: ${result.setupError}` : ""}`);
 	});
-	const worktreeRemoveCommand = worktreeCommand.command("remove").description("Remove a linked tree").argument("<id-or-path-or-dot>", "Tree to remove").option("--force", "confirm destructive removal warnings").option("--json", "emit machine-readable JSON");
+	const worktreeRemoveCommand = worktreeCommand.command("remove").description("Remove a linked tree").argument("<id-or-path-or-dot>", "Tree to remove").option("--force", "confirm destructive removal warnings").option("--skip-cleanup", "remove without configured project cleanup").option("--json", "emit machine-readable JSON");
 	worktreeRemoveCommand.action(async (identifier) => {
-		const { force: confirmed } = worktreeRemoveCommand.opts();
+		const { force: confirmed, skipCleanup: requestedSkipCleanup } = worktreeRemoveCommand.opts();
 		const worktree = await resolveWorktree(identifier);
-		const preview = (await request(`/api/worktrees/${worktree.id}/remove-preview`)).preview;
+		const preview = (await request(`/api/worktrees/${worktree.id}/remove-preview`, removePreviewResponseSchema)).preview;
 		if (!preview.eligible) throw new CliError(preview.reasons.join("\n"), 5);
 		if (preview.warnings.length && !confirmed) throw new CliError(`${preview.warnings.join("\n")}\nRe-run with --force to confirm removal.`, 5);
-		let operation = (await request(`/api/worktrees/${worktree.id}/remove`, {
+		const skipCleanup = Boolean(requestedSkipCleanup) && preview.cleanup.commands.length > 0;
+		if (skipCleanup && !confirmed) throw new CliError("Skipping project cleanup can leave project resources behind.\nRe-run with --force --skip-cleanup to confirm removal.", 5);
+		let operation = (await request(`/api/worktrees/${worktree.id}/remove`, operationResponseSchema, {
 			method: "POST",
 			body: JSON.stringify({
 				confirmationToken: preview.confirmationToken,
-				confirmDestructive: preview.warnings.length > 0
+				confirmDestructive: preview.warnings.length > 0 || skipCleanup,
+				skipCleanup
 			})
 		})).operation;
+		const displayedCleanupCommands = /* @__PURE__ */ new Set();
+		const displayFinishedCleanup = () => {
+			if (jsonOutput || operation.kind !== "remove") return;
+			operation.request.cleanupCommands.commands.forEach((command, index) => {
+				if (displayedCleanupCommands.has(index) || command.status !== "completed" && command.status !== "failed") return;
+				displayedCleanupCommands.add(index);
+				const lines = [`Cleanup: ${command.name}${command.status === "failed" ? " (failed)" : ""}`];
+				if (command.stdout) lines.push(command.stdout.replace(/\n$/u, ""));
+				if (command.stderr) lines.push(command.stderr.replace(/\n$/u, ""));
+				if (command.outputTruncated) lines.push("Cleanup output was truncated.");
+				writeStdout(`${lines.join("\n")}\n`);
+			});
+		};
+		displayFinishedCleanup();
 		while (operation.status === "pending" || operation.status === "running") {
 			await new Promise((resolve) => setTimeout(resolve, 100));
-			operation = (await request(`/api/operations/${encodeURIComponent(operation.id)}`)).operation;
+			operation = (await request(`/api/operations/${encodeURIComponent(operation.id)}`, operationResponseSchema)).operation;
+			displayFinishedCleanup();
+		}
+		if (operation.status === "failed") {
+			const cleanup = operation.kind === "remove" ? operation.request.cleanupCommands.commands.find((command) => command.status === "failed") : null;
+			throw new CliError(operation.error ?? "Tree removal failed; Git kept the tree.", 5, "WORKTREE_REMOVAL_FAILED", cleanup ?? void 0);
 		}
-		if (operation.status === "failed") throw new CliError(operation.error ?? "Tree removal failed", 5, "WORKTREE_REMOVAL_FAILED");
 		if (operation.kind !== "remove" || !operation.result) throw new CliError("Tree removal returned an unexpected operation result", 5, "INVALID_OPERATION_RESULT");
 		print(operation.result, () => {
 			const warning = operation.result?.cleanup.warning;
@@ -976,7 +1014,7 @@ async function main(args) {
 		const options = webPanelOpenCommand.opts();
 		const worktree = await resolveWorktree(options.worktree);
 		const definition = await webPanelDefinition(worktree.id, identifier);
-		const result = await request(`/api/worktrees/${encodeURIComponent(worktree.id)}/panels/open`, {
+		const result = await request(`/api/worktrees/${encodeURIComponent(worktree.id)}/panels/open`, openWebPanelResponseSchema, {
 			method: "POST",
 			body: JSON.stringify({
 				definitionId: definition.id,
@@ -1008,7 +1046,7 @@ async function main(args) {
 		const worktree = await resolveWorktree(options.worktree);
 		const body = { name: options.name };
 		if (argv) body.argv = argv;
-		const result = await request(`/api/worktrees/${worktree.id}/terminals`, {
+		const result = await request(`/api/worktrees/${worktree.id}/terminals`, terminalResponseSchema, {
 			method: "POST",
 			body: JSON.stringify(body)
 		});
@@ -1028,7 +1066,7 @@ async function main(args) {
 		const { lines: rawLines } = terminalCaptureCommand.opts();
 		const lines = rawLines === void 0 ? 200 : parseCaptureLines(rawLines);
 		const terminalId = resolveTerminalId(identifier);
-		const capture = await request(`/api/terminals/${encodeURIComponent(terminalId)}/capture?lines=${lines}`);
+		const capture = await request(`/api/terminals/${encodeURIComponent(terminalId)}/capture?lines=${lines}`, terminalCaptureResponseSchema);
 		if (jsonOutput) print(capture);
 		else {
 			writeStdout(capture.content);
@@ -1048,7 +1086,7 @@ async function main(args) {
 		print(result, () => `${result.terminal.name} (${result.terminal.id}) reached ${result.condition} at ${result.observedAt}`);
 	});
 	terminalCommand.command("delete").description("Delete a terminal").argument("<terminal-id>", "terminal to delete").option("--json", "emit machine-readable JSON").action(async (terminalId) => {
-		await request(`/api/terminals/${terminalId}`, { method: "DELETE" });
+		await request(`/api/terminals/${terminalId}`, okResponseSchema, { method: "DELETE" });
 		print({
 			ok: true,
 			terminalId
@@ -1094,18 +1132,27 @@ async function runCliApplication(options) {
 	writeStdout = options.stdout ?? ((value) => process.stdout.write(value));
 	writeStderr = options.stderr ?? ((value) => process.stderr.write(value));
 	requestedExitCode = 0;
+	updateProgressShown = false;
+	output = humanOutput(environment, options.stdoutIsTTY ?? (!options.stdout && Boolean(process.stdout.isTTY)), jsonOutput);
+	errorOutput = humanOutput(environment, options.stderrIsTTY ?? (!options.stderr && Boolean(process.stderr.isTTY)), jsonOutput);
 	try {
 		await main([...options.args]);
 	} catch (error) {
-		const cliError = error instanceof CliError ? error : new CliError(error instanceof Error ? error.message : String(error), 1);
+		const cliError = error instanceof CliError || error instanceof LocalUpdateError ? error : new CliError(error instanceof Error ? error.message : String(error), 1);
 		if (jsonOutput) {
-			const body = { error: {
+			const body = { error: cliError.details === void 0 ? {
 				code: cliError.code,
 				message: cliError.message
+			} : {
+				code: cliError.code,
+				message: cliError.message,
+				details: cliError.details
 			} };
-			if (cliError.details !== void 0) body.error.details = cliError.details;
 			writeStderr(`${JSON.stringify(body)}\n`);
-		} else writeStderr(`${cliError.message}\n`);
+		} else {
+			const text = error instanceof LocalUpdateError ? formatLocalUpdateError(error.message, error.details, errorOutput, error.code === "UPDATE_CANCELLED" || error.code === "UPDATE_INTERRUPTED") : errorOutput.blocks(errorOutput.summary(cliError.code === "USAGE_ERROR" ? "Invalid command" : "Command failed", "failure"), errorOutput.indent(cliError.message.replace(/^error: /, "")), cliError.code === "USAGE_ERROR" && errorOutput.next(["treeport --help"]));
+			writeStderr(`${updateProgressShown ? "\n" : ""}${text}\n`);
+		}
 		requestedExitCode = cliError.exitCode;
 	}
 	return requestedExitCode;