@treeport/treeport 0.2.2 → 0.4.0

package/dist/node/server/index.js

@@ -1,5 +1,5 @@
-import { B as TERMINAL_SELECTION_RESTORE_SEQUENCE, C as repositoryTerminalPresetsFileSchema, D as updateTerminalPresetSchema, E as updateProjectSchema, G as terminalBellAcknowledgementSchema, H as TERMINAL_SELECTION_STOP_SEQUENCE, J as terminalLegacyTakeControlSchema, K as terminalBinarySchema, L as TERMINAL_OUTPUT_STALL_TIMEOUT_MS, M as TERMINAL_CONTROLLER_GRACE_MS, N as TERMINAL_MAX_CLIENT_MESSAGE_BYTES, O as updateTerminalSchema, Q as terminalTakeControlSchema, R as TERMINAL_SCROLL_EXIT_SEQUENCE, S as repositoryTerminalPresetSchema, T as terminalCaptureQuerySchema, U as parseTerminalAuth, V as TERMINAL_SELECTION_START_SEQUENCE, W as parseTerminalProgress, X as terminalResizeSchema, Y as terminalOutputAckSchema, Z as terminalSizeSchema, _ as packageReloadSchema, b as registerProjectSchema, c as createTerminalSchema, d as deleteTerminalPresetSchema, f as deleteWebPanelStorageSchema, g as packageProjectQuerySchema, h as packageInstallSchema, i as TERMINAL_MAX_UPLOAD_BYTES, j as SOCKET_IO_PATH, l as createWebPanelSchema, m as openWebPanelSchema, n as parseDurationMs, o as browseDirectoryQuerySchema, p as getWebPanelStorageSchema, q as terminalInputSchema, s as createTerminalPresetSchema, t as assertLoopbackHost, u as createWorktreeSchema, v as packageRemoveSchema, w as setWebPanelStorageSchema, x as removeWorktreeSchema, y as packageUpdateSchema, z as TERMINAL_SELECTION_CLEAR_SEQUENCE } from "../../loopback-4XVZbAD1.js";
-import { n as prepareShellIntegration } from "../../shell-integration-7aBNr-p0.js";
+import { $ as terminalTakeControlSchema, B as TERMINAL_SELECTION_CLEAR_SEQUENCE, C as repositoryTerminalPresetsFileSchema, D as updateTerminalPresetSchema, E as updateProjectSchema, G as parseTerminalProgress, H as TERMINAL_SELECTION_START_SEQUENCE, J as terminalInputSchema, K as terminalBellAcknowledgementSchema, M as SOCKET_IO_PATH, N as TERMINAL_CONTROLLER_GRACE_MS, O as updateTerminalSchema, P as TERMINAL_MAX_CLIENT_MESSAGE_BYTES, Q as terminalSizeSchema, R as TERMINAL_OUTPUT_STALL_TIMEOUT_MS, S as repositoryTerminalPresetSchema, T as terminalCaptureQuerySchema, U as TERMINAL_SELECTION_STOP_SEQUENCE, V as TERMINAL_SELECTION_RESTORE_SEQUENCE, W as parseTerminalAuth, X as terminalOutputAckSchema, Y as terminalLegacyTakeControlSchema, Z as terminalResizeSchema, _ as packageReloadSchema, b as registerProjectSchema, c as createTerminalSchema, d as deleteTerminalPresetSchema, f as deleteWebPanelStorageSchema, g as packageProjectQuerySchema, h as packageInstallSchema, i as TERMINAL_MAX_UPLOAD_BYTES, k as webPanelInputSchema, l as createWebPanelSchema, m as openWebPanelSchema, n as parseDurationMs, o as browseDirectoryQuerySchema, p as getWebPanelStorageSchema, q as terminalBinarySchema, s as createTerminalPresetSchema, t as assertLoopbackHost, u as createWorktreeSchema, v as packageRemoveSchema, w as setWebPanelStorageSchema, x as removeWorktreeSchema, y as packageUpdateSchema, z as TERMINAL_SCROLL_EXIT_SEQUENCE } from "../../loopback-D7k_J_Wl.js";
+import { n as prepareShellIntegration } from "../../shell-integration-Be_c91lw.js";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
@@ -110,8 +110,8 @@ var ExternalCommandError = class extends Data.TaggedError("ExternalCommandError"
 		});
 	}
 };
