@treeport/treeport 0.6.1 → 0.7.0

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 tailscaleRemoteStatus, C as daemonUp, D as resolveLocalApiUrl, E as readDaemonLogs, N as parseDurationMs, O as resolvePackagePath, S as daemonStatus, T as enableTailscaleRemote, _ as serviceStart, b as daemonDown, c as runLocalUpdate, d as serviceApply, f as serviceDisable, g as serviceRun, h as serviceInstalled, j as treeportVersion, k as runDoctor, m as serviceEnable, p as serviceDoctorCheck, r as formatLocalUpdateError, t as LocalUpdateError, u as readServiceLogs, v as serviceStatus, w as disableTailscaleRemote, x as daemonHealth, y as serviceStop } from "../../update-UYS2lMdD.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) {
@@ -146,7 +149,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 +167,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 +182,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 +217,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 +245,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 +269,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 +309,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 +351,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 +383,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 +403,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 +420,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 +441,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 +465,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) {
@@ -499,7 +498,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 +511,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) => {
@@ -549,13 +548,13 @@ async function main(args) {
 		if (options.foreground) return;
 		print(result, () => `Treeport is running\n${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));
@@ -690,7 +689,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 +700,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,
@@ -758,7 +757,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 +768,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 +841,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 +852,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`;
@@ -878,7 +877,7 @@ async function main(args) {
 			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);
+				if (error instanceof LocalUpdateError) throw new CliError(jsonOutput ? error.message : formatLocalUpdateError(error.message, error.details), error.exitCode, error.code, error.details);
 				throw error;
 			});
 			print(result, () => {
@@ -887,7 +886,7 @@ async function main(args) {
 			});
 			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;
@@ -896,7 +895,7 @@ async function main(args) {
 	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 +908,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 +941,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 +996,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 +1028,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 +1048,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 +1068,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
@@ -1099,11 +1119,14 @@ async function runCliApplication(options) {
 	} catch (error) {
 		const cliError = error instanceof CliError ? 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`);
 		requestedExitCode = cliError.exitCode;

package/dist/node/server/core/launcher.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
-import "../../../dist-Crk_Xr82.js";
-import { t as integrateShellLaunch } from "../../../shell-integration-Be_c91lw.js";
+import "../../../dist-BsLn2Gbc.js";
+import { t as integrateShellLaunch } from "../../../shell-integration-CPmrVa3B.js";
 import fs from "node:fs/promises";
 import path from "node:path";
-import { z } from "zod";
 import { spawn } from "node:child_process";
+import { z } from "zod";
 import { fileURLToPath } from "node:url";
 //#region src/server/core/launcher.ts
 const FORWARDED_SIGNALS = [
@@ -19,7 +19,6 @@ const launchSpecSchema = z.object({
 	cwd: z.string(),
 	env: z.record(z.string(), z.string()),
 	shellIntegrationDir: z.string().optional(),
-	tmuxExecutable: z.string().optional(),
 	setupTasks: z.array(z.object({
 		label: z.string(),
 		argv: z.array(z.string()),
@@ -114,7 +113,6 @@ async function runLaunchSpec(spec, dependencies = {}) {
 	const stdout = dependencies.stdout ?? process.stdout;
 	const stderr = dependencies.stderr ?? process.stderr;
 	const signalSource = dependencies.signalSource ?? process;
-	const tmuxPane = dependencies.tmuxPane === void 0 ? process.env.TMUX_PANE : dependencies.tmuxPane ?? void 0;
 	if (spec.setupError) {
 		stderr.write(`[Treeport setup] ${safeDiagnostic(spec.setupError) || "setup preparation failed"}\n`);
 		return 1;
@@ -160,25 +158,9 @@ async function runLaunchSpec(spec, dependencies = {}) {
 		...process.env,
 		...spec.env
 	};
-	const command = integrateShellLaunch(spec.argv, commandEnvironment, spec.shellIntegrationDir, spec.tmuxExecutable);
+	const command = integrateShellLaunch(spec.argv, commandEnvironment, spec.shellIntegrationDir, Boolean(spec.shellIntegrationDir));
 	const initialTitle = spec.initialTitle ? safeDiagnostic(spec.initialTitle) : "";
-	if (initialTitle && spec.tmuxExecutable && tmuxPane) {
-		if ((await runChild([
-			spec.tmuxExecutable,
-			"set-option",
-			"-p",
-			"-t",
-			tmuxPane,
-			"--",
-			"@treeport-command",
-			initialTitle
-		], {
-			cwd: spec.cwd,
-			env: process.env,
-			spawnProcess,
-			signalSource
-		})).forwardedSignal) return 1;
-	}
+	if (initialTitle && spec.shellIntegrationDir) stdout.write(`\u001b]777;command;${initialTitle}\u001b\\`);
 	const result = await runChild(command.argv, {
 		cwd: spec.cwd,
 		env: command.env,
@@ -188,31 +170,8 @@ async function runLaunchSpec(spec, dependencies = {}) {
 	if (result.spawnError) stderr.write(`Treeport launcher: ${safeDiagnostic(result.spawnError.message) || "spawn error"}\n`);
 	if (result.forwardedSignal && (!spec.fallbackArgv || result.forwardedSignal !== "SIGINT")) return 1;
 	if (spec.fallbackArgv) {
-		if (spec.tmuxExecutable && tmuxPane && spec.fallbackArgv[0]) {
-			if ((await runChild([
-				spec.tmuxExecutable,
-				"set-option",
-				"-p",
-				"-u",
-				"-t",
-				tmuxPane,
-				"@treeport-command",
-				";",
-				"set-option",
-				"-p",
-				"-t",
-				tmuxPane,
-				"--",
-				"@treeport-fallback-shell",
-				Buffer.from(JSON.stringify(spec.fallbackArgv[0]), "utf8").toString("base64url")
-			], {
-				cwd: spec.cwd,
-				env: process.env,
-				spawnProcess,
-				signalSource
-			})).forwardedSignal) return 1;
-		}
-		const fallback = integrateShellLaunch(spec.fallbackArgv, commandEnvironment, spec.shellIntegrationDir, spec.tmuxExecutable);
+		if (spec.shellIntegrationDir) stdout.write("\x1B]777;command;\x1B\\");
+		const fallback = integrateShellLaunch(spec.fallbackArgv, commandEnvironment, spec.shellIntegrationDir, Boolean(spec.shellIntegrationDir));
 		const fallbackResult = await runChild(fallback.argv, {
 			cwd: spec.cwd,
 			env: fallback.env,
@@ -246,6 +205,9 @@ async function main() {
 	process.exit(await runLaunchSpec(spec));
 }
 const invokedPath = process.argv[1];
-if (invokedPath && path.resolve(invokedPath) === path.resolve(fileURLToPath(import.meta.url))) main();
+if (invokedPath && path.resolve(invokedPath) === path.resolve(fileURLToPath(import.meta.url))) main().catch((error) => {
+	process.stderr.write(`Treeport launcher: ${error instanceof Error ? error.message : String(error)}\n`);
+	process.exit(127);
+});
 //#endregion
 export { runLaunchSpec };