-function errorMessage$1(error) {
-	return error instanceof Error ? error.message : String(error);
+function errorMessage$1(cause) {
+	return cause instanceof Error ? cause.message : String(cause);
 }
 /**
 * Runs a child command as an interruptible Effect. The child is acquired as a
@@ -243,9 +243,10 @@ function runCommandEffect(request) {
 				removeUseListeners();
 			});
 		});
-		if (request.timeoutMs === void 0 || request.timeoutMs <= 0) return awaitResult;
-		return Effect.raceFirst(awaitResult, Effect.sleep(Duration.millis(request.timeoutMs)).pipe(Effect.flatMap(() => Effect.sync(() => {
-			resource.terminalError ??= new TimeoutCommandError(request, request.timeoutMs);
+		const timeoutMs = request.timeoutMs;
+		if (timeoutMs === void 0 || timeoutMs <= 0) return awaitResult;
+		return Effect.raceFirst(awaitResult, Effect.sleep(Duration.millis(timeoutMs)).pipe(Effect.flatMap(() => Effect.sync(() => {
+			resource.terminalError ??= new TimeoutCommandError(request, timeoutMs);
 			return resource.terminalError;
 		})), Effect.flatMap(Effect.fail)));
 	}, (resource) => Deferred.isDone(resource.exit).pipe(Effect.flatMap((alreadyExited) => {
@@ -311,7 +312,7 @@ function defaultCacheDir(env, platform = process.platform) {
 }
 function defaultRuntimeDir(env) {
 	if (env.XDG_RUNTIME_DIR) return path.join(expandHome(env.XDG_RUNTIME_DIR), "treeport");
-	return path.join(os.tmpdir(), `treeport-${typeof process.getuid === "function" ? process.getuid() : "user"}`);
+	return path.join(os.tmpdir(), `treeport-${process.getuid?.() ?? "user"}`);
 }
 function loadConfig(env = process.env) {
 	const host = env.TREEPORT_HOST?.trim() || env.HOST?.trim() || "127.0.0.1";
@@ -322,8 +323,8 @@ function loadConfig(env = process.env) {
 	const dataDir = path.resolve(expandHome(env.TREEPORT_DATA_DIR?.trim() || defaultDataDir(env)));
 	const runtimeDir = path.resolve(expandHome(env.TREEPORT_RUNTIME_DIR?.trim() || defaultRuntimeDir(env)));
 	const daemonLifecycle = env.TREEPORT_DAEMON_LIFECYCLE?.trim() || "treeport";
-	if (daemonLifecycle !== "treeport" && daemonLifecycle !== "external") throw new Error("TREEPORT_DAEMON_LIFECYCLE must be either treeport or external");
-	return {
+	if (daemonLifecycle !== "treeport" && daemonLifecycle !== "service" && daemonLifecycle !== "external") throw new Error("TREEPORT_DAEMON_LIFECYCLE must be treeport, service, or external");
+	const config = {
 		host,
 		port: portValue,
 		dataDir,
@@ -339,9 +340,10 @@ function loadConfig(env = process.env) {
 		appVersion: env.TREEPORT_APP_VERSION?.trim() || "development",
 		instanceId: env.TREEPORT_INSTANCE_ID?.trim() || crypto.randomUUID(),
 		installationMethod: env.TREEPORT_INSTALLATION_METHOD?.trim() || "development",
-		webDevelopment: env.TREEPORT_WEB_DEVELOPMENT?.trim() === "1",
-		...env.TREEPORT_WEB_DIST?.trim() ? { webDist: env.TREEPORT_WEB_DIST.trim() } : {}
+		webDevelopment: env.TREEPORT_WEB_DEVELOPMENT?.trim() === "1"
 	};
+	if (env.TREEPORT_WEB_DIST?.trim()) config.webDist = env.TREEPORT_WEB_DIST.trim();
+	return config;
 }
 //#endregion
 //#region src/server/core/database-schema.ts
@@ -463,7 +465,7 @@ async function readOptionalJsonc(filePath) {
 	try {
 		source = await fs.readFile(filePath, "utf8");
 	} catch (error) {
-		if (error.code === "ENOENT") return { found: false };
+		if (error instanceof Error && "code" in error && error.code === "ENOENT") return { found: false };
 		throw error;
 	}
 	const errors = [];
@@ -509,12 +511,12 @@ async function assertNoSymlinkComponents(parent, candidate) {
 }
 function normalizeWorktreeName(input) {
 	const name = input.normalize("NFKD").replace(/\p{Mark}+/gu, "").toLowerCase().replace(/[^\p{Letter}\p{Number}]+/gu, "-").replace(/^-+|-+$/gu, "");
-	if (!name) throw new Error("Worktree name is required");
-	if (name.length > 120) throw new Error("Worktree name must be 120 characters or fewer");
+	if (!name) throw new Error("Tree name is required");
+	if (name.length > 120) throw new Error("Tree name must be 120 characters or fewer");
 	return name;
 }
 function inferWorktreeName(mainWorktreePath, worktreePath, kind) {
-	if (kind === "main") return "main worktree";
+	if (kind === "main") return "main tree";
 	const checkoutName = path.basename(worktreePath);
 	return checkoutName === path.basename(mainWorktreePath) ? path.basename(path.dirname(worktreePath)) : checkoutName;
 }
@@ -564,58 +566,64 @@ async function prepareZedWorktreeWrapper(mainWorktreePath, wrapperPath) {
 	};
 }
 const ZED_TASKS_CONFIG_PATH = path.join(".zed", "tasks.json");
+z.unknown();
+const zedTaskRecordSchema = z.looseObject({
+	command: z.unknown().optional(),
+	args: z.unknown().optional(),
+	env: z.unknown().optional(),
+	cwd: z.unknown().optional(),
+	label: z.unknown().optional(),
+	hooks: z.unknown().optional()
+});
 function taskArray(value) {
-	if (Array.isArray(value)) return value;
-	if (value && typeof value === "object") {
-		const tasks = Reflect.get(value, "tasks");
-		if (Array.isArray(tasks)) return tasks;
-	}
-	return null;
+	const direct = z.array(z.unknown()).safeParse(value);
+	if (direct.success) return direct.data;
+	const wrapped = z.object({ tasks: z.array(z.unknown()) }).safeParse(value);
+	return wrapped.success ? wrapped.data.tasks : null;
 }
 function parseTask(entry, index, options) {
 	const prefix = `Zed task ${index + 1}`;
-	if (!entry || typeof entry !== "object" || Array.isArray(entry)) throw new Error(`${prefix} must be an object`);
-	const command = Reflect.get(entry, "command");
-	const argsInput = Reflect.get(entry, "args");
-	const environmentInput = Reflect.get(entry, "env");
-	const cwd = Reflect.get(entry, "cwd");
-	const label = Reflect.get(entry, "label");
-	if (typeof label !== "string" || !label.trim()) {
-		if (options.requireLabel) throw new Error(`${prefix} is missing a label`);
-	}
-	if (typeof command !== "string" || !command.trim()) throw new Error(`${prefix} is missing a command`);
+	const parsedEntry = zedTaskRecordSchema.safeParse(entry);
+	if (!parsedEntry.success) throw new Error(`${prefix} must be an object`);
+	const { args: argsInput, command, cwd, env: environmentInput, label } = parsedEntry.data;
+	const parsedLabel = z.string().safeParse(label);
+	if ((!parsedLabel.success || !parsedLabel.data.trim()) && options.requireLabel) throw new Error(`${prefix} is missing a label`);
+	const parsedCommand = z.string().safeParse(command);
+	if (!parsedCommand.success || !parsedCommand.data.trim()) throw new Error(`${prefix} is missing a command`);
 	if (argsInput !== void 0 && !Array.isArray(argsInput)) throw new Error(`${prefix} has invalid args`);
-	const args = (argsInput ?? []).map((argument) => {
-		if (typeof argument !== "string") throw new Error(`${prefix} has a non-string argument`);
-		return argument;
-	});
+	const parsedArgs = z.array(z.string()).safeParse(argsInput ?? []);
+	if (!parsedArgs.success) throw new Error(`${prefix} has a non-string argument`);
 	const env = {};
 	if (environmentInput !== void 0) {
-		if (!environmentInput || typeof environmentInput !== "object" || Array.isArray(environmentInput)) throw new Error(`${prefix} has invalid env`);
-		if (options.validateLaunchFields && Object.keys(environmentInput).length > 128) throw new Error(`${prefix} has more than 128 environment variables`);
-		for (const [key, environmentValue] of Object.entries(environmentInput)) {
+		const parsedEnvironment = z.record(z.string(), z.unknown()).safeParse(environmentInput);
+		if (!parsedEnvironment.success) throw new Error(`${prefix} has invalid env`);
+		if (options.validateLaunchFields && Object.keys(parsedEnvironment.data).length > 128) throw new Error(`${prefix} has more than 128 environment variables`);
+		for (const [key, environmentValue] of Object.entries(parsedEnvironment.data)) {
 			if (options.validateLaunchFields && (!key || key.length > 256 || key.includes("=") || key.includes("\0"))) throw new Error(`${prefix} has an invalid env key`);
-			if (typeof environmentValue !== "string") throw new Error(`${prefix} has a non-string env value`);
-			if (options.validateLaunchFields && (environmentValue.length > 4096 || environmentValue.includes("\0"))) throw new Error(`${prefix} has an invalid env value`);
-			env[key] = environmentValue;
-		}
-	}
-	if (cwd !== void 0 && typeof cwd !== "string") throw new Error(`${prefix} has invalid cwd`);
-	if (options.validateLaunchFields && typeof cwd === "string" && (!cwd.trim() || cwd.length > 4096 || cwd.includes("\0"))) throw new Error(`${prefix} has invalid cwd`);
-	return {
-		label: typeof label === "string" && label.trim() ? label : `Task ${index + 1}`,
-		command,
-		args,
-		...typeof cwd === "string" ? { cwd } : {},
+			const parsedValue = z.string().safeParse(environmentValue);
+			if (!parsedValue.success) throw new Error(`${prefix} has a non-string env value`);
+			if (options.validateLaunchFields && (parsedValue.data.length > 4096 || parsedValue.data.includes("\0"))) throw new Error(`${prefix} has an invalid env value`);
+			env[key] = parsedValue.data;
+		}
+	}
+	const parsedCwd = z.string().safeParse(cwd);
+	if (cwd !== void 0 && !parsedCwd.success) throw new Error(`${prefix} has invalid cwd`);
+	if (options.validateLaunchFields && parsedCwd.success && (!parsedCwd.data.trim() || parsedCwd.data.length > 4096 || parsedCwd.data.includes("\0"))) throw new Error(`${prefix} has invalid cwd`);
+	const task = {
+		label: parsedLabel.success && parsedLabel.data.trim() ? parsedLabel.data : `Task ${index + 1}`,
+		command: parsedCommand.data,
+		args: parsedArgs.data,
 		env
 	};
+	if (parsedCwd.success) task.cwd = parsedCwd.data;
+	return task;
 }
 async function loadCreateWorktreeTasks(mainWorktreePath) {
 	const tasksFile = await readOptionalJsonc(path.join(mainWorktreePath, ZED_TASKS_CONFIG_PATH));
 	return (taskArray(tasksFile.found ? tasksFile.value : null) ?? []).flatMap((entry, index) => {
-		if (!entry || typeof entry !== "object" || Array.isArray(entry)) return [];
-		const hooks = Reflect.get(entry, "hooks");
-		if (!Array.isArray(hooks) || !hooks.includes("create_worktree")) return [];
+		const parsedEntry = zedTaskRecordSchema.safeParse(entry);
+		const parsedHooks = z.array(z.string()).safeParse(parsedEntry.success ? parsedEntry.data.hooks : void 0);
+		if (!parsedHooks.success || !parsedHooks.data.includes("create_worktree")) return [];
 		return [parseTask(entry, index, {
 			requireLabel: false,
 			validateLaunchFields: false
@@ -1106,6 +1114,14 @@ var ProductEventBus = class {
 };
 //#endregion
 //#region src/server/core/gh.ts
+const ghPrSchema = z.object({
+	number: z.number().optional(),
+	state: z.string().optional(),
+	url: z.string().optional(),
+	baseRefName: z.string().optional(),
+	headRefName: z.string().optional(),
+	mergedAt: z.string().nullable().optional()
+}).strict();
 function mapPrState(pr) {
 	if (!pr) return "no_pr";
 	if (pr.mergedAt || pr.state?.toUpperCase() === "MERGED") return "merged";
@@ -1156,7 +1172,7 @@ var GhAdapter = class {
 				timeoutMs: 3e4
 			});
 			if (result.exitCode !== 0) return unknownPr();
-			const pr = JSON.parse(result.stdout)[0] ?? null;
+			const pr = z.array(ghPrSchema).parse(JSON.parse(result.stdout))[0] ?? null;
 			return {
 				state: mapPrState(pr),
 				number: pr?.number ?? null,
@@ -1997,16 +2013,35 @@ async function checkRuntimePrerequisites(config) {
 }
 //#endregion
 //#region src/server/core/package-system.ts
+z.unknown();
+const manifestPatternsSchema = z.array(z.string());
+const webPanelManifestEntrySchema = z.union([z.string(), z.strictObject({
+	source: z.string(),
+	permissions: z.array(z.enum(["same-origin"])).optional()
+})]);
 const EMPTY_SETTINGS = {
 	raw: {},
 	packages: []
 };
 const PACKAGE_OPERATION_TIMEOUT_MS = 5 * 6e4;
 function sourceString(source) {
-	return typeof source === "string" ? source : source.source;
+	const parsed = z.string().safeParse(source);
+	if (parsed.success) return parsed.data;
+	return z.object({ source: z.string() }).parse(source).source;
 }
 function packageFilter(source) {
-	return typeof source === "string" ? void 0 : source;
+	if (z.string().safeParse(source).success) return;
+	const data = z.object({
+		source: z.string(),
+		autoload: z.boolean().optional(),
+		webPanels: z.array(z.string()).optional(),
+		terminalPresets: z.array(z.string()).optional()
+	}).parse(source);
+	const result = { source: data.source };
+	if (data.autoload !== void 0) result.autoload = data.autoload;
+	if (data.webPanels !== void 0) result.webPanels = data.webPanels;
+	if (data.terminalPresets !== void 0) result.terminalPresets = data.terminalPresets;
+	return result;
 }
 function toPosix(value) {
 	return value.split(path.sep).join("/");
@@ -2024,15 +2059,16 @@ function isWithin$1(candidate, root) {
 	return relative === "" || !relative.startsWith(`..${path.sep}`) && relative !== ".." && !path.isAbsolute(relative);
 }
 function diagnostic(scope, message, options = {}) {
-	return {
+	const result = {
 		severity: options.severity ?? "error",
 		scope,
-		message,
-		...options.source === void 0 ? {} : { source: options.source },
-		...options.projectId === void 0 ? {} : { projectId: options.projectId },
-		...options.resourceType === void 0 ? {} : { resourceType: options.resourceType },
-		...options.path === void 0 ? {} : { path: options.path }
+		message
 	};
+	if (options.source !== void 0) result.source = options.source;
+	if (options.projectId !== void 0) result.projectId = options.projectId;
+	if (options.resourceType !== void 0) result.resourceType = options.resourceType;
+	if (options.path !== void 0) result.path = options.path;
+	return result;
 }
 function normalizePattern(value) {
 	return toPosix(value.trim().replace(/^\.\//u, "").replace(/\/$/u, ""));
@@ -2139,85 +2175,103 @@ var PackageSystem = class {
 	async readSettingsFile(settingsPath) {
 		let readError;
 		const content = await fs.readFile(settingsPath, "utf8").catch((error) => {
-			if (error.code === "ENOENT") return null;
+			if (error instanceof Error && "code" in error && error.code === "ENOENT") return null;
 			readError = error instanceof Error ? error : new Error(String(error));
 			return null;
 		});
-		return {
+		const result = {
 			fingerprint: readError ? `error:${readError.message}` : content === null ? "missing" : crypto.createHash("sha256").update(content).digest("hex"),
-			content,
-			...readError ? { error: readError } : {}
+			content
 		};
+		if (readError) result.error = readError;
+		return result;
 	}
 	parseSettings(content, settingsPath, scope, projectId) {
 		if (content === null || content.trim() === "") return { settings: {
 			raw: {},
 			packages: []
 		} };
-		let raw;
+		let input;
 		try {
-			raw = JSON.parse(content);
+			input = JSON.parse(content);
 		} catch (error) {
 			return { diagnostic: diagnostic(scope, `Could not parse ${settingsPath}: ${error instanceof Error ? error.message : String(error)}`, {
 				projectId,
 				path: settingsPath
 			}) };
 		}
-		if (!raw || typeof raw !== "object" || Array.isArray(raw)) return { diagnostic: diagnostic(scope, `${settingsPath} must contain a JSON object`, {
+		const parsedRaw = z.looseObject({
+			npmCommand: z.unknown().optional(),
+			packages: z.unknown().optional()
+		}).safeParse(input);
+		if (!parsedRaw.success) return { diagnostic: diagnostic(scope, `${settingsPath} must contain a JSON object`, {
 			projectId,
 			path: settingsPath
 		}) };
-		const npmCommand = Reflect.get(raw, "npmCommand");
-		const packageEntries = Reflect.get(raw, "packages");
-		if (npmCommand !== void 0 && (!Array.isArray(npmCommand) || npmCommand.length === 0 || npmCommand.some((value) => typeof value !== "string" || value.length === 0))) return { diagnostic: diagnostic(scope, `${settingsPath} npmCommand must be a non-empty argv string array`, {
+		const parsedNpmCommand = z.array(z.string().min(1)).min(1).safeParse(parsedRaw.data.npmCommand);
+		if (parsedRaw.data.npmCommand !== void 0 && !parsedNpmCommand.success) return { diagnostic: diagnostic(scope, `${settingsPath} npmCommand must be a non-empty argv string array`, {
 			projectId,
 			path: settingsPath
 		}) };
-		if (packageEntries !== void 0 && !Array.isArray(packageEntries)) return { diagnostic: diagnostic(scope, `${settingsPath} packages must be an array`, {
+		const parsedPackageEntries = z.array(z.unknown()).safeParse(parsedRaw.data.packages ?? []);
+		if (!parsedPackageEntries.success) return { diagnostic: diagnostic(scope, `${settingsPath} packages must be an array`, {
 			projectId,
 			path: settingsPath
 		}) };
+		const packageObjectSchema = z.looseObject({
+			source: z.unknown().optional(),
+			autoload: z.unknown().optional(),
+			webPanels: z.unknown().optional(),
+			terminalPresets: z.unknown().optional()
+		});
 		const packages = [];
-		for (const [index, entry] of (packageEntries ?? []).entries()) {
-			if (typeof entry === "string" && entry.trim()) {
-				packages.push(entry);
+		for (const [index, entry] of parsedPackageEntries.data.entries()) {
+			const parsedSourceString = z.string().safeParse(entry);
+			if (parsedSourceString.success && parsedSourceString.data.trim()) {
+				packages.push(parsedSourceString.data);
 				continue;
 			}
-			if (!entry || typeof entry !== "object" || Array.isArray(entry)) return { diagnostic: diagnostic(scope, `${settingsPath} packages[${index}] must be a source string or package object`, {
+			const parsedEntry = packageObjectSchema.safeParse(entry);
+			if (!parsedEntry.success) return { diagnostic: diagnostic(scope, `${settingsPath} packages[${index}] must be a source string or package object`, {
 				projectId,
 				path: settingsPath
 			}) };
-			const source = Reflect.get(entry, "source");
-			const autoload = Reflect.get(entry, "autoload");
-			const webPanels = Reflect.get(entry, "webPanels");
-			const terminalPresets = Reflect.get(entry, "terminalPresets");
-			if (typeof source !== "string" || !source.trim()) return { diagnostic: diagnostic(scope, `${settingsPath} packages[${index}].source must be a non-empty string`, {
+			const parsedSource = z.string().safeParse(parsedEntry.data.source);
+			if (!parsedSource.success || !parsedSource.data.trim()) return { diagnostic: diagnostic(scope, `${settingsPath} packages[${index}].source must be a non-empty string`, {
 				projectId,
 				path: settingsPath
 			}) };
-			if (autoload !== void 0 && typeof autoload !== "boolean") return { diagnostic: diagnostic(scope, `${settingsPath} packages[${index}].autoload must be a boolean`, {
+			const parsedAutoload = z.boolean().safeParse(parsedEntry.data.autoload);
+			if (parsedEntry.data.autoload !== void 0 && !parsedAutoload.success) return { diagnostic: diagnostic(scope, `${settingsPath} packages[${index}].autoload must be a boolean`, {
 				projectId,
 				path: settingsPath
 			}) };
-			for (const [key, value] of [["webPanels", webPanels], ["terminalPresets", terminalPresets]]) if (value !== void 0 && (!Array.isArray(value) || value.some((pattern) => typeof pattern !== "string"))) return { diagnostic: diagnostic(scope, `${settingsPath} packages[${index}].${key} must be a string array`, {
+			const parsedWebPanels = z.array(z.string()).safeParse(parsedEntry.data.webPanels);
+			const parsedTerminalPresets = z.array(z.string()).safeParse(parsedEntry.data.terminalPresets);
+			for (const [key, original, parsed] of [[
+				"webPanels",
+				parsedEntry.data.webPanels,
+				parsedWebPanels
+			], [
+				"terminalPresets",
+				parsedEntry.data.terminalPresets,
+				parsedTerminalPresets
+			]]) if (original !== void 0 && !parsed.success) return { diagnostic: diagnostic(scope, `${settingsPath} packages[${index}].${key} must be a string array`, {
 				projectId,
 				path: settingsPath
 			}) };
-			const parsedWebPanels = Array.isArray(webPanels) ? webPanels.filter((pattern) => typeof pattern === "string") : void 0;
-			const parsedTerminalPresets = Array.isArray(terminalPresets) ? terminalPresets.filter((pattern) => typeof pattern === "string") : void 0;
-			packages.push({
-				source,
-				...autoload === void 0 ? {} : { autoload },
-				...parsedWebPanels ? { webPanels: parsedWebPanels } : {},
-				...parsedTerminalPresets ? { terminalPresets: parsedTerminalPresets } : {}
-			});
-		}
-		const parsedNpmCommand = Array.isArray(npmCommand) ? npmCommand.filter((argument) => typeof argument === "string") : void 0;
-		return { settings: {
-			raw,
-			packages,
-			...parsedNpmCommand ? { npmCommand: parsedNpmCommand } : {}
-		} };
+			const configured = { source: parsedSource.data };
+			if (parsedAutoload.success) configured.autoload = parsedAutoload.data;
+			if (parsedWebPanels.success) configured.webPanels = parsedWebPanels.data;
+			if (parsedTerminalPresets.success) configured.terminalPresets = parsedTerminalPresets.data;
+			packages.push(configured);
+		}
+		const settings = {
+			raw: parsedRaw.data,
+			packages
+		};
+		if (parsedNpmCommand.success) settings.npmCommand = parsedNpmCommand.data;
+		return { settings };
 	}
 	async parseSource(source, settingsPath) {
 		const trimmed = source.trim();
@@ -2233,16 +2287,17 @@ var PackageSystem = class {
 			const version = split > 0 ? spec.slice(split + 1) : void 0;
 			if (!name || name.includes("..") || name.includes("\\") || !/^(?:@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*$/iu.test(name) || version !== void 0 && !version) throw new DomainError("INVALID_PACKAGE_SOURCE", `Invalid npm package source: ${source}`, 400);
 			const identity = `npm:${name}`;
-			return {
+			const parsed = {
 				type: "npm",
 				source: trimmed,
 				spec,
 				name,
-				...version === void 0 ? {} : { version },
 				exact: isExactNpmVersion(version),
 				identity,
 				packageId: identity
 			};
+			if (version !== void 0) parsed.version = version;
+			return parsed;
 		}
 		if (!path.isAbsolute(trimmed) && trimmed !== "." && trimmed !== ".." && !trimmed.startsWith("./") && !trimmed.startsWith("../") && trimmed !== "~" && !trimmed.startsWith("~/")) throw new DomainError("INVALID_PACKAGE_SOURCE", "Package sources must use npm: syntax or an explicit local path", 400);
 		const expanded = trimmed === "~" || trimmed.startsWith("~/") ? path.join(os.homedir(), trimmed.slice(2)) : trimmed;
@@ -2346,40 +2401,47 @@ var PackageSystem = class {
 		const installedPath = this.npmPackagePath(source, scope, projectId);
 		let shouldInstall = forceInstall;
 		if (!await fs.stat(installedPath).then((value) => value.isDirectory()).catch(() => false)) shouldInstall = true;
-		else if (source.exact) shouldInstall = await fs.readFile(path.join(installedPath, "package.json"), "utf8").then((content) => JSON.parse(content).version).catch(() => void 0) !== source.version;
+		else if (source.exact) shouldInstall = await fs.readFile(path.join(installedPath, "package.json"), "utf8").then((content) => {
+			const parsed = z.object({ version: z.string().optional() }).safeParse(JSON.parse(content));
+			return parsed.success ? parsed.data.version : void 0;
+		}).catch(() => void 0) !== source.version;
 		if (shouldInstall) await this.runNpm("install", source, scope, projectId, settings);
 		if (!await fs.stat(installedPath).then((value) => value.isDirectory()).catch(() => false)) throw new DomainError("PACKAGE_INSTALL_FAILED", `Package manager completed without installing ${source.name}`, 500);
 		return installedPath;
 	}
 	validateManifestPatterns(patterns, field, packageJsonPath) {
-		if (!Array.isArray(patterns) || patterns.some((pattern) => typeof pattern !== "string")) throw new Error(`${packageJsonPath} treeport.${field} must be a string array`);
-		for (const pattern of patterns) {
+		const parsed = manifestPatternsSchema.safeParse(patterns);
+		if (!parsed.success) throw new Error(`${packageJsonPath} treeport.${field} must be a string array`);
+		for (const pattern of parsed.data) {
 			const normalized = normalizePattern(pattern.startsWith("!") ? pattern.slice(1) : pattern);
 			if (!normalized || path.posix.isAbsolute(normalized) || normalized === ".." || normalized.startsWith("../") || normalized.includes("/../") || pattern.startsWith("+") || pattern.startsWith("-")) throw new Error(`${packageJsonPath} treeport.${field} contains an invalid package-relative pattern: ${pattern}`);
 		}
-		return [...patterns];
+		return [...parsed.data];
 	}
 	validateWebPanelManifest(entries, packageJsonPath) {
-		if (!Array.isArray(entries)) throw new Error(`${packageJsonPath} treeport.webPanels must be an array`);
-		return entries.map((entry) => {
-			if (typeof entry === "string") {
-				this.validateManifestPatterns([entry], "webPanels", packageJsonPath);
+		const parsedEntries = z.array(z.unknown()).safeParse(entries);
+		if (!parsedEntries.success) throw new Error(`${packageJsonPath} treeport.webPanels must be an array`);
+		return parsedEntries.data.map((entry) => {
+			const parsed = webPanelManifestEntrySchema.safeParse(entry);
+			if (!parsed.success) throw new Error(`${packageJsonPath} contains an invalid web panel definition`);
+			const parsedSource = z.string().safeParse(parsed.data);
+			if (parsedSource.success) {
+				this.validateManifestPatterns([parsedSource.data], "webPanels", packageJsonPath);
 				return {
-					source: entry,
+					source: parsedSource.data,
 					allowSameOrigin: false
 				};
 			}
-			if (!entry || typeof entry !== "object" || Array.isArray(entry)) throw new Error(`${packageJsonPath} treeport.webPanels entries must be package-relative patterns or panel definitions`);
-			const keys = Object.keys(entry);
-			const source = Reflect.get(entry, "source");
-			const permissions = Reflect.get(entry, "permissions") ?? [];
-			if (keys.some((key) => !["source", "permissions"].includes(key)) || typeof source !== "string" || source.startsWith("!") || !Array.isArray(permissions) || permissions.some((permission) => typeof permission !== "string")) throw new Error(`${packageJsonPath} contains an invalid web panel definition`);
+			const { source, permissions = [] } = z.strictObject({
+				source: z.string(),
+				permissions: z.array(z.enum(["same-origin"])).optional()
+			}).parse(parsed.data);
+			if (source.startsWith("!")) throw new Error(`${packageJsonPath} contains an invalid web panel definition`);
 			this.validateManifestPatterns([source], "webPanels", packageJsonPath);
-			const uniquePermissions = new Set(permissions);
-			if (uniquePermissions.size !== permissions.length || permissions.some((permission) => permission !== "same-origin")) throw new Error(`${packageJsonPath} contains an invalid web panel permission`);
+			if (new Set(permissions).size !== permissions.length) throw new Error(`${packageJsonPath} contains an invalid web panel permission`);
 			return {
 				source,
-				allowSameOrigin: uniquePermissions.has("same-origin")
+				allowSameOrigin: permissions.includes("same-origin")
 			};
 		});
 	}
@@ -2469,7 +2531,7 @@ var PackageSystem = class {
 		const source = sourceString(configured);
 		const packageJsonPath = path.join(root, "package.json");
 		const packageJsonContent = await fs.readFile(packageJsonPath, "utf8").catch((error) => {
-			if (error.code === "ENOENT") return null;
+			if (error instanceof Error && "code" in error && error.code === "ENOENT") return null;
 			throw error;
 		});
 		let manifest;
@@ -2480,15 +2542,17 @@ var PackageSystem = class {
 			} catch (error) {
 				throw new Error(`Could not parse ${packageJsonPath}: ${error instanceof Error ? error.message : String(error)}`);
 			}
-			if (!packageJson || typeof packageJson !== "object" || Array.isArray(packageJson)) throw new Error(`${packageJsonPath} must contain a JSON object`);
-			const treeport = Reflect.get(packageJson, "treeport");
-			if (treeport !== void 0) {
-				if (!treeport || typeof treeport !== "object" || Array.isArray(treeport)) throw new Error(`${packageJsonPath} treeport manifest must be an object`);
-				const webPanels = Reflect.get(treeport, "webPanels");
-				const terminalPresets = Reflect.get(treeport, "terminalPresets");
+			const parsedPackageJson = z.looseObject({ treeport: z.unknown().optional() }).safeParse(packageJson);
+			if (!parsedPackageJson.success) throw new Error(`${packageJsonPath} must contain a JSON object`);
+			if (parsedPackageJson.data.treeport !== void 0) {
+				const parsedTreeport = z.looseObject({
+					webPanels: z.unknown().optional(),
+					terminalPresets: z.unknown().optional()
+				}).safeParse(parsedPackageJson.data.treeport);
+				if (!parsedTreeport.success) throw new Error(`${packageJsonPath} treeport manifest must be an object`);
 				manifest = {
-					webPanels: this.validateWebPanelManifest(webPanels ?? [], packageJsonPath),
-					terminalPresets: this.validateManifestPatterns(terminalPresets ?? [], "terminalPresets", packageJsonPath)
+					webPanels: this.validateWebPanelManifest(parsedTreeport.data.webPanels ?? [], packageJsonPath),
+					terminalPresets: this.validateManifestPatterns(parsedTreeport.data.terminalPresets ?? [], "terminalPresets", packageJsonPath)
 				};
 			}
 		}
@@ -2516,7 +2580,7 @@ var PackageSystem = class {
 		const webPanels = applyNormalFilter(panelCandidates.map((candidate) => {
 			const resourceId = encodeURIComponent(path.posix.basename(candidate.relativePath));
 			const allowSameOrigin = manifest?.webPanels.some((entry) => entry.allowSameOrigin && this.manifestAllows(candidate.relativePath, [entry.source], "web-panel")) ?? false;
-			return {
+			const resolved = {
 				definition: {
 					id: `package:${parsed.packageId}:web-panel:${resourceId}`,
 					title: titleFromPath(candidate.relativePath),
@@ -2527,10 +2591,11 @@ var PackageSystem = class {
 				entry: "index.html",
 				packageRoot: root,
 				development: parsed.type === "local",
-				...packageLockPath ? { packageLockPath } : {},
 				relativePath: candidate.relativePath,
 				enabled: true
 			};
+			if (packageLockPath) resolved.packageLockPath = packageLockPath;
+			return resolved;
 		}), filter?.webPanels, autoload);
 		const terminalPresets = [];
 		for (const candidate of presetCandidates) {
@@ -2931,10 +2996,11 @@ var PackageSystem = class {
 			const next = [];
 			for (const configured of settings.packages) if ((await this.parseSource(sourceString(configured), settingsPath)).identity !== parsed.identity) next.push(configured);
 			else if (!replaced) {
-				next.push(typeof configured === "string" ? persisted : {
-					...configured,
+				const filter = packageFilter(configured);
+				next.push(filter ? {
+					...filter,
 					source: persisted
-				});
+				} : persisted);
 				replaced = true;
 			}
 			if (!replaced) next.push(persisted);
@@ -3090,7 +3156,7 @@ const CONFIG_PATH = path.join(".treeport", "terminal-presets.json");
 async function loadRepositoryTerminalPresets(projectId, worktreePath) {
 	const configPath = path.join(worktreePath, CONFIG_PATH);
 	const content = await fs.readFile(configPath, "utf8").catch((error) => {
-		if ((typeof error === "object" && error !== null && "code" in error ? error.code : void 0) === "ENOENT") return null;
+		if (error instanceof Error && "code" in error && error.code === "ENOENT") return null;
 		return error instanceof Error ? error : new Error(String(error));
 	});
 	if (content === null) return {
@@ -3163,7 +3229,7 @@ async function loadRepositoryTerminalPresets(projectId, worktreePath) {
 const DEFAULT_SETUP_TIMEOUT_MS = 30 * 6e4;
 const MAX_SETUP_OUTPUT = 4e3;
 const TREEPORT_SETUP_PATH = path.join(".treeport", "setup.json");
-const TREEPORT_PATH_VARIABLES = ["TREEPORT_WORKTREE_PATH", "TREEPORT_MAIN_WORKTREE_PATH"];
+const TREEPORT_PATH_VARIABLE_NAMES = /* @__PURE__ */ new Set(["TREEPORT_WORKTREE_PATH", "TREEPORT_MAIN_WORKTREE_PATH"]);
 const environmentSchema = z.record(z.string(), z.string()).superRefine((environment, context) => {
 	for (const [name, value] of Object.entries(environment)) {
 		if (!name || name.includes("=") || name.includes("\0")) context.addIssue({
@@ -3171,7 +3237,7 @@ const environmentSchema = z.record(z.string(), z.string()).superRefine((environm
 			path: [name],
 			message: "Environment names must be non-empty and cannot contain = or NUL"
 		});
-		if (TREEPORT_PATH_VARIABLES.includes(name)) context.addIssue({
+		if (TREEPORT_PATH_VARIABLE_NAMES.has(name)) context.addIssue({
 			code: "custom",
 			path: [name],
 			message: `${name} is reserved by Treeport`
@@ -3207,7 +3273,8 @@ const setupFileSchema = z.object({
 function formatIssuePath(issuePath) {
 	if (!issuePath.length) return "configuration";
 	return issuePath.reduce((formatted, component) => {
-		if (typeof component === "number") return `${formatted}[${component}]`;
+		const parsedIndex = z.number().safeParse(component);
+		if (parsedIndex.success) return `${formatted}[${parsedIndex.data}]`;
 		return formatted ? `${formatted}.${String(component)}` : String(component);
 	}, "");
 }
@@ -3239,7 +3306,7 @@ async function resolveWorktreeSetupTasks(input) {
 	return parsed.data.commands.map((command, index) => {
 		const expandedCwd = expandTreeportPaths(command.cwd ?? worktreePath, environment);
 		const cwd = path.isAbsolute(expandedCwd) ? path.resolve(expandedCwd) : path.resolve(worktreePath, expandedCwd);
-		if (!isPathWithin$1(cwd, worktreePath)) throw new Error(`Invalid Treeport setup in ${filePath}: commands[${index}].cwd must stay inside the new worktree`);
+		if (!isPathWithin$1(cwd, worktreePath)) throw new Error(`Invalid Treeport setup in ${filePath}: commands[${index}].cwd must stay inside the new tree`);
 		const configuredEnvironment = Object.fromEntries(Object.entries(command.env ?? {}).map(([name, value]) => [name, expandTreeportPaths(value, environment)]));
 		return {
 			label: command.name,
@@ -3368,6 +3435,30 @@ var WebPanelViteRuntime = class {
 		this.httpServer = server;
 	}
 	viteConfig(source, base, options = {}) {
+		const server = {
+			middlewareMode: true,
+			headers: {
+				"access-control-allow-origin": "*",
+				"cache-control": "no-store",
+				"x-content-type-options": "nosniff"
+			},
+			fs: {
+				strict: true,
+				allow: [source.packageRoot, PANEL_SDK_ROOT]
+			}
+		};
+		if (options.server) server.hmr = {
+			server: options.server,
+			path: `${base}@vite-hmr`
+		};
+		const viteBuild = {
+			sourcemap: true,
+			rollupOptions: { input: path.join(source.root, source.entry) }
+		};
+		if (options.outDir) {
+			viteBuild.outDir = options.outDir;
+			viteBuild.emptyOutDir = true;
+		}
 		return {
 			root: source.root,
 			base,
@@ -3383,30 +3474,8 @@ var WebPanelViteRuntime = class {
 				alias: { "@treeport/panel-sdk": PANEL_SDK_ENTRY },
 				dedupe: ["react", "react-dom"]
 			},
-			server: {
-				middlewareMode: true,
-				headers: {
-					"access-control-allow-origin": "*",
-					"cache-control": "no-store",
-					"x-content-type-options": "nosniff"
-				},
-				fs: {
-					strict: true,
-					allow: [source.packageRoot, PANEL_SDK_ROOT]
-				},
-				...options.server ? { hmr: {
-					server: options.server,
-					path: `${base}@vite-hmr`
-				} } : {}
-			},
-			build: {
-				sourcemap: true,
-				rollupOptions: { input: path.join(source.root, source.entry) },
-				...options.outDir ? {
-					outDir: options.outDir,
-					emptyOutDir: true
-				} : {}
-			}
+			server,
+			build: viteBuild
 		};
 	}
 	async hashSource(source) {
@@ -3456,7 +3525,9 @@ var WebPanelViteRuntime = class {
 		const parent = path.join(this.config.cacheDir, "web-panels", COMPILER_ABI);
 		const directory = path.join(parent, hash);
 		const metadata = path.join(directory, BUILD_METADATA);
-		if (await fs.readFile(metadata, "utf8").then((value) => JSON.parse(value)).then((value) => value.hash === hash).catch(() => false)) return {
+		if (await fs.readFile(metadata, "utf8").then((value) => {
+			return JSON.parse(value);
+		}).then((value) => value.hash === hash).catch(() => false)) return {
 			hash,
 			directory
 		};
@@ -3502,8 +3573,8 @@ var WebPanelViteRuntime = class {
 			directory: await pending
 		};
 	}
-	errorPage(source, error) {
-		const raw = error instanceof Error ? error.message : String(error);
+	errorPage(source, cause) {
+		const raw = cause instanceof Error ? cause.message : String(cause);
 		const diagnostic = raw.replaceAll(source.packageRoot, "<package>").replaceAll(source.root, "<panel>");
 		const stage = /resolve|not found|cannot find|failed to load|import/iu.test(raw) ? "Dependency resolution" : "Source transformation";
 		return `<!doctype html><html lang="en"><head><meta charset="utf-8"><title>Panel build failed</title><style>body{font-family:system-ui,sans-serif;margin:2rem;line-height:1.5}pre{white-space:pre-wrap;background:#f4f4f5;padding:1rem;border-radius:.5rem}</style></head><body><h1>Web panel could not be compiled</h1><p><strong>${escapeHtml(source.definitionId)}</strong>${source.packageSource ? ` from ${escapeHtml(source.packageSource)}` : ""}</p><p>Stage: ${stage}</p><pre>${escapeHtml(diagnostic)}</pre><p>For a local panel package, install its <code>node_modules</code>. Put browser runtime imports in <code>dependencies</code>, not <code>devDependencies</code>.</p></body></html>`;
@@ -3642,11 +3713,13 @@ var KeyedTaskQueue = class {
 		}
 		const result = new Promise((resolve, reject) => {
 			state.pending += 1;
-			Effect.runSync(Queue.offer(state.queue, {
-				run: task,
-				resolve: (value) => resolve(value),
-				reject
-			}));
+			Effect.runSync(Queue.offer(state.queue, { run: async () => {
+				try {
+					resolve(await task());
+				} catch (error) {
+					reject(error);
+				}
+			} }));
 		});
 		if (!state.running) {
 			state.running = true;
@@ -3662,14 +3735,8 @@ var KeyedTaskQueue = class {
 	}
 	async run(key, state) {
 		while (state.pending > 0) {
-			const task = await Effect.runPromise(Queue.take(state.queue));
-			try {
-				task.resolve(await task.run());
-			} catch (error) {
-				task.reject(error);
-			} finally {
-				state.pending -= 1;
-			}
+			await (await Effect.runPromise(Queue.take(state.queue))).run();
+			state.pending -= 1;
 		}
 		state.running = false;
 		if (state.pending > 0) {
@@ -3689,9 +3756,9 @@ const encodeMetadata = (value) => Buffer.from(JSON.stringify(value), "utf8").toS
 function isAbsentTmuxServer(stderr) {
 	return /no server running|no sessions|no current target/i.test(stderr) || /(?:failed to connect|error connecting to).*(?:no such file or directory|connection refused)/i.test(stderr);
 }
-function decodeMetadata(value) {
+function decodeMetadata(value, schema) {
 	if (!value) return;
-	return JSON.parse(Buffer.from(value, "base64url").toString("utf8"));
+	return schema.parse(JSON.parse(Buffer.from(value, "base64url").toString("utf8")));
 }
 const TMUX_SCROLL_EXIT_SEQUENCE = TERMINAL_SCROLL_EXIT_SEQUENCE;
 const TMUX_SELECTION_CLEAR_SEQUENCE = TERMINAL_SELECTION_CLEAR_SEQUENCE;
@@ -3740,8 +3807,10 @@ bind-key -T copy-mode-vi User4 select-pane -t .
 bind-key -T copy-mode MouseDragEnd1Pane send-keys -X stop-selection
 bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X stop-selection
 # Keep these explicit so source-file replaces stale bindings in existing servers.
-bind-key -T copy-mode WheelDownPane { select-pane ; send-keys -X -N 5 scroll-down ; if-shell -F '#{&&:#{==:#{scroll_position},0},#{==:#{selection_present},0}}' { send-keys -X cancel } }
-bind-key -T copy-mode-vi WheelDownPane { select-pane ; send-keys -X -N 5 scroll-down ; if-shell -F '#{&&:#{==:#{scroll_position},0},#{==:#{selection_present},0}}' { send-keys -X cancel } }
+bind-key -T copy-mode WheelUpPane { select-pane ; send-keys -X -N 1 scroll-up }
+bind-key -T copy-mode-vi WheelUpPane { select-pane ; send-keys -X -N 1 scroll-up }
+bind-key -T copy-mode WheelDownPane { select-pane ; send-keys -X -N 1 scroll-down ; if-shell -F '#{&&:#{==:#{scroll_position},0},#{==:#{selection_present},0}}' { send-keys -X cancel } }
+bind-key -T copy-mode-vi WheelDownPane { select-pane ; send-keys -X -N 1 scroll-down ; if-shell -F '#{&&:#{==:#{scroll_position},0},#{==:#{selection_present},0}}' { send-keys -X cancel } }
 bind-key -T root WheelUpPane if-shell -F '#{||:#{alternate_on},#{pane_in_mode},#{mouse_any_flag}}' { send-keys -M } { copy-mode -H }
 `;
 var TmuxAdapter = class {
@@ -3846,25 +3915,24 @@ var TmuxAdapter = class {
 					});
 					await this.configureServer(input.socketName);
 				}
+				const environment = { ...input.env };
+				if (sshAuthSock) environment.SSH_AUTH_SOCK = sshAuthSock;
 				const spec = {
 					argv: [...input.argv],
-					...input.fallbackArgv ? { fallbackArgv: [...input.fallbackArgv] } : {},
 					cwd: input.cwd,
-					env: {
-						...sshAuthSock ? { SSH_AUTH_SOCK: sshAuthSock } : {},
-						...input.env
-					},
-					...shellIntegrationReady ? {
-						shellIntegrationDir: this.shellIntegrationDir,
-						tmuxExecutable: resolveExecutablePath(this.executable, this.hostEnvironment)
-					} : {},
-					...input.setupTasks?.length ? { setupTasks: input.setupTasks.map((task) => ({
-						...task,
-						argv: [...task.argv],
-						env: { ...task.env }
-					})) } : {},
-					...input.setupError ? { setupError: input.setupError } : {}
+					env: environment
 				};
+				if (input.fallbackArgv) spec.fallbackArgv = [...input.fallbackArgv];
+				if (shellIntegrationReady) {
+					spec.shellIntegrationDir = this.shellIntegrationDir;
+					spec.tmuxExecutable = resolveExecutablePath(this.executable, this.hostEnvironment);
+				}
+				if (input.setupTasks?.length) spec.setupTasks = input.setupTasks.map((task) => ({
+					...task,
+					argv: [...task.argv],
+					env: { ...task.env }
+				}));
+				if (input.setupError) spec.setupError = input.setupError;
 				await fs.writeFile(specPath, JSON.stringify(spec), { mode: 384 });
 				wroteSpec = true;
 				await runChecked(this.runner, {
@@ -4008,18 +4076,13 @@ var TmuxAdapter = class {
 			if (!sessionName || sessions.has(sessionName) || !terminalId || !worktreeId) continue;
 			let metadata;
 			try {
-				const name = decodeMetadata(encodedName ?? "");
-				const argv = decodeMetadata(encodedArgv ?? "");
-				const createdAt = decodeMetadata(encodedCreatedAt ?? "");
-				const updatedAt = decodeMetadata(encodedUpdatedAt ?? "");
-				if (name !== void 0 && typeof name !== "string" || argv !== void 0 && (!Array.isArray(argv) || !argv.every((value) => typeof value === "string")) || createdAt !== void 0 && typeof createdAt !== "string" || updatedAt !== void 0 && typeof updatedAt !== "string") continue;
 				metadata = {
 					terminalId,
 					worktreeId,
-					name,
-					argv,
-					createdAt,
-					updatedAt
+					name: decodeMetadata(encodedName ?? "", z.string()),
+					argv: decodeMetadata(encodedArgv ?? "", z.array(z.string())),
+					createdAt: decodeMetadata(encodedCreatedAt ?? "", z.string()),
+					updatedAt: decodeMetadata(encodedUpdatedAt ?? "", z.string())
 				};
 			} catch {
 				continue;
@@ -4198,8 +4261,7 @@ var TmuxAdapter = class {
 		const encodedShellTitle = result.stdout.slice(0, firstSeparator).trim();
 		let shellTitle = null;
 		try {
-			const decoded = decodeMetadata(encodedShellTitle);
-			shellTitle = typeof decoded === "string" ? decoded : null;
+			shellTitle = decodeMetadata(encodedShellTitle, z.string()) ?? null;
 		} catch {}
 		const currentCommand = result.stdout.slice(firstSeparator + 1, secondSeparator).trim() || null;
 		const commandLine = result.stdout.slice(secondSeparator + 1, thirdSeparator).trim() || null;
@@ -4268,7 +4330,7 @@ var TmuxAdapter = class {
 			env: this.environment(),
 			timeoutMs: 15e3
 		});
-		if (result.exitCode !== 0 && !isAbsentTmuxServer(result.stderr)) throw new Error(result.stderr.trim() || "Failed to kill worktree tmux server");
+		if (result.exitCode !== 0 && !isAbsentTmuxServer(result.stderr)) throw new Error(result.stderr.trim() || "Failed to kill tree tmux server");
 		await Promise.all(terminalIds.map((terminalId) => fs.unlink(path.join(this.specsDir, `${terminalId}.json`)).catch(() => void 0)));
 		this.configuredSockets.delete(socketName);
 		return terminalIds;
@@ -4282,8 +4344,8 @@ const WEB_PANEL_STORAGE_MAX_ENTRIES = 256;
 const WEB_PANEL_STORAGE_MAX_TOTAL_BYTES = 1024 * 1024;
 const WEB_PANEL_STORAGE_MAX_VALUE_BYTES = 64 * 1024;
 function mapWebPanel(row, allowSameOrigin = false) {
-	const input = JSON.parse(row.inputJson);
-	if (input !== null && (typeof input !== "object" || Array.isArray(input))) throw new Error(`Web panel ${row.id} has invalid stored launch input`);
+	const parsedInput = webPanelInputSchema.nullable().safeParse(JSON.parse(row.inputJson));
+	if (!parsedInput.success) throw new Error(`Web panel ${row.id} has invalid stored launch input`);
 	return {
 		id: row.id,
 		kind: "web",
@@ -4291,7 +4353,7 @@ function mapWebPanel(row, allowSameOrigin = false) {
 		definitionId: row.definitionId,
 		title: row.title,
 		launch: {
-			input,
+			input: parsedInput.data,
 			cwd: row.launchCwd
 		},
 		sandbox: { allowSameOrigin },
@@ -4404,7 +4466,7 @@ var TreeportService = class {
 				await tx.run(sql`
           UPDATE operations
           SET status = 'failed',
-              error = ${operation.kind === "create" ? "Daemon restarted before worktree creation completed; existing Git state will be discovered without replaying the creation" : "Daemon restarted before the operation completed; external state was preserved for retry"},
+              error = ${operation.kind === "create" ? "Daemon restarted before tree creation completed; existing Git state will be discovered without replaying the creation" : "Daemon restarted before the operation completed; external state was preserved for retry"},
               updated_at = ${timestamp}
           WHERE id = ${operation.id}
         `);
@@ -4643,14 +4705,14 @@ var TreeportService = class {
 		const binding = await this.getWorktree(worktreeId);
 		await this.requireOpenProject(binding.projectId);
 		const worktree = (await this.listProjects()).flatMap((project) => project.worktrees).find((candidate) => candidate.id === worktreeId);
-		if (!worktree) throw new DomainError("WORKTREE_NOT_FOUND", "Worktree not found", 404);
+		if (!worktree) throw new DomainError("WORKTREE_NOT_FOUND", "Tree not found", 404);
 		return worktree;
 	}
 	async requireAvailableWorktree(worktreeId, allowPrunable = false) {
 		const binding = await this.storedWorktree(worktreeId);
-		if (!binding) throw new DomainError("WORKTREE_NOT_FOUND", "Worktree not found", 404);
+		if (!binding) throw new DomainError("WORKTREE_NOT_FOUND", "Tree not found", 404);
 		const worktree = (await this.observeAvailableProject(await this.requireOpenProject(binding.projectId))).worktrees.find((candidate) => candidate.id === worktreeId);
-		if (!worktree) throw new DomainError("WORKTREE_NOT_FOUND", "Worktree not found", 404);
+		if (!worktree) throw new DomainError("WORKTREE_NOT_FOUND", "Tree not found", 404);
 		if (worktree.prunable && !allowPrunable) throw new DomainError("WORKTREE_UNAVAILABLE", "Git reports this worktree as prunable", 409);
 		return worktree;
 	}
@@ -4851,17 +4913,20 @@ var TreeportService = class {
 	async effectiveWebPanelDefinitions(worktreeId) {
 		const worktree = await this.getWorktree(worktreeId);
 		this.packages.syncProjects([await this.getProject(worktree.projectId)]);
-		return [...await this.localWebPanelDefinitions(worktreeId), ...(await this.packages.webPanelDefinitions(worktree.projectId)).map(({ definition, root, entry, packageRoot, development, packageLockPath }) => ({
-			...definition,
-			root,
-			entry,
-			packageRoot,
-			development,
-			...packageLockPath ? { packageLockPath } : {},
-			definitionId: definition.id,
-			allowNetworkRequests: definition.sandbox.allowSameOrigin,
-			...definition.source.type === "package" ? { packageSource: definition.source.source } : {}
-		}))];
+		return [...await this.localWebPanelDefinitions(worktreeId), ...(await this.packages.webPanelDefinitions(worktree.projectId)).map(({ definition, root, entry, packageRoot, development, packageLockPath }) => {
+			const resolved = {
+				...definition,
+				root,
+				entry,
+				packageRoot,
+				development,
+				definitionId: definition.id,
+				allowNetworkRequests: definition.sandbox.allowSameOrigin
+			};
+			if (packageLockPath) resolved.packageLockPath = packageLockPath;
+			if (definition.source.type === "package") resolved.packageSource = definition.source.source;
+			return resolved;
+		})];
 	}
 	async listWebPanelDefinitions(worktreeId) {
 		return (await this.effectiveWebPanelDefinitions(worktreeId)).map(({ root: _root, entry: _entry, packageRoot: _packageRoot, development: _development, packageLockPath: _packageLockPath, definitionId: _definitionId, packageSource: _packageSource, allowNetworkRequests: _allowNetworkRequests, ...definition }) => definition);
@@ -4879,7 +4944,7 @@ var TreeportService = class {
 		const [worktreeRoot, requestedCwd] = await Promise.all([fs.realpath(worktree.path), fs.realpath(path.resolve(worktree.path, launch.cwd)).catch(() => null)]);
 		if (!requestedCwd || !(await fs.stat(requestedCwd)).isDirectory()) throw new DomainError("INVALID_WEB_PANEL_LAUNCH_CWD", "Web panel launch directory does not exist", 400);
 		const relativeCwd = path.relative(worktreeRoot, requestedCwd);
-		if (relativeCwd === ".." || relativeCwd.startsWith(`..${path.sep}`) || path.isAbsolute(relativeCwd)) throw new DomainError("INVALID_WEB_PANEL_LAUNCH_CWD", "Web panel launch directory must be inside the worktree", 400);
+		if (relativeCwd === ".." || relativeCwd.startsWith(`..${path.sep}`) || path.isAbsolute(relativeCwd)) throw new DomainError("INVALID_WEB_PANEL_LAUNCH_CWD", "Web panel launch directory must be inside the tree", 400);
 		return {
 			launch: {
 				input: launch.input,
@@ -5077,7 +5142,7 @@ var TreeportService = class {
 	}
 	async getWorktree(worktreeId) {
 		const worktree = await this.storedWorktree(worktreeId);
-		if (!worktree) throw new DomainError("WORKTREE_NOT_FOUND", "Worktree not found", 404);
+		if (!worktree) throw new DomainError("WORKTREE_NOT_FOUND", "Tree not found", 404);
 		return worktree;
 	}
 	async getTerminal(terminalId) {
@@ -5126,7 +5191,7 @@ var TreeportService = class {
 		}
 		const canonical = await fs.realpath(path.resolve(identifier)).catch(() => path.resolve(identifier));
 		const match = (await this.storedProjects()).flatMap((project) => project.worktrees).filter((worktree) => isPathWithin(canonical, worktree.path)).sort((a, b) => b.path.length - a.path.length)[0];
-		if (!match) throw new DomainError("WORKTREE_NOT_FOUND", `No registered worktree contains ${identifier}`, 404);
+		if (!match) throw new DomainError("WORKTREE_NOT_FOUND", `No registered tree contains ${identifier}`, 404);
 		await this.requireOpenProject(match.projectId);
 		return match;
 	}
@@ -5373,7 +5438,7 @@ var TreeportService = class {
 			const project = await this.getProject(projectId);
 			if (await this.projectOpenState(projectId) !== true) return;
 			if (this.projectLocks.has(projectId) || this.worktreeMutations.has(projectId)) throw new DomainError("PROJECT_BUSY", "Project is already being modified", 409);
-			if (project.worktrees.some((worktree) => this.worktreeLocks.has(worktree.id))) throw new DomainError("PROJECT_BUSY", "A project worktree is already being modified", 409);
+			if (project.worktrees.some((worktree) => this.worktreeLocks.has(worktree.id))) throw new DomainError("PROJECT_BUSY", "A project tree is already being modified", 409);
 			this.projectLocks.add(projectId);
 			const lockedWorktreeIds = project.worktrees.map((worktree) => worktree.id);
 			for (const worktreeId of lockedWorktreeIds) this.worktreeLocks.add(worktreeId);
@@ -5608,18 +5673,19 @@ var TreeportService = class {
 		if (this.projectLocks.has(projectId) && !this.worktreeMutations.has(projectId)) throw new DomainError("PROJECT_BUSY", "Project is already being modified", 409);
 		const operationId = id("op");
 		const timestamp = now();
+		const request = {
+			name,
+			base
+		};
+		if (initialTerminal) request.initialTerminal = initialTerminal;
+		if (sourceWorktreeId) request.sourceWorktreeId = sourceWorktreeId;
 		await this.deps.database.db.run(sql`
       INSERT INTO operations(
         id,kind,project_id,worktree_id,status,request_json,result_json,error,
         created_at,updated_at
       ) VALUES(
         ${operationId},'create',${projectId},NULL,'pending',
-        ${serializeOperation({
-			name,
-			base,
-			...initialTerminal ? { initialTerminal } : {},
-			...sourceWorktreeId ? { sourceWorktreeId } : {}
-		})},NULL,NULL,${timestamp},${timestamp}
+        ${serializeOperation(request)},NULL,NULL,${timestamp},${timestamp}
       )
     `);
 		const operation = await this.getOperation(operationId);
@@ -5689,7 +5755,7 @@ var TreeportService = class {
 			} catch (error) {
 				throw new DomainError("INVALID_WORKTREE_NAME", error instanceof Error ? error.message : String(error), 400);
 			}
-			if (project.worktrees.some((worktree) => worktree.name.localeCompare(name, void 0, { sensitivity: "accent" }) === 0)) throw new DomainError("WORKTREE_EXISTS", `A worktree named ${name} already exists`, 409);
+			if (project.worktrees.some((worktree) => worktree.name.localeCompare(name, void 0, { sensitivity: "accent" }) === 0)) throw new DomainError("WORKTREE_EXISTS", `A tree named ${name} already exists`, 409);
 			const destination = await resolveZedWorktreePath(project.mainWorktreePath, name).catch((error) => {
 				throw new DomainError("INVALID_WORKTREE_PATH", error instanceof Error ? error.message : String(error), 400);
 			});
@@ -5698,9 +5764,9 @@ var TreeportService = class {
 			if (await fs.access(worktreePath).then(() => true, () => false)) throw new DomainError("WORKTREE_PATH_EXISTS", `Destination already exists: ${worktreePath}`, 409);
 			let commit;
 			if (base === "current") {
-				if (!sourceWorktreeId) throw new DomainError("INVALID_SOURCE_WORKTREE", "A source worktree is required when starting from current", 400);
+				if (!sourceWorktreeId) throw new DomainError("INVALID_SOURCE_WORKTREE", "A source tree is required when starting from current", 400);
 				const source = await this.getWorktree(sourceWorktreeId);
-				if (source.projectId !== projectId || source.prunable) throw new DomainError("INVALID_SOURCE_WORKTREE", "The source worktree must be active and belong to the project", 400);
+				if (source.projectId !== projectId || source.prunable) throw new DomainError("INVALID_SOURCE_WORKTREE", "The source tree must be active and belong to the project", 400);
 				commit = await this.deps.git.resolveCommit(source.path);
 			} else commit = await this.deps.git.resolveDefaultCommit(project.repositoryPath);
 			let preparedWrapper;
@@ -5740,10 +5806,10 @@ var TreeportService = class {
 			let terminalError = null;
 			let setupError = null;
 			if (initialTerminal) {
-				const initialTerminalCreation = this.executeCreateTerminal(worktree.id, initialTerminal.name, initialTerminal.argv, {
-					...initialTerminal.returnToShell ? { returnToShell: true } : {},
-					...initialTerminal.initialSize ? { initialSize: initialTerminal.initialSize } : {}
-				});
+				const launchOptions = {};
+				if (initialTerminal.returnToShell) launchOptions.returnToShell = true;
+				if (initialTerminal.initialSize) launchOptions.initialSize = initialTerminal.initialSize;
+				const initialTerminalCreation = this.executeCreateTerminal(worktree.id, initialTerminal.name, initialTerminal.argv, launchOptions);
 				const setupResolution = resolveWorktreeSetupTasks({
 					shell: this.deps.config.shell,
 					mainWorktreePath: project.mainWorktreePath,
@@ -5753,7 +5819,7 @@ var TreeportService = class {
 					error: null
 				}), (error) => ({
 					tasks: [],
-					error: `worktree setup: ${error instanceof Error ? error.message : String(error)}`.slice(0, 4096)
+					error: `Tree setup: ${error instanceof Error ? error.message : String(error)}`.slice(0, 4096)
 				}));
 				try {
 					terminal = await initialTerminalCreation;
@@ -5767,18 +5833,19 @@ var TreeportService = class {
 				}
 				const setup = await setupResolution;
 				setupError = setup.error;
-				if (setup.tasks.length > 0 || setupError) if (!terminal) setupError ??= "worktree setup: no persistent terminal could be started";
+				if (setup.tasks.length > 0 || setupError) if (!terminal) setupError ??= "Tree setup: no persistent terminal could be started";
 				else try {
-					await this.executeCreateTerminal(worktree.id, "Setup", ["true"], {
+					const setupOptions = {
 						setup: {
 							tasks: setup.tasks,
 							error: setupError
 						},
-						closeOnSuccess: true,
-						...initialTerminal.initialSize ? { initialSize: initialTerminal.initialSize } : {}
-					});
+						closeOnSuccess: true
+					};
+					if (initialTerminal.initialSize) setupOptions.initialSize = initialTerminal.initialSize;
+					await this.executeCreateTerminal(worktree.id, "Setup", ["true"], setupOptions);
 				} catch (error) {
-					const setupTerminalError = `worktree setup terminal${error instanceof DomainError ? ` [${error.code}]` : ""}: ${error instanceof Error ? error.message : String(error)}`.slice(0, 2048);
+					const setupTerminalError = `Tree setup terminal${error instanceof DomainError ? ` [${error.code}]` : ""}: ${error instanceof Error ? error.message : String(error)}`.slice(0, 2048);
 					setupError = setupError ? `${setupError.slice(0, 2047)}\n${setupTerminalError}` : setupTerminalError;
 				}
 			} else {
@@ -5790,7 +5857,7 @@ var TreeportService = class {
 					runner: this.deps.runner,
 					tasks
 				})).catch((error) => [{
-					label: "worktree setup",
+					label: "Tree setup",
 					error: error instanceof Error ? error.message : String(error)
 				}])).find((result) => result.error);
 				setupError = setupFailure ? `${setupFailure.label}: ${setupFailure.error}`.slice(0, 4096) : null;
@@ -5837,32 +5904,33 @@ var TreeportService = class {
 		const sessionName = generateTmuxSessionName();
 		const commandArgv = argv ? [...argv] : [this.deps.config.shell, "-l"];
 		const timestamp = now();
+		const session = {
+			socketName: worktree.tmuxSocketName,
+			sessionName,
+			terminalId,
+			worktreeId: worktree.id,
+			name,
+			createdAt: timestamp,
+			cwd: options?.cwd ?? worktree.path,
+			argv: commandArgv,
+			env: {
+				...options?.env ?? {},
+				TREEPORT_API_URL: this.deps.config.apiUrl,
+				TREEPORT_MANAGED_API_URL: this.deps.config.apiUrl,
+				TREEPORT_DAEMON_RECORD: path.join(this.deps.config.runtimeDir, "daemon.json"),
+				TREEPORT_DAEMON_LIFECYCLE: this.deps.config.daemonLifecycle,
+				TREEPORT_PROJECT_ID: project.id,
+				TREEPORT_WORKTREE_ID: worktree.id,
+				TREEPORT_TERMINAL_ID: terminalId
+			}
+		};
+		if (options?.returnToShell && argv) session.fallbackArgv = [this.deps.config.shell, "-l"];
+		if (options?.closeOnSuccess) session.closeOnSuccess = true;
+		if (options?.initialSize) session.initialSize = options.initialSize;
+		if (options?.setup?.tasks.length) session.setupTasks = options.setup.tasks;
+		if (options?.setup?.error) session.setupError = options.setup.error;
 		try {
-			await this.deps.tmux.createSession({
-				socketName: worktree.tmuxSocketName,
-				sessionName,
-				terminalId,
-				worktreeId: worktree.id,
-				name,
-				createdAt: timestamp,
-				cwd: options?.cwd ?? worktree.path,
-				argv: commandArgv,
-				...options?.returnToShell && argv ? { fallbackArgv: [this.deps.config.shell, "-l"] } : {},
-				...options?.closeOnSuccess ? { closeOnSuccess: true } : {},
-				...options?.initialSize ? { initialSize: options.initialSize } : {},
-				env: {
-					...options?.env ?? {},
-					TREEPORT_API_URL: this.deps.config.apiUrl,
-					TREEPORT_MANAGED_API_URL: this.deps.config.apiUrl,
-					TREEPORT_DAEMON_RECORD: path.join(this.deps.config.runtimeDir, "daemon.json"),
-					TREEPORT_DAEMON_LIFECYCLE: this.deps.config.daemonLifecycle,
-					TREEPORT_PROJECT_ID: project.id,
-					TREEPORT_WORKTREE_ID: worktree.id,
-					TREEPORT_TERMINAL_ID: terminalId
-				},
-				...options?.setup?.tasks.length ? { setupTasks: options.setup.tasks } : {},
-				...options?.setup?.error ? { setupError: options.setup.error } : {}
-			});
+			await this.deps.tmux.createSession(session);
 		} catch (error) {
 			throw new DomainError("TERMINAL_CREATE_FAILED", error instanceof Error ? error.message : String(error), 500);
 		}
@@ -5898,8 +5966,8 @@ var TreeportService = class {
 		await this.requireAvailableWorktree(worktreeId);
 		try {
 			const worktree = await this.storedWorktree(worktreeId);
-			if (!worktree) throw new DomainError("WORKTREE_NOT_FOUND", "Worktree not found", 404);
-			if (this.projectLocks.has(worktree.projectId) || this.worktreeLocks.has(worktreeId) || worktree.prunable) throw new DomainError("WORKTREE_BUSY", "Cannot create a terminal while the worktree is being modified", 409);
+			if (!worktree) throw new DomainError("WORKTREE_NOT_FOUND", "Tree not found", 404);
+			if (this.projectLocks.has(worktree.projectId) || this.worktreeLocks.has(worktreeId) || worktree.prunable) throw new DomainError("WORKTREE_BUSY", "Cannot create a terminal while the tree is being modified", 409);
 			this.worktreeLocks.add(worktreeId);
 			try {
 				return await this.createTerminalSession(worktree, name, argv, options);
@@ -5983,7 +6051,7 @@ var TreeportService = class {
 	}
 	async executeDeleteTerminal(terminalId, worktreeId) {
 		const worktree = await this.storedWorktree(worktreeId);
-		if (!worktree) throw new DomainError("WORKTREE_NOT_FOUND", "Worktree not found", 404);
+		if (!worktree) throw new DomainError("WORKTREE_NOT_FOUND", "Tree not found", 404);
 		await this.requireOpenProject(worktree.projectId);
 		if (this.projectLocks.has(worktree.projectId) || this.worktreeLocks.has(worktree.id)) throw new DomainError("WORKTREE_BUSY", "Cannot delete a terminal during a destructive project operation", 409);
 		this.worktreeLocks.add(worktree.id);
@@ -5991,7 +6059,7 @@ var TreeportService = class {
 			const terminals = await this.listWorktreeTerminals(worktree);
 			const terminal = terminals.find((candidate) => candidate.id === terminalId);
 			if (!terminal) throw new DomainError("TERMINAL_NOT_FOUND", "Terminal not found", 404);
-			if (terminals.length <= 1 || terminals.every((candidate) => candidate.id === terminalId || this.closeOnSuccessTerminalIds.has(candidate.id))) throw new DomainError("LAST_TERMINAL", "Every open worktree must keep at least one terminal", 409);
+			if (terminals.length <= 1 || terminals.every((candidate) => candidate.id === terminalId || this.closeOnSuccessTerminalIds.has(candidate.id))) throw new DomainError("LAST_TERMINAL", "Every open tree must keep at least one terminal", 409);
 			await this.deps.tmux.killSession(worktree.tmuxSocketName, terminal.tmuxSessionName, terminal.id, { preserveServer: true });
 		} finally {
 			this.worktreeLocks.delete(worktree.id);
@@ -6012,8 +6080,8 @@ var TreeportService = class {
 		if (!force && age < 6e4) return worktree.pr;
 		await this.requireOpenProject(worktree.projectId);
 		const pr = await this.deps.gh.pullRequest(worktree.path, worktree.branch);
-		if (!await this.storedWorktree(worktreeId)) throw new DomainError("WORKTREE_NOT_FOUND", "Worktree not found", 404);
-		if (this.worktreeLocks.has(worktreeId)) throw new DomainError("WORKTREE_UNAVAILABLE", "Cannot refresh a pull request while the worktree is being removed", 409);
+		if (!await this.storedWorktree(worktreeId)) throw new DomainError("WORKTREE_NOT_FOUND", "Tree not found", 404);
+		if (this.worktreeLocks.has(worktreeId)) throw new DomainError("WORKTREE_UNAVAILABLE", "Cannot refresh a pull request while the tree is being removed", 409);
 		await this.deps.database.db.run(sql`
       UPDATE worktrees
       SET pr_state=${pr.state},pr_number=${pr.number},pr_url=${pr.url},
@@ -6049,7 +6117,7 @@ var TreeportService = class {
 		const reasons = [];
 		const warnings = [];
 		if (worktree.kind === "main") reasons.push("The main checkout cannot be removed");
-		if (live.locked) reasons.push(live.lockReason ? `The worktree is locked: ${live.lockReason}` : "The worktree is locked");
+		if (live.locked) reasons.push(live.lockReason ? `The tree is locked: ${live.lockReason}` : "The tree is locked");
 		if (dirty.staged) warnings.push(`${dirty.staged} staged change(s) will be lost`);
 		if (dirty.unstaged) warnings.push(`${dirty.unstaged} unstaged change(s) will be lost`);
 		if (dirty.untracked) warnings.push(`${dirty.untracked} untracked file(s) will be lost`);
@@ -6098,25 +6166,25 @@ var TreeportService = class {
         AND status IN ('pending','running')
       LIMIT 1
     `);
-		if (activeRemoval) throw new DomainError("REMOVE_IN_PROGRESS", "The worktree is already being removed", 409);
+		if (activeRemoval) throw new DomainError("REMOVE_IN_PROGRESS", "The tree is already being removed", 409);
 		if (this.terminalMutations.has(worktreeId)) return this.terminalMutations.enqueue(worktreeId, () => {
 			if (this.worktreeMutations.has(worktree.projectId)) return this.worktreeMutations.enqueue(worktree.projectId, () => this.acceptRemove(worktreeId, request));
 			return this.acceptRemove(worktreeId, request);
 		});
 		if (this.worktreeMutations.has(worktree.projectId)) return this.worktreeMutations.enqueue(worktree.projectId, () => this.acceptRemove(worktreeId, request));
-		if (this.projectLocks.has(worktree.projectId) || this.worktreeLocks.has(worktreeId)) throw new DomainError("REMOVE_IN_PROGRESS", "The worktree or project is already being modified", 409);
+		if (this.projectLocks.has(worktree.projectId) || this.worktreeLocks.has(worktreeId)) throw new DomainError("REMOVE_IN_PROGRESS", "The tree or project is already being modified", 409);
 		return this.acceptRemove(worktreeId, request);
 	}
 	async acceptRemove(worktreeId, request) {
 		const worktree = await this.getWorktree(worktreeId);
 		await this.requireOpenProject(worktree.projectId);
-		if (this.worktreeLocks.has(worktreeId) || this.projectLocks.has(worktree.projectId)) throw new DomainError("REMOVE_IN_PROGRESS", "The worktree or project is already being modified", 409);
+		if (this.worktreeLocks.has(worktreeId) || this.projectLocks.has(worktree.projectId)) throw new DomainError("REMOVE_IN_PROGRESS", "The tree or project is already being modified", 409);
 		this.worktreeLocks.add(worktreeId);
 		let operationStarted = false;
 		try {
 			const { preview, prunable } = await this.prepareRemovePreview(worktreeId);
-			if (!preview.eligible) throw new DomainError("REMOVE_REFUSED", "The worktree cannot be removed", 409, preview);
-			if (request.confirmationToken !== preview.confirmationToken) throw new DomainError("REMOVE_PREVIEW_STALE", "The worktree changed after the removal preview; review it again", 409, preview);
+			if (!preview.eligible) throw new DomainError("REMOVE_REFUSED", "The tree cannot be removed", 409, preview);
+			if (request.confirmationToken !== preview.confirmationToken) throw new DomainError("REMOVE_PREVIEW_STALE", "The tree changed after the removal preview; review it again", 409, preview);
 			if (preview.warnings.length > 0 && !request.confirmDestructive) throw new DomainError("REMOVE_CONFIRMATION_REQUIRED", "Confirm the destructive removal after reviewing its warnings", 409, preview);
 			const checkout = await this.checkoutStat(preview.path);
 			const [checkoutBinding] = await this.deps.database.db.all(sql`
@@ -6129,11 +6197,11 @@ var TreeportService = class {
 			const operationId = id("op");
 			let checkoutIdentity = null;
 			if (prunable) {
-				if (!checkoutBinding?.git_worktree_key) throw new DomainError("REMOVE_PREVIEW_STALE", "The prunable worktree changed after the removal preview; review it again", 409, preview);
+				if (!checkoutBinding?.git_worktree_key) throw new DomainError("REMOVE_PREVIEW_STALE", "The prunable tree changed after the removal preview; review it again", 409, preview);
 			} else {
 				const markerPath = path.join(preview.path, ".git");
 				const gitMarker = (await this.checkoutStat(markerPath))?.isFile() ? await fs.readFile(markerPath, "utf8").catch(() => null) : null;
-				if (!checkout?.isDirectory() || !checkoutBinding?.git_worktree_key || gitMarker === null || !gitMarkerMatchesKey(preview.path, gitMarker, checkoutBinding.git_worktree_key)) throw new DomainError("REMOVE_PREVIEW_STALE", "The worktree checkout changed after the removal preview; review it again", 409, preview);
+				if (!checkout?.isDirectory() || !checkoutBinding?.git_worktree_key || gitMarker === null || !gitMarkerMatchesKey(preview.path, gitMarker, checkoutBinding.git_worktree_key)) throw new DomainError("REMOVE_PREVIEW_STALE", "The tree checkout changed after the removal preview; review it again", 409, preview);
 				checkoutIdentity = {
 					path: preview.path,
 					device: checkout.dev.toString(),
@@ -6212,12 +6280,12 @@ var TreeportService = class {
 		try {
 			const liveWorktrees = await this.deps.git.listWorktrees(project.repositoryPath);
 			const acceptedKey = request.gitWorktreeKey;
-			const liveAccepted = liveWorktrees.find((item) => item.path === preview.path && (request.prunable ? item.prunable : typeof acceptedKey === "string" && item.gitWorktreeKey === acceptedKey));
+			const liveAccepted = liveWorktrees.find((item) => item.path === preview.path && (request.prunable ? item.prunable : acceptedKey !== null && item.gitWorktreeKey === acceptedKey));
 			const liveRepositoryIdentity = await this.deps.git.repositoryIdentity(project.repositoryPath);
 			if (liveAccepted) {
 				if (!request.repositoryIdentity || liveRepositoryIdentity !== request.repositoryIdentity) throw new Error("Removal revalidation failed before destructive effects: the repository identity changed after removal was accepted");
 				if (request.prunable) {
-					if (!liveAccepted.prunable) throw new Error("Removal revalidation failed before destructive effects: the accepted worktree is no longer prunable");
+					if (!liveAccepted.prunable) throw new Error("Removal revalidation failed before destructive effects: the accepted tree is no longer prunable");
 				} else {
 					const authorizationError = await this.authorizedCheckoutError(preview.path, request.checkoutIdentity);
 					if (authorizationError) throw new Error(`Removal revalidation failed before destructive effects: ${authorizationError}`);
@@ -6350,18 +6418,18 @@ var TreeportService = class {
 	async deleteProject(projectId) {
 		if (this.projectLocks.has(projectId) || this.worktreeMutations.has(projectId)) throw new DomainError("PROJECT_BUSY", "Project is already being modified", 409);
 		let project = await this.getProject(projectId);
-		if (project.worktrees.some((worktree) => this.worktreeLocks.has(worktree.id))) throw new DomainError("PROJECT_BUSY", "A project worktree is already being modified", 409);
+		if (project.worktrees.some((worktree) => this.worktreeLocks.has(worktree.id))) throw new DomainError("PROJECT_BUSY", "A project tree is already being modified", 409);
 		this.projectLocks.add(projectId);
 		const lockedWorktrees = [];
 		try {
 			project = await this.observeAvailableProject(project, true);
-			if (this.worktreeMutations.has(projectId) || project.worktrees.some((worktree) => this.worktreeLocks.has(worktree.id))) throw new DomainError("PROJECT_BUSY", "A project worktree is already being modified", 409);
+			if (this.worktreeMutations.has(projectId) || project.worktrees.some((worktree) => this.worktreeLocks.has(worktree.id))) throw new DomainError("PROJECT_BUSY", "A project tree is already being modified", 409);
 			for (const worktree of project.worktrees) {
 				this.worktreeLocks.add(worktree.id);
 				lockedWorktrees.push(worktree.id);
 			}
 			project = await this.getProject(projectId);
-			if (project.worktrees.filter((worktree) => worktree.kind === "linked").length) throw new DomainError("PROJECT_HAS_WORKTREES", "Remove linked worktrees before unregistering the project", 409);
+			if (project.worktrees.filter((worktree) => worktree.kind === "linked").length) throw new DomainError("PROJECT_HAS_WORKTREES", "Remove linked trees before unregistering the project", 409);
 			const terminalIdsByWorktree = /* @__PURE__ */ new Map();
 			for (const worktree of project.worktrees) terminalIdsByWorktree.set(worktree.id, await this.deps.tmux.killServer(worktree.tmuxSocketName));
 			await this.deps.database.db.run(sql`DELETE FROM projects WHERE id=${projectId}`);
@@ -6598,10 +6666,12 @@ var TmuxControlParser = class {
 		const text = ascii(line);
 		if (/^%(?:begin|end|error)(?: |$)/.test(text)) throw new TmuxControlProtocolError("Unexpected or malformed command guard");
 		const lifecycle = text.match(/^%(pause|continue) (%\d+)$/);
-		if (lifecycle) {
+		const lifecycleType = lifecycle?.[1];
+		const lifecyclePaneId = lifecycle?.[2];
+		if ((lifecycleType === "pause" || lifecycleType === "continue") && lifecyclePaneId) {
 			events.push({
-				type: lifecycle[1],
-				paneId: lifecycle[2]
+				type: lifecycleType,
+				paneId: lifecyclePaneId
 			});
 			return;
 		}
@@ -7505,21 +7575,32 @@ var TerminalMetadataManager = class {
 };
 //#endregion
 //#region src/server/app.ts
-const UPLOAD_MIME_EXTENSIONS = {
-	"application/pdf": "pdf",
-	"image/gif": "gif",
-	"image/jpeg": "jpg",
-	"image/png": "png",
-	"image/svg+xml": "svg",
-	"image/webp": "webp",
-	"text/plain": "txt"
-};
+const UPLOAD_MIME_EXTENSIONS = /* @__PURE__ */ new Map([
+	["application/pdf", "pdf"],
+	["image/gif", "gif"],
+	["image/jpeg", "jpg"],
+	["image/png", "png"],
+	["image/svg+xml", "svg"],
+	["image/webp", "webp"],
+	["text/plain", "txt"]
+]);
 const UPLOAD_RETENTION_MS = 1440 * 6e4;
 const UPLOAD_DIRECTORY_MAX_BYTES = 512 * 1024 * 1024;
 const terminalPresetDefinitionsQuerySchema = z.object({
 	projectId: z.string().optional(),
 	worktreeId: z.string().optional()
 });
+const operationQuerySchema = z.object({
+	kind: z.enum([
+		"create",
+		"finish",
+		"discard",
+		"project_cleanup",
+		"remove",
+		"external_remove"
+	]).optional(),
+	projectId: z.string().optional()
+});
 const discardStoredDataQuerySchema = z.object({ discardStoredData: z.string().optional() });
 async function pruneTerminalUploads(directory, preservePath) {
 	const entries = await fs.readdir(directory, { withFileTypes: true });
@@ -7573,11 +7654,14 @@ function createApp({ service, config, tmux, terminalMetadata, webDist }) {
 			code: "INVALID_JSON",
 			message: "Request body must be valid JSON"
 		} }, 400);
-		if (error instanceof DomainError) return context.json({ error: {
-			code: error.code,
-			message: error.message,
-			...error.details === void 0 ? {} : { details: error.details }
-		} }, error.status);
+		if (error instanceof DomainError) {
+			const body = { error: {
+				code: error.code,
+				message: error.message
+			} };
+			if (error.details !== void 0) body.error.details = error.details;
+			return context.json(body, error.status);
+		}
 		const requestIdentifier = context.get("requestId") || crypto.randomUUID();
 		context.header("X-Request-Id", requestIdentifier);
 		console.error("[Treeport] API request failed", {
@@ -7650,12 +7734,13 @@ function createApp({ service, config, tmux, terminalMetadata, webDist }) {
 		return context.json({ ok: true });
 	}).get("/api/projects/:projectId/worktrees", async (context) => context.json({ worktrees: (await service.getProjectSnapshot(context.req.param("projectId"))).worktrees })).post("/api/projects/:projectId/worktree-operations", jsonInput(createWorktreeSchema), async (context) => {
 		const body = context.req.valid("json");
-		const initialTerminal = body.initialTerminal ? {
-			name: body.initialTerminal.name,
-			...body.initialTerminal.argv ? { argv: body.initialTerminal.argv } : {},
-			...body.initialTerminal.returnToShell ? { returnToShell: true } : {},
-			...body.initialTerminal.initialSize ? { initialSize: body.initialTerminal.initialSize } : {}
-		} : void 0;
+		let initialTerminal;
+		if (body.initialTerminal) {
+			initialTerminal = { name: body.initialTerminal.name };
+			if (body.initialTerminal.argv) initialTerminal.argv = body.initialTerminal.argv;
+			if (body.initialTerminal.returnToShell) initialTerminal.returnToShell = true;
+			if (body.initialTerminal.initialSize) initialTerminal.initialSize = body.initialTerminal.initialSize;
+		}
 		return context.json({ operation: await service.beginCreateWorktree(context.req.param("projectId"), body.name, body.base, initialTerminal, body.sourceWorktreeId) }, 202);
 	}).get("/api/worktrees/:worktreeId", async (context) => {
 		const worktreeId = context.req.param("worktreeId");
@@ -7712,22 +7797,23 @@ function createApp({ service, config, tmux, terminalMetadata, webDist }) {
 		}
 		const extension = path.extname(resolution.path).toLowerCase();
 		const body = await fs.readFile(resolution.path);
-		context.header("content-type", {
-			".css": "text/css; charset=utf-8",
-			".gif": "image/gif",
-			".html": "text/html; charset=utf-8",
-			".jpeg": "image/jpeg",
-			".jpg": "image/jpeg",
-			".js": "text/javascript; charset=utf-8",
-			".json": "application/json; charset=utf-8",
-			".map": "application/json; charset=utf-8",
-			".mjs": "text/javascript; charset=utf-8",
-			".png": "image/png",
-			".svg": "image/svg+xml",
-			".webp": "image/webp",
-			".woff": "font/woff",
-			".woff2": "font/woff2"
-		}[extension] ?? "application/octet-stream");
+		const mimeTypes = /* @__PURE__ */ new Map([
+			[".css", "text/css; charset=utf-8"],
+			[".gif", "image/gif"],
+			[".html", "text/html; charset=utf-8"],
+			[".jpeg", "image/jpeg"],
+			[".jpg", "image/jpeg"],
+			[".js", "text/javascript; charset=utf-8"],
+			[".json", "application/json; charset=utf-8"],
+			[".map", "application/json; charset=utf-8"],
+			[".mjs", "text/javascript; charset=utf-8"],
+			[".png", "image/png"],
+			[".svg", "image/svg+xml"],
+			[".webp", "image/webp"],
+			[".woff", "font/woff"],
+			[".woff2", "font/woff2"]
+		]);
+		context.header("content-type", mimeTypes.get(extension) ?? "application/octet-stream");
 		context.header("cache-control", "public, max-age=31536000, immutable");
 		context.header("access-control-allow-origin", "*");
 		context.header("content-security-policy", webPanelContentSecurityPolicy("immutable", browserOrigin, resolution.allowNetworkRequests));
@@ -7735,13 +7821,13 @@ function createApp({ service, config, tmux, terminalMetadata, webDist }) {
 		return context.body(body);
 	}).post("/api/worktrees/:worktreeId/terminals", jsonInput(createTerminalSchema), async (context) => {
 		const body = context.req.valid("json");
-		const terminal = await service.createTerminal(context.req.param("worktreeId"), body.name, body.argv, body.returnToShell || body.closeOnSuccess || body.initialSize || body.cwd || body.env ? {
-			...body.returnToShell ? { returnToShell: true } : {},
-			...body.closeOnSuccess ? { closeOnSuccess: true } : {},
-			...body.initialSize ? { initialSize: body.initialSize } : {},
-			...body.cwd ? { cwd: body.cwd } : {},
-			...body.env ? { env: body.env } : {}
-		} : void 0);
+		const options = {};
+		if (body.returnToShell) options.returnToShell = true;
+		if (body.closeOnSuccess) options.closeOnSuccess = true;
+		if (body.initialSize) options.initialSize = body.initialSize;
+		if (body.cwd) options.cwd = body.cwd;
+		if (body.env) options.env = body.env;
+		const terminal = await service.createTerminal(context.req.param("worktreeId"), body.name, body.argv, Object.keys(options).length > 0 ? options : void 0);
 		return context.json({ terminal }, 201);
 	}).get("/api/worktrees/:worktreeId/remove-preview", async (context) => context.json({ preview: await service.removePreview(context.req.param("worktreeId")) })).post("/api/worktrees/:worktreeId/remove", jsonInput(removeWorktreeSchema), async (context) => {
 		const body = context.req.valid("json");
@@ -7792,7 +7878,7 @@ function createApp({ service, config, tmux, terminalMetadata, webDist }) {
 		await waitForPreviousUpload;
 		try {
 			const contentType = context.req.header("content-type")?.split(";", 1)[0]?.toLowerCase() ?? "";
-			const extension = requestedExtension || UPLOAD_MIME_EXTENSIONS[contentType] || "";
+			const extension = requestedExtension || UPLOAD_MIME_EXTENSIONS.get(contentType) || "";
 			const uploadDirectory = path.join(config.runtimeDir, "uploads");
 			await fs.mkdir(uploadDirectory, {
 				recursive: true,
@@ -7830,26 +7916,15 @@ function createApp({ service, config, tmux, terminalMetadata, webDist }) {
 		await service.deleteTerminal(context.req.param("terminalId"));
 		return context.json({ ok: true });
 	}).get("/api/operations", validator("query", (value) => {
-		const kind = typeof value.kind === "string" ? value.kind : void 0;
-		const projectId = typeof value.projectId === "string" ? value.projectId : void 0;
-		if (kind && ![
-			"create",
-			"finish",
-			"discard",
-			"project_cleanup",
-			"remove",
-			"external_remove"
-		].includes(kind)) throw new DomainError("INVALID_OPERATION_KIND", "Invalid operation kind", 400);
-		return {
-			...kind ? { kind } : {},
-			...projectId ? { projectId } : {}
-		};
+		const parsed = operationQuerySchema.safeParse(value);
+		if (!parsed.success) throw new DomainError("INVALID_OPERATION_KIND", "Invalid operation query", 400);
+		return parsed.data;
 	}), async (context) => {
-		const { kind, projectId } = context.req.valid("query");
-		return context.json({ operations: await service.listActiveOperations({
-			...projectId ? { projectId } : {},
-			...kind ? { kind } : {}
-		}) });
+		const query = context.req.valid("query");
+		const filters = {};
+		if (query.projectId) filters.projectId = query.projectId;
+		if (query.kind) filters.kind = query.kind;
+		return context.json({ operations: await service.listActiveOperations(filters) });
 	}).get("/api/operations/:operationId", async (context) => context.json({ operation: await service.getOperation(context.req.param("operationId")) })).post("/api/admin/terminate-terminals", async (context) => context.json({ terminated: await service.terminateAllTerminals() })).all("/api/*", (context) => context.json({ error: {
 		code: "NOT_FOUND",
 		message: "API endpoint not found"
@@ -7900,7 +7975,8 @@ async function acquireDaemonOwnership(config) {
 		apiUrl: config.apiUrl,
 		dataDir: config.dataDir,
 		startedAt: (/* @__PURE__ */ new Date()).toISOString(),
-		installationMethod: config.installationMethod ?? "development"
+		installationMethod: config.installationMethod ?? "development",
+		daemonLifecycle: config.daemonLifecycle
 	};
 	const openLock = () => fs.open(lockPath, "wx", 384).then(async (file) => {
 		await file.writeFile(`${JSON.stringify(record)}\n`);
@@ -7908,7 +7984,9 @@ async function acquireDaemonOwnership(config) {
 	});
 	if (!await openLock().then(() => true, async (error) => {
 		if (error.code !== "EEXIST") throw error;
-		const existing = await fs.readFile(lockPath, "utf8").then((value) => JSON.parse(value)).catch(() => null);
+		const existing = await fs.readFile(lockPath, "utf8").then((value) => {
+			return JSON.parse(value);
+		}).catch(() => null);
 		if (existing?.pid && Number.isInteger(existing.pid) && processExists(existing.pid)) throw new Error(`Treeport is already running for ${config.dataDir} (PID ${existing.pid})`);
 		await fs.rm(lockPath, { force: true });
 		return false;
@@ -7962,7 +8040,7 @@ function singleHeader(request, name) {
 	return {
 		present: values.length > 0,
 		valid: values.length <= 1,
-		value: values.length === 1 ? values[0] : null
+		value: values.length === 1 ? values[0] ?? null : null
 	};
 }
 function hasControlCharacters(value) {
@@ -8009,14 +8087,24 @@ function effectiveOriginFor(request, source, incomingHost) {
 	if (!forwardedHost || forwardedProtocolHeader.value?.toLowerCase() !== "https") return null;
 	return `https://${forwardedHost.host}`;
 }
+function allowsOpaqueWebPanelOrigin(request, socketUpgrade) {
+	if (!["GET", "HEAD"].includes(request.method?.toUpperCase() ?? "")) return false;
+	const pathname = new URL(request.url ?? "/", "http://treeport.local").pathname;
+	if (socketUpgrade) return /^\/api\/web-panel-dev\/[a-f0-9]{24}\/@vite-hmr$/u.test(pathname);
+	return /^\/api\/web-panels\/panel_[a-f0-9]{32}\/assets(?:\/|$)/u.test(pathname) || /^\/api\/web-panel-dev\/[a-f0-9]{24}\//u.test(pathname);
+}
 function originIsAllowed(request, effectiveOrigin, socketUpgrade) {
 	const originHeader = singleHeader(request, "origin");
 	if (!originHeader.valid) return false;
 	if (originHeader.present) {
 		const value = originHeader.value ?? "";
-		if (value === "null" || !URL.canParse(value)) return false;
-		const parsed = new URL(value);
-		if (parsed.protocol !== "http:" && parsed.protocol !== "https:" || parsed.origin !== value || parsed.origin !== effectiveOrigin) return false;
+		if (value === "null") {
+			if (!allowsOpaqueWebPanelOrigin(request, socketUpgrade)) return false;
+		} else {
+			if (!URL.canParse(value)) return false;
+			const parsed = new URL(value);
+			if (parsed.protocol !== "http:" && parsed.protocol !== "https:" || parsed.origin !== value || parsed.origin !== effectiveOrigin) return false;
+		}
 	}
 	const fetchSiteHeader = singleHeader(request, "sec-fetch-site");
 	if (!fetchSiteHeader.valid) return false;
@@ -8091,8 +8179,8 @@ var AttachmentInitializationError = class {
 };
 const TERMINAL_MAX_QUEUED_INPUT_BYTES = 1024 * 1024;
 const TERMINAL_MAX_QUEUED_INPUT_MESSAGES = 256;
-function errorMessage(error) {
-	return ((error instanceof Error ? error.message : String(error)).trim() || "Terminal attachment failed").slice(0, 1e3);
+function errorMessage(cause) {
+	return ((cause instanceof Error ? cause.message : String(cause)).trim() || "Terminal attachment failed").slice(0, 1e3);
 }
 function tmuxEnvironment() {
 	return Object.fromEntries(Object.entries(process.env).filter(([key, value]) => value !== void 0 && key !== "TMUX" && key !== "TMUX_PANE"));
@@ -8510,11 +8598,11 @@ var TerminalAttachmentManager = class {
 			if (this.isActive(connection) && this.canControl(connection, generation)) connection.pty?.write(data);
 		}).catch((error) => this.failInputWrite(connection, error));
 	}
-	failInputWrite(connection, error) {
+	failInputWrite(connection, cause) {
 		if (!this.isActive(connection)) return;
 		this.send(connection, "terminal_error", {
 			code: "INPUT_FAILED",
-			message: errorMessage(error),
+			message: errorMessage(cause),
 			retryable: true
 		});
 		connection.transport.disconnect(true);
@@ -8550,13 +8638,13 @@ var TerminalAttachmentManager = class {
 		for (const client of active) if (this.isActive(client)) client.pty?.resize(next.cols, next.rows);
 		await this.tmux.resizeWindow(next.socketName, next.sessionName, next.cols, next.rows);
 	}
-	failDimensionChange(terminalId, error) {
+	failDimensionChange(terminalId, cause) {
 		this.dimensions.delete(terminalId);
 		for (const client of [...this.clients.values()]) {
 			if (client.terminalId !== terminalId || !this.isActive(client)) continue;
 			this.send(client, "terminal_error", {
 				code: "RESIZE_FAILED",
-				message: errorMessage(error),
+				message: errorMessage(cause),
 				retryable: true
 			});
 			client.transport.disconnect(true);
@@ -8756,7 +8844,7 @@ function createSocketServer(httpServer, { service, config, tmux, terminalMetadat
 			isConnected: () => socket.connected,
 			send(event, payload) {
 				if (!socket.connected) return false;
-				socket.emit(event, payload);
+				socket.emit.bind(socket)(event, payload);
 				return true;
 			},
 			disconnect(retryable) {
@@ -8864,10 +8952,14 @@ function shutdown() {
 	shuttingDown = true;
 	attachments.dispose();
 	terminalMetadata.dispose();
+	const viteClosed = vite?.close();
 	io.close(() => {
-		Promise.all([service.drainMutations(), terminalMetadata.drain()]).then(async () => {
+		Promise.all([
+			service.drainMutations(),
+			terminalMetadata.drain(),
+			viteClosed
+		]).then(async () => {
 			await service.disposeWebPanelRuntime();
-			await vite?.close();
 			database.close();
 			await ownership.release();
 			process.exit(0);