@treeport/treeport 0.3.0 → 0.5.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-Dyv_owrb.js";
-import { n as prepareShellIntegration } from "../../shell-integration-7aBNr-p0.js";
+import { $ as repositoryTerminalPresetSchema, At as terminalSizeSchema, B as createWorktreeSchema, Ct as parseTerminalProgress, Dt as terminalLegacyTakeControlSchema, Et as terminalInputSchema, G as openWebPanelSchema, H as deleteWebPanelStorageSchema, I as browseDirectoryQuerySchema, J as packageReloadSchema, K as packageInstallSchema, L as createTerminalPresetSchema, M as parseDurationMs, Ot as terminalOutputAckSchema, P as TERMINAL_MAX_UPLOAD_BYTES, Q as removeWorktreeSchema, R as createTerminalSchema, St as parseTerminalAuth, Tt as terminalBinarySchema, U as formatCommandLine, V as deleteTerminalPresetSchema, W as getWebPanelStorageSchema, X as packageUpdateSchema, Y as packageRemoveSchema, Z as registerProjectSchema, _ as serviceStatus, _t as TERMINAL_SCROLL_EXIT_SEQUENCE, a as readLocalUpdateProgress, at as updateTerminalPresetSchema, bt as TERMINAL_SELECTION_START_SEQUENCE, c as createUpdateStartupReporter, dt as TERMINAL_CONTROLLER_GRACE_MS, et as repositoryTerminalPresetsFileSchema, ft as TERMINAL_MAX_CLIENT_MESSAGE_BYTES, gt as TERMINAL_OUTPUT_STALL_TIMEOUT_MS, i as isCanonicalTreeportVersion, it as updateProjectSchema, j as assertLoopbackHost, jt as terminalTakeControlSchema, kt as terminalResizeSchema, n as compareTreeportVersions, nt as setWebPanelStorageSchema, o as resolveLatestTreeportRelease, ot as updateTerminalSchema, q as packageProjectQuerySchema, r as inspectLocalUpdateInstallation, rt as terminalCaptureQuerySchema, st as webPanelInputSchema, tt as requestWorkspaceOpenSchema, ut as SOCKET_IO_PATH, vt as TERMINAL_SELECTION_CLEAR_SEQUENCE, wt as terminalBellAcknowledgementSchema, xt as TERMINAL_SELECTION_STOP_SEQUENCE, yt as TERMINAL_SELECTION_RESTORE_SEQUENCE, z as createWebPanelSchema } from "../../update-BW-a6Bd-.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,14 +110,20 @@ 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);
+}
+function signalProcessGroup(processGroupId, signal) {
+	try {
+		process.kill(-processGroupId, signal);
+	} catch (cause) {
+		if (cause.code !== "ESRCH") throw cause;
+	}
 }
 /**
-* Runs a child command as an interruptible Effect. The child is acquired as a
-* resource, so interruption completes only after the finalizer has sent
-* SIGTERM, escalated to SIGKILL when needed, and observed the direct child
-* exit. Descendant process groups are intentionally outside this contract.
+* Runs a child command as an interruptible Effect. The child is acquired in an
+* isolated process group, so interruption completes only after the finalizer
+* has signaled the full group and observed the direct child exit.
 */
 function runCommandEffect(request) {
 	const stdoutLimit = request.maxStdoutBytes ?? DEFAULT_MAX_OUTPUT_BYTES;
@@ -134,7 +140,8 @@ function runCommandEffect(request) {
 					"pipe",
 					"pipe"
 				],
-				shell: false
+				shell: false,
+				detached: true
 			});
 		} catch (cause) {
 			resume(Effect.fail(new SpawnCommandError(request, cause)));
@@ -157,6 +164,7 @@ function runCommandEffect(request) {
 			child.removeListener("spawn", onSpawn);
 			resume(Effect.succeed({
 				child,
+				processGroupId: child.pid,
 				exit,
 				onExit,
 				onProcessError,
@@ -243,21 +251,19 @@ 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) => {
-		if (alreadyExited) return Effect.void;
+	}, (resource, useExit) => Deferred.isDone(resource.exit).pipe(Effect.flatMap((alreadyExited) => {
+		if (alreadyExited && Exit.isSuccess(useExit)) return Effect.void;
 		return Effect.sync(() => {
-			resource.child.kill("SIGTERM");
-		}).pipe(Effect.zipRight(Effect.raceFirst(Deferred.await(resource.exit).pipe(Effect.as(true), Effect.interruptible), Effect.sleep(Duration.millis(killGraceMs)).pipe(Effect.as(false), Effect.interruptible))), Effect.flatMap((exited) => {
-			if (exited) return Effect.void;
-			return Effect.sync(() => {
-				resource.child.kill("SIGKILL");
-			}).pipe(Effect.zipRight(Deferred.await(resource.exit)));
-		}));
+			signalProcessGroup(resource.processGroupId, "SIGTERM");
+		}).pipe(Effect.zipRight(Effect.raceFirst(Deferred.await(resource.exit).pipe(Effect.as(true), Effect.interruptible), Effect.sleep(Duration.millis(killGraceMs)).pipe(Effect.as(false), Effect.interruptible))), Effect.flatMap((exited) => Effect.sync(() => {
+			signalProcessGroup(resource.processGroupId, "SIGKILL");
+		}).pipe(Effect.zipRight(exited ? Effect.void : Deferred.await(resource.exit)))));
 	}), Effect.ensuring(Effect.sync(() => {
 		resource.child.removeListener("exit", resource.onExit);
 		resource.child.removeListener("error", resource.onProcessError);
@@ -311,7 +317,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";
@@ -323,7 +329,7 @@ function loadConfig(env = process.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 !== "service" && daemonLifecycle !== "external") throw new Error("TREEPORT_DAEMON_LIFECYCLE must be treeport, service, or external");
-	return {
+	const config = {
 		host,
 		port: portValue,
 		dataDir,
@@ -339,9 +345,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
@@ -357,6 +364,7 @@ var database_schema_exports = /* @__PURE__ */ __exportAll({
 const projects = sqliteTable("projects", {
 	id: text().primaryKey(),
 	name: text().notNull(),
+	kind: text("project_kind", { enum: ["repository", "folder"] }).notNull().default("repository"),
 	repositoryPath: text("repository_path").notNull().unique(),
 	mainWorktreePath: text("main_worktree_path").notNull(),
 	defaultBranch: text("default_branch").notNull(),
@@ -366,15 +374,18 @@ const projects = sqliteTable("projects", {
 	repositoryInode: text("repository_inode").notNull(),
 	nameIsCustom: integer("name_is_custom").notNull().default(0),
 	isOpen: integer("is_open").notNull().default(1),
+	showInRecents: integer("show_in_recents").notNull().default(0),
 	lastOpenedAt: text("last_opened_at").notNull(),
 	createdAt: text("created_at").notNull(),
 	updatedAt: text("updated_at").notNull()
 }, (table) => [
+	check("projects_kind_check", sql`${table.kind} IN ('repository','folder')`),
 	check("projects_color_check", sql`${table.color} IS NULL OR ${table.color} IN ('rose','orange','amber','emerald','cyan','blue','violet','pink')`),
 	check("projects_name_is_custom_check", sql`${table.nameIsCustom} IN (0,1)`),
 	check("projects_is_open_check", sql`${table.isOpen} IN (0,1)`),
+	check("projects_show_in_recents_check", sql`${table.showInRecents} IN (0,1)`),
 	uniqueIndex("projects_repository_identity_idx").on(table.repositoryIdentity).where(sql`${table.repositoryIdentity} IS NOT NULL`),
-	index("projects_recent_idx").on(table.isOpen, desc(table.lastOpenedAt), table.id)
+	index("projects_recent_idx").on(table.isOpen, table.showInRecents, desc(table.lastOpenedAt), table.id)
 ]);
 const worktrees = sqliteTable("worktrees", {
 	id: text().primaryKey(),
@@ -403,7 +414,7 @@ const worktrees = sqliteTable("worktrees", {
 	check("worktrees_detached_check", sql`${table.detached} IN (0,1)`),
 	check("worktrees_locked_check", sql`${table.locked} IN (0,1)`),
 	check("worktrees_prunable_check", sql`${table.prunable} IN (0,1)`),
-	check("worktrees_kind_check", sql`${table.kind} IN ('main','linked')`),
+	check("worktrees_kind_check", sql`${table.kind} IN ('main','linked','folder')`),
 	index("worktrees_project_idx").on(table.projectId),
 	uniqueIndex("worktrees_git_key_idx").on(table.projectId, table.gitWorktreeKey).where(sql`${table.gitWorktreeKey} IS NOT NULL`)
 ]);
@@ -463,7 +474,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 +520,13 @@ 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";
+	if (kind === "folder") return path.basename(worktreePath);
 	const checkoutName = path.basename(worktreePath);
 	return checkoutName === path.basename(mainWorktreePath) ? path.basename(path.dirname(worktreePath)) : checkoutName;
 }
@@ -564,58 +576,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
@@ -641,11 +659,8 @@ function resolveTask(task, input, protectCompatibilityEnvironment) {
 	const useShell = /[\s;&|<>`$()]/u.test(command);
 	return {
 		label: expand(task.label, compatibilityEnvironment),
-		argv: useShell ? [
-			input.shell,
-			"-lc",
-			[command, ...args.map(shellQuote)].join(" ")
-		] : [command, ...args],
+		argv: useShell ? null : [command, ...args],
+		shellCommand: useShell ? [command, ...args.map(shellQuote)].join(" ") : null,
 		cwd,
 		env: protectCompatibilityEnvironment ? {
 			...taskEnvironment,
@@ -704,8 +719,9 @@ async function loadZedTerminalPresetDefinitions(input) {
 		definitions.push({
 			id: `repository:${input.projectId}:zed-task:${index}`,
 			name: resolved.label,
-			executable: resolved.argv[0],
-			args: resolved.argv.slice(1),
+			executable: resolved.argv?.[0] ?? null,
+			args: resolved.argv?.slice(1) ?? [],
+			shellCommand: resolved.shellCommand,
 			cwd: resolved.cwd,
 			env: resolved.env,
 			closeOnSuccess: false,
@@ -723,9 +739,18 @@ async function loadZedTerminalPresetDefinitions(input) {
 async function resolveZedCreateWorktreeSetupTasks(input) {
 	return (await loadCreateWorktreeTasks(input.mainWorktreePath)).map((task) => {
 		const resolved = resolveTask(task, input, false);
+		let argv = resolved.argv;
+		if (!argv) {
+			if (!resolved.shellCommand) throw new Error(`Zed task ${task.label} has no resolved command`);
+			argv = [
+				input.shell,
+				"-lc",
+				resolved.shellCommand
+			];
+		}
 		return {
 			label: task.label,
-			argv: resolved.argv,
+			argv,
 			cwd: resolved.cwd,
 			env: resolved.env,
 			timeoutMs: 30 * 6e4
@@ -866,6 +891,8 @@ async function openDatabase(filePath, options = {}) {
 	const databaseExists = fsSync.existsSync(absoluteFilePath);
 	let hasDurableSchema = false;
 	let hasLegacyMigrations = false;
+	let migrationsPending = !databaseExists;
+	const migrationSnapshotPaths = [];
 	let drizzleRows = [];
 	if (!databaseExists) await fsSync.promises.mkdir(path.dirname(absoluteFilePath), {
 		recursive: true,
@@ -911,7 +938,8 @@ async function openDatabase(filePath, options = {}) {
 				if (!knownMigration || knownMigration.hash !== row.hash) throw new Error(`Treeport database at ${absoluteFilePath} has an unrecognized migration history. Use a compatible Treeport version or restore a pre-migration snapshot.`);
 			}
 			if (hasDurableSchema && !hasLegacyMigrations && drizzleRows.length === 0) throw new Error(`Treeport database at ${absoluteFilePath} has no recognized migration history; refusing to modify it.`);
-			if ((drizzleRows.length === 0 || Number(drizzleRows.at(-1)?.createdAt) < latestMigration.folderMillis) && hasDurableSchema) {
+			migrationsPending = drizzleRows.length === 0 || Number(drizzleRows.at(-1)?.createdAt) < latestMigration.folderMillis;
+			if (migrationsPending && hasDurableSchema) {
 				const backupDirectory = path.resolve(options.backupDirectory ?? path.join(path.dirname(absoluteFilePath), "database-backups"));
 				await fsSync.promises.mkdir(backupDirectory, {
 					recursive: true,
@@ -924,6 +952,7 @@ async function openDatabase(filePath, options = {}) {
 				try {
 					await db.run(sql.raw(`VACUUM INTO '${backupPath.replaceAll("'", "''")}'`));
 					await fsSync.promises.chmod(backupPath, 384);
+					migrationSnapshotPaths.push(backupPath);
 				} catch (error) {
 					await fsSync.promises.rm(backupPath, { force: true });
 					throw error;
@@ -957,6 +986,8 @@ async function openDatabase(filePath, options = {}) {
 		return {
 			filePath: absoluteFilePath,
 			db,
+			migrationState: migrationsPending ? "advanced" : "unchanged",
+			migrationSnapshotPaths,
 			close: () => client.close()
 		};
 	} catch (error) {
@@ -968,6 +999,8 @@ function mapProject(row, worktreeRows) {
 	return {
 		id: row.id,
 		name: row.name,
+		kind: row.kind,
+		rootPath: row.repositoryPath,
 		repositoryPath: row.repositoryPath,
 		mainWorktreePath: row.mainWorktreePath,
 		defaultBranch: row.defaultBranch,
@@ -987,7 +1020,7 @@ function mapWorktree(row, mainWorktreePath) {
 		projectId: row.projectId,
 		name: inferWorktreeName(mainWorktreePath, row.path, row.kind),
 		path: row.path,
-		head: row.head,
+		head: row.kind === "folder" ? "" : row.head,
 		branch: row.branch,
 		detached: Boolean(row.detached),
 		locked: Boolean(row.locked),
@@ -1106,6 +1139,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 +1197,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,
@@ -1268,10 +1309,34 @@ var GitAdapter = class {
 			timeoutMs: 3e4
 		});
 	}
+	async findRepositoryRoot(inputPath) {
+		const canonicalInput = await fs.realpath(path.resolve(inputPath));
+		const request = {
+			executable: this.executable,
+			args: ["rev-parse", "--show-toplevel"],
+			cwd: canonicalInput,
+			timeoutMs: 3e4
+		};
+		const result = await this.runner.run(request);
+		if (result.exitCode === 0) return fs.realpath(result.stdout.trim());
+		if (/not a git repository|outside repository/iu.test(result.stderr)) return null;
+		throw new ExternalCommandError(`Could not inspect Git repository state: ${result.stderr.trim() || `Git exited with code ${result.exitCode}`}`, request, result);
+	}
+	async findProjectRepositoryRoot(inputPath) {
+		const canonicalInput = await fs.realpath(path.resolve(inputPath));
+		const repositoryRoot = await this.findRepositoryRoot(canonicalInput);
+		if (!repositoryRoot || repositoryRoot === canonicalInput) return repositoryRoot;
+		return (await this.checked(repositoryRoot, [
+			"rev-list",
+			"--all",
+			"--max-count=1"
+		])).stdout.trim() ? repositoryRoot : null;
+	}
 	async canonicalizeRepositoryPath(inputPath) {
+		const repositoryRoot = await this.findRepositoryRoot(inputPath);
+		if (repositoryRoot) return repositoryRoot;
 		const canonicalInput = await fs.realpath(path.resolve(inputPath));
-		const result = await this.checked(canonicalInput, ["rev-parse", "--show-toplevel"]);
-		return fs.realpath(result.stdout.trim());
+		throw new Error(`Not a Git repository: ${canonicalInput}`);
 	}
 	async repositoryIdentityValues(cwd) {
 		const result = await this.runner.run({
@@ -1997,16 +2062,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 +2108,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, ""));
@@ -2119,7 +2204,7 @@ var PackageSystem = class {
 		if (scope === "global") return path.join(this.config.dataDir, "settings.json");
 		const project = projectId ? this.projectContexts.get(projectId) : void 0;
 		if (!project) throw new DomainError("PROJECT_NOT_FOUND", "Project not found for package operation", 404);
-		return path.join(project.mainWorktreePath, ".treeport", "settings.json");
+		return path.join(project.rootPath, ".treeport", "settings.json");
 	}
 	async serialize(key, operation) {
 		const previous = this.operationTails.get(key) ?? Promise.resolve();
@@ -2139,85 +2224,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 +2336,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;
@@ -2257,7 +2361,7 @@ var PackageSystem = class {
 		};
 	}
 	npmRoot(scope, projectId) {
-		return scope === "global" ? path.join(this.config.dataDir, "npm") : path.join(this.projectContexts.get(projectId).mainWorktreePath, ".treeport", "npm");
+		return scope === "global" ? path.join(this.config.dataDir, "npm") : path.join(this.projectContexts.get(projectId).rootPath, ".treeport", "npm");
 	}
 	npmPackagePath(source, scope, projectId) {
 		return path.join(this.npmRoot(scope, projectId), "node_modules", source.name);
@@ -2346,40 +2450,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 +2580,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 +2591,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 +2629,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 +2640,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) {
@@ -2563,6 +2677,7 @@ var PackageSystem = class {
 					name: result.data.name,
 					executable: result.data.executable,
 					args: [...result.data.args],
+					shellCommand: null,
 					cwd: null,
 					env: {},
 					closeOnSuccess: result.data.closeOnSuccess,
@@ -2813,7 +2928,7 @@ var PackageSystem = class {
 		return {
 			id: project.id,
 			name: project.name,
-			mainWorktreePath: project.mainWorktreePath
+			rootPath: project.rootPath
 		};
 	}
 	syncProjects(projects) {
@@ -2821,7 +2936,7 @@ var PackageSystem = class {
 			const next = this.context(project);
 			const previous = this.projectContexts.get(project.id);
 			this.projectContexts.set(project.id, next);
-			if (previous && (previous.mainWorktreePath !== next.mainWorktreePath || previous.name !== next.name)) this.projectFingerprints.delete(project.id);
+			if (previous && (previous.rootPath !== next.rootPath || previous.name !== next.name)) this.projectFingerprints.delete(project.id);
 		}
 	}
 	async initialize(projects) {
@@ -2931,10 +3046,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 +3206,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 {
@@ -3144,6 +3260,7 @@ async function loadRepositoryTerminalPresets(projectId, worktreePath) {
 			name: preset.data.name,
 			executable: preset.data.executable,
 			args: [...preset.data.args],
+			shellCommand: null,
 			cwd: null,
 			env: {},
 			closeOnSuccess: preset.data.closeOnSuccess,
@@ -3163,7 +3280,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 +3288,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 +3324,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 +3357,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 +3486,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 +3525,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 +3576,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 +3624,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 +3764,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 +3786,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 +3807,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 +3858,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 {
@@ -3757,6 +3877,7 @@ var TmuxAdapter = class {
 	uid;
 	creationTails = /* @__PURE__ */ new Map();
 	configuredSockets = /* @__PURE__ */ new Set();
+	socketConfigurationPromises = /* @__PURE__ */ new Map();
 	initializationPromise = null;
 	sshAuthSockPromise = null;
 	constructor(runner, runtimeDir, executable = "tmux", launcherPath, host = {}) {
@@ -3846,25 +3967,22 @@ 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];
+				spec.tmuxExecutable = resolveExecutablePath(this.executable, this.hostEnvironment);
+				if (shellIntegrationReady) spec.shellIntegrationDir = this.shellIntegrationDir;
+				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, {
@@ -3897,6 +4015,8 @@ var TmuxAdapter = class {
 					worktreeId: input.worktreeId,
 					name: input.name,
 					argv: input.argv,
+					shellCommand: input.shellCommand,
+					interactiveShell: input.interactiveShell,
 					closeOnSuccess: input.closeOnSuccess ?? false,
 					createdAt: input.createdAt,
 					updatedAt: input.createdAt
@@ -3924,7 +4044,10 @@ var TmuxAdapter = class {
 		}
 	}
 	async configureServer(socketName) {
-		await runChecked(this.runner, {
+		if (this.configuredSockets.has(socketName)) return;
+		const existing = this.socketConfigurationPromises.get(socketName);
+		if (existing) return existing;
+		const configuring = runChecked(this.runner, {
 			executable: this.executable,
 			args: [
 				...this.base(socketName),
@@ -3933,13 +4056,20 @@ var TmuxAdapter = class {
 			],
 			env: this.environment(),
 			timeoutMs: 1e4
+		}).then(() => {
+			this.configuredSockets.add(socketName);
+		});
+		this.socketConfigurationPromises.set(socketName, configuring);
+		return configuring.finally(() => {
+			if (this.socketConfigurationPromises.get(socketName) === configuring) this.socketConfigurationPromises.delete(socketName);
 		});
-		this.configuredSockets.add(socketName);
 	}
 	async configureSession(socketName, sessionName, metadata) {
 		const values = [
 			["@treeport-name", encodeMetadata(metadata.name)],
 			["@treeport-argv", encodeMetadata(metadata.argv)],
+			["@treeport-shell-command", encodeMetadata(metadata.shellCommand)],
+			["@treeport-interactive-shell", metadata.interactiveShell ? "1" : "0"],
 			["@treeport-close-on-success", metadata.closeOnSuccess ? "1" : "0"],
 			["@treeport-created-at", encodeMetadata(metadata.createdAt)],
 			["@treeport-updated-at", encodeMetadata(metadata.updatedAt)],
@@ -3992,7 +4122,7 @@ var TmuxAdapter = class {
 				"list-panes",
 				"-a",
 				"-F",
-				"#{session_name}	#{@treeport-terminal-id}	#{@treeport-worktree-id}	#{@treeport-name}	#{@treeport-argv}	#{@treeport-close-on-success}	#{@treeport-created-at}	#{@treeport-updated-at}	#{session_created}	#{pane_dead}	#{pane_dead_status}"
+				"#{session_name}	#{@treeport-terminal-id}	#{@treeport-worktree-id}	#{@treeport-name}	#{@treeport-argv}	#{@treeport-shell-command}	#{@treeport-interactive-shell}	#{@treeport-close-on-success}	#{@treeport-created-at}	#{@treeport-updated-at}	#{session_created}	#{pane_dead}	#{pane_dead_status}"
 			],
 			env: this.environment(),
 			timeoutMs: 1e4
@@ -4004,26 +4134,24 @@ var TmuxAdapter = class {
 		const sessions = /* @__PURE__ */ new Map();
 		for (const line of result.stdout.split("\n")) {
 			if (!line) continue;
-			const [sessionName, terminalId, worktreeId, encodedName, encodedArgv, closeOnSuccess, encodedCreatedAt, encodedUpdatedAt, sessionCreated, paneDead, paneDeadStatus] = line.split("	");
+			const [sessionName, terminalId, worktreeId, encodedName, encodedArgv, encodedShellCommand, encodedInteractiveShell, closeOnSuccess, encodedCreatedAt, encodedUpdatedAt, sessionCreated, paneDead, paneDeadStatus] = line.split("	");
 			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())),
+					shellCommand: decodeMetadata(encodedShellCommand ?? "", z.string().nullable()),
+					createdAt: decodeMetadata(encodedCreatedAt ?? "", z.string()),
+					updatedAt: decodeMetadata(encodedUpdatedAt ?? "", z.string())
 				};
 			} catch {
 				continue;
 			}
+			const interactiveShell = encodedInteractiveShell === "1" ? true : encodedInteractiveShell === "0" ? false : void 0;
+			if (metadata.shellCommand === void 0 || interactiveShell === void 0) continue;
 			const fallbackCreatedAt = metadata.createdAt ?? (/* @__PURE__ */ new Date(Number(sessionCreated) * 1e3)).toISOString();
 			const dead = paneDead === "1";
 			const exitCode = dead && paneDeadStatus ? Number.parseInt(paneDeadStatus, 10) : null;
@@ -4033,6 +4161,8 @@ var TmuxAdapter = class {
 				name: metadata.name ?? sessionName,
 				sessionName,
 				argv: metadata.argv ?? [],
+				shellCommand: metadata.shellCommand,
+				interactiveShell,
 				closeOnSuccess: closeOnSuccess === "1",
 				status: dead ? "exited" : "running",
 				exitCode: Number.isNaN(exitCode) ? null : exitCode,
@@ -4185,7 +4315,7 @@ var TmuxAdapter = class {
 				"-p",
 				"-t",
 				sessionName,
-				"#{@treeport-shell-title}	#{pane_current_command}	#{@treeport-command}	#{pane_title}"
+				"#{@treeport-fallback-shell}	#{@treeport-shell-title}	#{pane_current_command}	#{@treeport-command}	#{pane_title}"
 			],
 			env: this.environment(),
 			timeoutMs: 1e4
@@ -4194,20 +4324,22 @@ var TmuxAdapter = class {
 		const firstSeparator = result.stdout.indexOf("	");
 		const secondSeparator = result.stdout.indexOf("	", firstSeparator + 1);
 		const thirdSeparator = result.stdout.indexOf("	", secondSeparator + 1);
-		if (firstSeparator === -1 || secondSeparator === -1 || thirdSeparator === -1) return null;
-		const encodedShellTitle = result.stdout.slice(0, firstSeparator).trim();
+		const fourthSeparator = result.stdout.indexOf("	", thirdSeparator + 1);
+		if (firstSeparator === -1 || secondSeparator === -1 || thirdSeparator === -1 || fourthSeparator === -1) return null;
+		let fallbackShell = null;
 		let shellTitle = null;
 		try {
-			const decoded = decodeMetadata(encodedShellTitle);
-			shellTitle = typeof decoded === "string" ? decoded : null;
+			fallbackShell = decodeMetadata(result.stdout.slice(0, firstSeparator).trim(), z.string()) ?? null;
+			shellTitle = decodeMetadata(result.stdout.slice(firstSeparator + 1, secondSeparator).trim(), z.string()) ?? null;
 		} catch {}
-		const currentCommand = result.stdout.slice(firstSeparator + 1, secondSeparator).trim() || null;
-		const commandLine = result.stdout.slice(secondSeparator + 1, thirdSeparator).trim() || null;
+		const currentCommand = result.stdout.slice(secondSeparator + 1, thirdSeparator).trim() || null;
+		const commandLine = result.stdout.slice(thirdSeparator + 1, fourthSeparator).trim() || null;
 		return {
-			paneTitle: result.stdout.slice(thirdSeparator + 1).trim() || null,
+			paneTitle: result.stdout.slice(fourthSeparator + 1).trim() || null,
 			currentCommand,
 			commandLine,
-			shellTitle
+			shellTitle,
+			fallbackShell
 		};
 	}
 	async setSessionShellTitle(socketName, sessionName, title) {
@@ -4268,7 +4400,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 +4414,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 +4423,7 @@ function mapWebPanel(row, allowSameOrigin = false) {
 		definitionId: row.definitionId,
 		title: row.title,
 		launch: {
-			input,
+			input: parsedInput.data,
 			cwd: row.launchCwd
 		},
 		sandbox: { allowSameOrigin },
@@ -4341,6 +4473,7 @@ var TreeportService = class {
 	closeOnSuccessTerminalIds = /* @__PURE__ */ new Set();
 	terminalIdsByWorktree = /* @__PURE__ */ new Map();
 	projectObservationTails = /* @__PURE__ */ new Map();
+	observedFolderIdentities = /* @__PURE__ */ new Map();
 	projectsSnapshotInFlight = null;
 	projectsSnapshotRevision = 0;
 	packages;
@@ -4404,7 +4537,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}
         `);
@@ -4538,9 +4671,11 @@ var TreeportService = class {
 		return this.deps.database.db.select({
 			id: projects.id,
 			name: projects.name,
+			kind: projects.kind,
+			rootPath: projects.repositoryPath,
 			repositoryPath: projects.repositoryPath,
 			lastOpenedAt: projects.lastOpenedAt
-		}).from(projects).where(eq(projects.isOpen, 0)).orderBy(desc(projects.lastOpenedAt), asc(projects.id));
+		}).from(projects).where(and(eq(projects.isOpen, 0), eq(projects.showInRecents, 1))).orderBy(desc(projects.lastOpenedAt), asc(projects.id));
 	}
 	async collectCurrentProjectsSnapshot() {
 		while (true) {
@@ -4553,7 +4688,8 @@ var TreeportService = class {
 		return (await Promise.all((await this.storedProjects(true)).map(async (storedProject) => {
 			let project = storedProject;
 			try {
-				await this.importWorktrees(project.id, project.repositoryPath, project.mainWorktreePath);
+				if (project.kind === "repository") await this.importWorktrees(project.id, project.repositoryPath, project.mainWorktreePath);
+				else project = await this.observeAvailableProject(project);
 				await this.ensureProjectTerminals(project.id);
 				project = await this.storedProject(project.id) ?? project;
 			} catch (error) {
@@ -4564,7 +4700,7 @@ var TreeportService = class {
 			}
 			if (await this.projectOpenState(project.id) !== true) return null;
 			await Promise.all(project.worktrees.map(async (worktree) => {
-				const [dirty, terminals] = await Promise.all([project.availability.state === "available" && !worktree.prunable ? this.deps.git.dirtyState(worktree.path).catch(() => null) : null, this.listWorktreeTerminals(worktree).catch((error) => {
+				const [dirty, terminals] = await Promise.all([project.kind === "repository" && project.availability.state === "available" && !worktree.prunable ? this.deps.git.dirtyState(worktree.path).catch(() => null) : null, this.listWorktreeTerminals(worktree).catch((error) => {
 					project.availability = {
 						state: "unavailable",
 						message: error instanceof Error ? error.message : String(error)
@@ -4605,6 +4741,8 @@ var TreeportService = class {
 				name: terminal.name,
 				tmuxSessionName: terminal.sessionName,
 				argv: terminal.argv,
+				shellCommand: terminal.shellCommand,
+				interactiveShell: terminal.interactiveShell,
 				status: terminal.status,
 				exitCode: terminal.exitCode,
 				createdAt: terminal.createdAt,
@@ -4643,14 +4781,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;
 	}
@@ -4668,7 +4806,7 @@ var TreeportService = class {
 		const direct = await this.storedProject(identifier);
 		if (direct) return direct;
 		const canonical = await fs.realpath(path.resolve(identifier)).catch(() => path.resolve(identifier));
-		const match = (await this.storedProjects()).find((project) => isPathWithin(canonical, project.repositoryPath) || project.worktrees.some((worktree) => isPathWithin(canonical, worktree.path)));
+		const match = (await this.storedProjects()).find((project) => isPathWithin(canonical, project.rootPath) || project.worktrees.some((worktree) => isPathWithin(canonical, worktree.path)));
 		if (!match) throw new DomainError("PROJECT_NOT_FOUND", `No registered project contains ${identifier}`, 404);
 		return match;
 	}
@@ -4736,7 +4874,7 @@ var TreeportService = class {
 				definitions: [],
 				diagnostics: []
 			}),
-			worktree && project ? loadZedTerminalPresetDefinitions({
+			worktree && project?.kind === "repository" ? loadZedTerminalPresetDefinitions({
 				projectId: project.id,
 				shell: this.deps.config.shell,
 				mainWorktreePath: project.mainWorktreePath,
@@ -4758,6 +4896,7 @@ var TreeportService = class {
 					name: preset.name,
 					executable: preset.executable,
 					args: [...preset.args],
+					shellCommand: null,
 					cwd: null,
 					env: {},
 					closeOnSuccess: preset.closeOnSuccess,
@@ -4851,17 +4990,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 +5021,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,
@@ -5004,18 +5146,21 @@ var TreeportService = class {
 			project: {
 				id: project.id,
 				name: project.name,
-				defaultBranch: project.defaultBranch
+				kind: project.kind,
+				defaultBranch: project.kind === "repository" ? project.defaultBranch : null
 			},
 			worktree: {
 				id: worktree.id,
 				name: worktree.name,
+				kind: worktree.kind,
 				branch: worktree.branch,
-				head: worktree.head
+				head: worktree.kind === "folder" ? null : worktree.head
 			}
 		};
 	}
 	async getWebPanelDiff(panelId) {
 		const context = await this.getWebPanelContext(panelId);
+		if (context.project.kind !== "repository" || !context.project.defaultBranch) throw new DomainError("GIT_NOT_AVAILABLE", "Git diff is not available for a folder project", 409);
 		const worktree = await this.getWorktree(context.panel.worktreeId);
 		return this.deps.git.worktreeDiff(worktree.path, context.project.defaultBranch);
 	}
@@ -5077,9 +5222,17 @@ 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 requestWorkspaceOpen(worktreeId, sourceTerminalId) {
+		const worktree = await this.getWorktree(worktreeId);
+		await this.requireOpenProject(worktree.projectId);
+		this.events.publish("workspace.open_requested", {
+			worktreeId,
+			sourceTerminalId
+		});
+	}
 	async getTerminal(terminalId) {
 		const matches = (await this.listProjects()).flatMap((project) => project.worktrees).flatMap((worktree) => worktree.terminals).filter((terminal) => terminal.id === terminalId);
 		if (matches.length > 1) throw new DomainError("TERMINAL_ID_CONFLICT", "Terminal ID is present in more than one tmux server", 500);
@@ -5113,7 +5266,7 @@ var TreeportService = class {
 		const direct = await this.storedProject(identifier);
 		if (direct) return await this.requireOpenProject(direct.id);
 		const canonical = await fs.realpath(path.resolve(identifier)).catch(() => path.resolve(identifier));
-		const match = (await this.storedProjects()).find((project) => isPathWithin(canonical, project.repositoryPath) || project.worktrees.some((worktree) => isPathWithin(canonical, worktree.path)));
+		const match = (await this.storedProjects()).find((project) => isPathWithin(canonical, project.rootPath) || project.worktrees.some((worktree) => isPathWithin(canonical, worktree.path)));
 		if (!match) throw new DomainError("PROJECT_NOT_FOUND", `No registered project contains ${identifier}`, 404);
 		await this.requireOpenProject(match.id);
 		return match;
@@ -5126,7 +5279,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;
 	}
@@ -5186,7 +5339,7 @@ var TreeportService = class {
 				path: breadcrumbPath
 			});
 		}
-		const repositoryPath = exact ? await this.deps.git.canonicalizeRepositoryPath(directoryPath).then((checkout) => this.deps.git.resolveMainCheckout(checkout)).then((mainCheckout) => fs.realpath(mainCheckout)).catch(() => null) : null;
+		const repositoryPath = exact ? await this.deps.git.findProjectRepositoryRoot(directoryPath).then((checkout) => checkout ? this.deps.git.resolveMainCheckout(checkout) : null).then((mainCheckout) => mainCheckout ? fs.realpath(mainCheckout) : null) : null;
 		return {
 			input: inputPath,
 			exact,
@@ -5199,6 +5352,18 @@ var TreeportService = class {
 				entries,
 				truncated
 			},
+			project: exact ? repositoryPath ? {
+				state: "valid",
+				kind: "repository",
+				path: repositoryPath
+			} : {
+				state: "valid",
+				kind: "folder",
+				path: directoryPath
+			} : {
+				state: "incomplete",
+				message: "Choose a matching folder to continue."
+			},
 			repository: repositoryPath ? {
 				state: "valid",
 				repositoryPath
@@ -5212,6 +5377,14 @@ var TreeportService = class {
 		};
 	}
 	async registerProject(inputPath, requestedName) {
+		const canonicalPath = await fs.realpath(path.resolve(inputPath)).catch((error) => {
+			throw new DomainError("FOLDER_UNREADABLE", error instanceof Error ? error.message : "Folder cannot be read", 400);
+		});
+		if (!(await fs.stat(canonicalPath, { bigint: true })).isDirectory()) throw new DomainError("FOLDER_NOT_DIRECTORY", `Path is not a folder: ${canonicalPath}`, 400);
+		const repositoryRoot = await this.deps.git.findProjectRepositoryRoot(canonicalPath);
+		return repositoryRoot ? this.registerRepositoryProject(repositoryRoot, requestedName) : this.registerFolderProject(canonicalPath, requestedName);
+	}
+	async registerRepositoryProject(inputPath, requestedName) {
 		const checkout = await this.deps.git.canonicalizeRepositoryPath(inputPath).catch((error) => {
 			throw new DomainError("NOT_A_GIT_REPOSITORY", error instanceof Error ? error.message : "Not a Git repository", 400);
 		});
@@ -5266,17 +5439,18 @@ var TreeportService = class {
 			if (verifiedIdentity !== repositoryIdentity || verifiedStat.dev.toString() !== repositoryDevice || verifiedStat.ino.toString() !== repositoryInode) throw new DomainError("PROJECT_PATH_CONFLICT", "The repository changed during registration", 409);
 			await this.deps.database.db.run(sql`
         INSERT INTO projects(
-          id,name,repository_path,main_worktree_path,default_branch,
+          id,name,project_kind,repository_path,main_worktree_path,default_branch,
           repository_identity,repository_device,repository_inode,name_is_custom,
-          is_open,last_opened_at,created_at,updated_at
+          is_open,show_in_recents,last_opened_at,created_at,updated_at
         ) VALUES(
-          ${projectId},${name},${repositoryPath},${mainPath},${defaultBranch},
+          ${projectId},${name},'repository',${repositoryPath},${mainPath},${defaultBranch},
           ${repositoryIdentity},${repositoryDevice},${repositoryInode},
-          ${nameIsCustom ? 1 : 0},1,${timestamp},
+          ${nameIsCustom ? 1 : 0},1,0,${timestamp},
           ${existing?.createdAt ?? timestamp},${timestamp}
         )
         ON CONFLICT(id) DO UPDATE SET
           name=excluded.name,
+          project_kind=excluded.project_kind,
           repository_path=excluded.repository_path,
           main_worktree_path=excluded.main_worktree_path,
           default_branch=excluded.default_branch,
@@ -5297,6 +5471,7 @@ var TreeportService = class {
 					const timestamp = now();
 					await this.deps.database.db.update(projects).set({
 						isOpen: 1,
+						showInRecents: 0,
 						lastOpenedAt: timestamp,
 						updatedAt: timestamp
 					}).where(eq(projects.id, projectId));
@@ -5317,9 +5492,123 @@ var TreeportService = class {
 		this.events.publish("project.created", { projectId });
 		return this.getProjectSnapshot(projectId);
 	}
+	async registerFolderProject(folderPath, requestedName) {
+		const folderStat = await fs.stat(folderPath, { bigint: true });
+		const device = folderStat.dev.toString();
+		const inode = folderStat.ino.toString();
+		const [pathMatchRow] = await this.deps.database.db.select({ id: projects.id }).from(projects).where(eq(projects.repositoryPath, folderPath)).limit(1);
+		const identityMatchId = [...this.observedFolderIdentities].find(([, identity]) => identity.device === device && identity.inode === inode)?.[0];
+		const [pathMatch, identityMatch] = await Promise.all([pathMatchRow ? this.storedProject(pathMatchRow.id) : null, identityMatchId ? this.storedProject(identityMatchId) : null]);
+		if (pathMatch?.kind === "repository") throw new DomainError("PROJECT_PATH_CONFLICT", "The selected folder is registered as a Git repository, but Git no longer recognizes it", 409);
+		const observedPathIdentity = pathMatch ? this.observedFolderIdentities.get(pathMatch.id) : null;
+		if (observedPathIdentity && (observedPathIdentity.device !== device || observedPathIdentity.inode !== inode)) throw new DomainError("PROJECT_PATH_CONFLICT", "The registered folder path now refers to a different folder", 409);
+		if (pathMatch && identityMatch && pathMatch.id !== identityMatch.id) throw new DomainError("PROJECT_PATH_CONFLICT", "The folder identity and registered path belong to different projects", 409);
+		const existing = identityMatch ?? pathMatch;
+		const projectId = existing?.id ?? id("proj");
+		const updateRegistration = async () => {
+			const timestamp = now();
+			const [metadata] = existing ? await this.deps.database.db.select({ nameIsCustom: projects.nameIsCustom }).from(projects).where(eq(projects.id, existing.id)).limit(1) : [];
+			const requested = requestedName?.trim() || null;
+			const nameIsCustom = requested ? true : Boolean(metadata?.nameIsCustom);
+			const name = requested || (existing && !nameIsCustom && existing.name === path.basename(existing.rootPath) ? path.basename(folderPath) : existing?.name) || path.basename(folderPath);
+			const [verifiedPath, verifiedStat] = await Promise.all([fs.realpath(folderPath), fs.stat(folderPath, { bigint: true })]);
+			if (verifiedPath !== folderPath || !verifiedStat.isDirectory() || verifiedStat.dev.toString() !== device || verifiedStat.ino.toString() !== inode) throw new DomainError("PROJECT_PATH_CONFLICT", "The folder changed during registration", 409);
+			const existingWorktreeRows = existing ? await this.deps.database.db.select().from(worktrees).where(eq(worktrees.projectId, projectId)) : [];
+			if (existingWorktreeRows.length > 1 || existingWorktreeRows.some((worktree) => worktree.kind !== "folder")) throw new DomainError("PROJECT_PATH_CONFLICT", "The folder registration contains incompatible Git worktrees", 409);
+			const existingWorktree = existingWorktreeRows[0];
+			const worktreeId = existingWorktree?.id ?? id("wt");
+			await this.deps.database.db.transaction(async (tx) => {
+				await tx.run(sql`
+          INSERT INTO projects(
+            id,name,project_kind,repository_path,main_worktree_path,default_branch,
+            repository_identity,repository_device,repository_inode,name_is_custom,
+            is_open,show_in_recents,last_opened_at,created_at,updated_at
+          ) VALUES(
+            ${projectId},${name},'folder',${folderPath},${folderPath},'',
+            NULL,${device},${inode},${nameIsCustom ? 1 : 0},1,0,${timestamp},
+            ${existing?.createdAt ?? timestamp},${timestamp}
+          )
+          ON CONFLICT(id) DO UPDATE SET
+            name=excluded.name,
+            project_kind='folder',
+            repository_path=excluded.repository_path,
+            main_worktree_path=excluded.main_worktree_path,
+            default_branch='',
+            repository_identity=NULL,
+            repository_device=excluded.repository_device,
+            repository_inode=excluded.repository_inode,
+            name_is_custom=excluded.name_is_custom,
+            is_open=1,
+            show_in_recents=0,
+            last_opened_at=excluded.last_opened_at,
+            updated_at=excluded.updated_at
+        `);
+				if (existingWorktree) await tx.run(sql`
+            UPDATE worktrees
+            SET path=${folderPath},git_worktree_key=NULL,head='',branch=NULL,
+                detached=0,locked=0,lock_reason=NULL,prunable=0,kind='folder',
+                managed_wrapper_path=NULL,pr_state='unknown',pr_number=NULL,
+                pr_url=NULL,pr_base_branch=NULL,pr_head_branch=NULL,
+                pr_merged_at=NULL,pr_refreshed_at=NULL,updated_at=${timestamp}
+            WHERE id=${worktreeId}
+          `);
+				else await tx.run(sql`
+            INSERT INTO worktrees(
+              id,project_id,path,git_worktree_key,head,branch,detached,locked,
+              lock_reason,prunable,kind,tmux_socket_name,created_at,updated_at
+            ) VALUES(
+              ${worktreeId},${projectId},${folderPath},NULL,'',NULL,0,0,NULL,0,
+              'folder',${generateTmuxSocketName()},${timestamp},${timestamp}
+            )
+          `);
+			});
+		};
+		const register = async () => {
+			if (this.projectLocks.has(projectId) || this.worktreeMutations.has(projectId)) throw new DomainError("PROJECT_BUSY", "Project is already being modified", 409);
+			this.projectLocks.add(projectId);
+			try {
+				await updateRegistration();
+			} finally {
+				this.projectLocks.delete(projectId);
+			}
+		};
+		if (existing) await this.serializeProjectObservation(projectId, register);
+		else await register();
+		this.observedFolderIdentities.set(projectId, {
+			device,
+			inode
+		});
+		await this.packages.registerProject(await this.getProject(projectId));
+		await this.ensureProjectTerminals(projectId).catch(() => void 0);
+		this.invalidateProjectsSnapshot();
+		this.events.publish(existing ? "project.updated" : "project.created", { projectId });
+		return this.getProjectSnapshot(projectId);
+	}
 	async observeAvailableProject(project, allowClosed = false) {
 		try {
-			await this.importWorktrees(project.id, project.repositoryPath, project.mainWorktreePath, true, allowClosed);
+			if (project.kind === "repository") await this.importWorktrees(project.id, project.repositoryPath, project.mainWorktreePath, true, allowClosed);
+			else await this.serializeProjectObservation(project.id, async () => {
+				if (!allowClosed && await this.projectOpenState(project.id) !== true || this.worktreeMutations.has(project.id)) return;
+				const [metadata] = await this.deps.database.db.select({
+					device: projects.repositoryDevice,
+					inode: projects.repositoryInode
+				}).from(projects).where(eq(projects.id, project.id)).limit(1);
+				const [canonicalPath, folderStat] = await Promise.all([fs.realpath(project.rootPath), fs.stat(project.rootPath, { bigint: true })]);
+				if (!metadata || canonicalPath !== project.rootPath || !folderStat.isDirectory()) throw new Error("The registered folder path is not an available directory");
+				const device = folderStat.dev.toString();
+				const inode = folderStat.ino.toString();
+				const observedIdentity = this.observedFolderIdentities.get(project.id);
+				if (observedIdentity && (observedIdentity.device !== device || observedIdentity.inode !== inode)) throw new Error("The registered folder path changed during this daemon session");
+				if (project.worktrees.filter((worktree) => worktree.kind === "folder" && worktree.path === project.rootPath).length !== 1 || project.worktrees.length !== 1) throw new Error("The registered folder does not have one folder workspace");
+				if (metadata.device !== device || metadata.inode !== inode) await this.deps.database.db.update(projects).set({
+					repositoryDevice: device,
+					repositoryInode: inode
+				}).where(eq(projects.id, project.id));
+				this.observedFolderIdentities.set(project.id, {
+					device,
+					inode
+				});
+			});
 		} catch (error) {
 			throw new DomainError("PROJECT_UNAVAILABLE", error instanceof Error ? error.message : String(error), 503);
 		}
@@ -5332,12 +5621,14 @@ var TreeportService = class {
 		try {
 			const project = await this.observeAvailableProject(await this.getProject(projectId));
 			await this.ensureProjectTerminals(projectId);
-			const defaultBranch = await this.deps.git.defaultBranch(project.repositoryPath);
-			await this.deps.database.db.run(sql`
-        UPDATE projects
-        SET default_branch = ${defaultBranch}, updated_at = ${now()}
-        WHERE id = ${projectId}
-      `);
+			if (project.kind === "repository") {
+				const defaultBranch = await this.deps.git.defaultBranch(project.repositoryPath);
+				await this.deps.database.db.run(sql`
+          UPDATE projects
+          SET default_branch = ${defaultBranch}, updated_at = ${now()}
+          WHERE id = ${projectId}
+        `);
+			}
 			await this.reconcile();
 			await this.packages.registerProject(await this.getProject(projectId));
 			this.invalidateProjectsSnapshot();
@@ -5356,6 +5647,7 @@ var TreeportService = class {
 				const timestamp = now();
 				await this.deps.database.db.update(projects).set({
 					isOpen: 1,
+					showInRecents: 0,
 					lastOpenedAt: timestamp,
 					updatedAt: timestamp
 				}).where(eq(projects.id, projectId));
@@ -5373,7 +5665,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);
@@ -5397,6 +5689,7 @@ var TreeportService = class {
 				try {
 					await this.deps.database.db.update(projects).set({
 						isOpen: 0,
+						showInRecents: 1,
 						updatedAt: now()
 					}).where(eq(projects.id, projectId));
 				} catch (error) {
@@ -5414,6 +5707,17 @@ var TreeportService = class {
 			}
 		});
 	}
+	async dismissRecentProject(projectId) {
+		await this.serializeProjectObservation(projectId, async () => {
+			await this.getProject(projectId);
+			if (await this.projectOpenState(projectId) !== false) throw new DomainError("PROJECT_NOT_RECENT", "Project is open and cannot be removed from Recent projects", 409);
+			await this.deps.database.db.update(projects).set({
+				showInRecents: 0,
+				updatedAt: now()
+			}).where(and(eq(projects.id, projectId), eq(projects.isOpen, 0)));
+			this.events.publish("project.updated", { projectId });
+		});
+	}
 	async serializeProjectObservation(projectId, operation) {
 		const observation = (this.projectObservationTails.get(projectId) ?? Promise.resolve()).then(operation);
 		const tail = observation.then(() => void 0, () => void 0);
@@ -5598,7 +5902,7 @@ var TreeportService = class {
 		return (await this.deps.database.db.select().from(operations).where(and(or(eq(operations.status, "pending"), eq(operations.status, "running")), ...filters.projectId ? [eq(operations.projectId, filters.projectId)] : [], ...filters.kind ? [eq(operations.kind, filters.kind)] : [])).orderBy(asc(operations.createdAt), asc(operations.id))).map(mapOperation);
 	}
 	async beginCreateWorktree(projectId, inputName, base, initialTerminal, sourceWorktreeId) {
-		await this.requireOpenProject(projectId);
+		if ((await this.requireOpenProject(projectId)).kind === "folder") throw new DomainError("PROJECT_HAS_NO_GIT_REPOSITORY", "Linked worktrees require a Git repository project", 409);
 		let name;
 		try {
 			name = normalizeWorktreeName(inputName);
@@ -5608,18 +5912,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);
@@ -5668,7 +5973,7 @@ var TreeportService = class {
 		}
 	}
 	async createWorktree(projectId, inputName, base, initialTerminal, sourceWorktreeId) {
-		await this.requireOpenProject(projectId);
+		if ((await this.requireOpenProject(projectId)).kind === "folder") throw new DomainError("PROJECT_HAS_NO_GIT_REPOSITORY", "Linked worktrees require a Git repository project", 409);
 		if (this.projectLocks.has(projectId) && !this.worktreeMutations.has(projectId)) throw new DomainError("PROJECT_BUSY", "Project is already being modified", 409);
 		return this.worktreeMutations.enqueue(projectId, () => this.executeCreateWorktree(projectId, inputName, base, initialTerminal, sourceWorktreeId));
 	}
@@ -5683,13 +5988,14 @@ var TreeportService = class {
 		let wrapperCreated = false;
 		try {
 			project = await this.observeAvailableProject(await this.requireOpenProject(projectId));
+			if (project.kind === "folder") throw new DomainError("PROJECT_HAS_NO_GIT_REPOSITORY", "Linked worktrees require a Git repository project", 409);
 			let name;
 			try {
 				name = normalizeWorktreeName(inputName);
 			} 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 +6004,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 +6046,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 +6059,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 +6073,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 +6097,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;
@@ -5835,34 +6142,43 @@ var TreeportService = class {
 		const project = await this.requireOpenProject(worktree.projectId);
 		const terminalId = id("term");
 		const sessionName = generateTmuxSessionName();
-		const commandArgv = argv ? [...argv] : [this.deps.config.shell, "-l"];
+		const shellCommand = options?.shellCommand ?? null;
+		const interactiveShell = !argv && shellCommand === null;
+		const commandArgv = argv ? [...argv] : shellCommand ? [
+			this.deps.config.shell,
+			"-lc",
+			shellCommand
+		] : [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,
+			shellCommand,
+			interactiveShell,
+			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 && !interactiveShell) 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);
 		}
@@ -5872,6 +6188,8 @@ var TreeportService = class {
 			name,
 			tmuxSessionName: sessionName,
 			argv: commandArgv,
+			shellCommand,
+			interactiveShell,
 			status: "running",
 			exitCode: null,
 			createdAt: timestamp,
@@ -5898,8 +6216,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);
@@ -5912,7 +6230,7 @@ var TreeportService = class {
 		}
 	}
 	async refreshTerminalStatus(terminalId, observeGit = true) {
-		const terminal = observeGit ? await this.getTerminal(terminalId) : await this.getTerminalFromBindings(terminalId);
+		const terminal = observeGit ? await this.getTerminal(terminalId) : this.terminalStates.get(terminalId) ?? await this.getTerminalFromBindings(terminalId);
 		const worktree = await this.getWorktree(terminal.worktreeId);
 		const state = await this.deps.tmux.sessionState(worktree.tmuxSocketName, terminal.tmuxSessionName);
 		await this.requireOpenProject(worktree.projectId);
@@ -5983,7 +6301,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 +6309,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 +6330,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},
@@ -6030,6 +6348,7 @@ var TreeportService = class {
 		const worktree = await this.requireAvailableWorktree(worktreeId, true);
 		worktree.terminals = await this.listWorktreeTerminals(worktree);
 		const project = await this.getProject(worktree.projectId);
+		if (project.kind === "folder") throw new DomainError("FOLDER_WORKSPACE_NOT_REMOVABLE", "Remove the folder project instead of its folder workspace", 409);
 		const live = (await this.deps.git.listWorktrees(project.repositoryPath)).find((item) => item.path === worktree.path);
 		if (!live) throw new DomainError("WORKTREE_NOT_FOUND", "Git no longer reports this worktree", 404);
 		const head = live.head ?? worktree.head;
@@ -6049,7 +6368,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 +6417,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 +6448,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 +6531,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,21 +6669,22 @@ 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}`);
+			this.observedFolderIdentities.delete(projectId);
 			this.packages.forgetProject(projectId);
 			for (const worktree of project.worktrees) this.clearWorktreeTerminalState(worktree.id, terminalIdsByWorktree.get(worktree.id));
 			this.invalidateProjectsSnapshot();
@@ -6391,7 +6711,7 @@ var TreeportService = class {
 	async reconcile() {
 		const availableProjects = /* @__PURE__ */ new Set();
 		for (const project of await this.storedProjects(true)) try {
-			await this.importWorktrees(project.id, project.repositoryPath, project.mainWorktreePath);
+			await this.observeAvailableProject(project);
 			availableProjects.add(project.id);
 		} catch {}
 		for (const project of await this.storedProjects(true)) {
@@ -6598,10 +6918,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;
 		}
@@ -6757,6 +7079,7 @@ async function terminateProcess(child, terminationStarted) {
 var TmuxProgressObserver = class {
 	options;
 	spawnProcess;
+	closed;
 	lifecycleFiber;
 	process = null;
 	metadataParser = null;
@@ -6771,6 +7094,7 @@ var TmuxProgressObserver = class {
 		this.options = options;
 		this.spawnProcess = spawnProcess;
 		this.lifecycleFiber = Effect.runFork(Effect.scoped(this.lifecycle()).pipe(Effect.catchAll(() => Effect.sync(() => this.notifyExit()))));
+		this.closed = Effect.runPromise(Fiber.await(this.lifecycleFiber)).then(() => void 0);
 	}
 	dispose() {
 		if (this.disposed) return;
@@ -6927,22 +7251,6 @@ const PROGRAM_COMMANDS = /* @__PURE__ */ new Map([
 	["claude", "claude"],
 	["codex", "codex"]
 ]);
-const SHELL_COMMANDS = /* @__PURE__ */ new Set([
-	"ash",
-	"bash",
-	"csh",
-	"dash",
-	"elvish",
-	"fish",
-	"ksh",
-	"mksh",
-	"nu",
-	"pwsh",
-	"sh",
-	"tcsh",
-	"xonsh",
-	"zsh"
-]);
 var TerminalMetadataRuntimeError = class {
 	phase;
 	terminalId;
@@ -6969,6 +7277,7 @@ var TerminalMetadataManager = class {
 	bellMutations = new KeyedTaskQueue();
 	bellDeletionVersions = /* @__PURE__ */ new Map();
 	persistedBells = /* @__PURE__ */ new Map();
+	observerShutdowns = /* @__PURE__ */ new Set();
 	bellStateStore;
 	initializePromise = null;
 	unsubscribeEvents = null;
@@ -7034,8 +7343,10 @@ var TerminalMetadataManager = class {
 			entry = void 0;
 		}
 		if (!entry) {
-			const launchCommand = path.basename(terminal.argv?.[0] ?? "").replace(/^-/, "");
-			const launchProgram = PROGRAM_COMMANDS.get(launchCommand) ?? null;
+			const launchCommand = path.basename(terminal.argv[0] ?? "").replace(/^-/, "");
+			const launchProgram = !terminal.interactiveShell && terminal.shellCommand === null ? PROGRAM_COMMANDS.get(launchCommand) ?? null : null;
+			const interactiveShellCommand = terminal.interactiveShell ? launchCommand : null;
+			const launchCommandLine = terminal.interactiveShell ? null : (terminal.shellCommand?.replace(/\p{Cc}/gu, "") ?? formatCommandLine(terminal.argv.map((value) => value.replace(/\p{Cc}/gu, "")))).trim().slice(0, 256) || null;
 			this.bellDeletionVersions.set(terminal.id, (this.bellDeletionVersions.get(terminal.id) ?? 0) + 1);
 			const persistedBell = this.persistedBells.get(terminal.id);
 			const bell = persistedBell?.worktreeId === terminal.worktreeId ? {
@@ -7060,7 +7371,8 @@ var TerminalMetadataManager = class {
 				paneTitle: null,
 				currentCommand: null,
 				commandLine: null,
-				shellCommand: SHELL_COMMANDS.has(launchCommand) ? launchCommand : null,
+				launchCommandLine,
+				interactiveShellCommand,
 				launchProgram,
 				shellTitle: null,
 				persistedShellTitle: null,
@@ -7164,8 +7476,9 @@ var TerminalMetadataManager = class {
 		this.listeners.clear();
 		this.historyListeners.clear();
 	}
-	drain() {
-		return this.bellMutations.drain();
+	async drain() {
+		await this.bellMutations.drain();
+		await Promise.allSettled([...this.observerShutdowns]);
 	}
 	handleProductEvent(event) {
 		if (event.type === "terminal.removed") {
@@ -7333,7 +7646,7 @@ var TerminalMetadataManager = class {
 						this.update(entry, { progress: null });
 					}
 				});
-				if (exited || this.entries.get(entry.terminalId) !== entry || entry.runtimeGeneration !== runtimeGeneration || entry.observerVersion !== version) observer.dispose();
+				if (exited || this.entries.get(entry.terminalId) !== entry || entry.runtimeGeneration !== runtimeGeneration || entry.observerVersion !== version) this.disposeObserver(observer);
 				else entry.observer = observer;
 			},
 			catch: (cause) => new TerminalMetadataRuntimeError("create_observer", entry.terminalId, cause)
@@ -7362,17 +7675,31 @@ var TerminalMetadataManager = class {
 		}
 		this.update(entry, { progress: null });
 	}
+	disposeObserver(observer) {
+		observer.dispose();
+		if (!observer.closed) return;
+		const shutdown = observer.closed;
+		this.observerShutdowns.add(shutdown);
+		shutdown.then(() => this.observerShutdowns.delete(shutdown), () => this.observerShutdowns.delete(shutdown));
+	}
 	releaseRuntimeResources(entry) {
 		entry.observerVersion += 1;
-		entry.observer?.dispose();
-		entry.observer = null;
+		if (entry.observer) {
+			this.disposeObserver(entry.observer);
+			entry.observer = null;
+		}
 		this.clearProgressRuntime(entry);
 		entry.shellTitleWriting = false;
 	}
 	reconcileTitleState(entry, state) {
 		const paneTitle = state.paneTitle?.trim().slice(0, 256) || null;
 		const currentCommand = state.currentCommand?.trim().slice(0, 256) || null;
-		const commandLine = state.commandLine?.trim().slice(0, 256) || null;
+		const fallbackShellCommand = path.basename(state.fallbackShell ?? "").replace(/^-/, "").replace(/\p{Cc}/gu, "").trim().slice(0, 256);
+		if (fallbackShellCommand) {
+			entry.launchCommandLine = null;
+			entry.interactiveShellCommand = fallbackShellCommand;
+		}
+		const commandLine = state.commandLine?.trim().slice(0, 256) || entry.launchCommandLine;
 		const previousCommand = entry.currentCommand;
 		const previousCommandLine = entry.commandLine;
 		const paneTitleChanged = paneTitle !== entry.paneTitle;
@@ -7392,12 +7719,8 @@ var TerminalMetadataManager = class {
 		const commandToken = commandLine?.match(/^(?:exec\s+|command\s+)?(?:"([^"]+)"|'([^']+)'|(\S+))/);
 		const commandExecutable = commandToken ? commandToken[1] || commandToken[2] || commandToken[3] || null : null;
 		const observedProgram = PROGRAM_COMMANDS.get(path.basename(commandExecutable ?? "").replace(/^-/, "")) ?? PROGRAM_COMMANDS.get(path.basename(currentCommand ?? "").replace(/^-/, "")) ?? null;
-		this.update(entry, { program: observedProgram ?? (!entry.shellCommand ? entry.launchProgram : null) });
-		if (!entry.shellCommand) {
-			this.update(entry, { title: paneTitle ?? commandLine ?? currentCommand });
-			return;
-		}
-		if (currentCommand === entry.shellCommand) {
+		this.update(entry, { program: observedProgram ?? (!entry.interactiveShellCommand ? entry.launchProgram : null) });
+		if (entry.interactiveShellCommand && currentCommand === entry.interactiveShellCommand) {
 			const applicationTitleWasActive = entry.applicationTitleActive;
 			const freshShellTitle = observedTitlePending || previousCommand !== null && paneTitleChanged;
 			entry.applicationTitleActive = false;
@@ -7411,11 +7734,15 @@ var TerminalMetadataManager = class {
 		}
 		if (commandLine) {
 			if (observedTitlePending) entry.applicationTitleActive = paneTitle !== null && paneTitle !== commandLine;
-			else if (commandLineChanged) entry.applicationTitleActive = previousCommand === null && paneTitle !== null && paneTitle !== commandLine && paneTitle !== entry.shellTitle;
+			else if (commandLineChanged) entry.applicationTitleActive = entry.interactiveShellCommand !== null && previousCommand === null && paneTitle !== null && paneTitle !== commandLine && paneTitle !== entry.shellTitle;
 			else if (paneTitleChanged && paneTitle !== commandLine) entry.applicationTitleActive = true;
 			this.update(entry, { title: entry.applicationTitleActive ? paneTitle ?? entry.title ?? commandLine : commandLine });
 			return;
 		}
+		if (!entry.interactiveShellCommand) {
+			this.update(entry, { title: paneTitle ?? currentCommand });
+			return;
+		}
 		if (observedTitlePending) {
 			entry.applicationTitleActive = true;
 			this.update(entry, { title: entry.title ?? paneTitle ?? currentCommand });
@@ -7444,7 +7771,7 @@ var TerminalMetadataManager = class {
 	}
 	updateForegroundProcess(entry, currentCommand) {
 		const command = currentCommand?.trim().slice(0, 256) || null;
-		this.update(entry, { hasForegroundProcess: entry.status !== "running" ? false : command === null ? null : command !== entry.shellCommand });
+		this.update(entry, { hasForegroundProcess: entry.status !== "running" ? false : command === null ? null : command !== entry.interactiveShellCommand });
 	}
 	persistShellTitle(entry, runtimeGeneration) {
 		return Effect.gen(this, function* () {
@@ -7505,21 +7832,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 });
@@ -7557,7 +7895,7 @@ function queryInput(schema) {
 		if (!result.success) throw new DomainError("VALIDATION_ERROR", "Request validation failed", 400, z.flattenError(result.error));
 	});
 }
-function createApp({ service, config, tmux, terminalMetadata, webDist }) {
+function createApp({ service, config, tmux, applicationUpdate, terminalMetadata, webDist }) {
 	const app = new Hono();
 	app.use("/api/*", requestId({
 		limitLength: 128,
@@ -7573,11 +7911,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", {
@@ -7604,7 +7945,13 @@ function createApp({ service, config, tmux, terminalMetadata, webDist }) {
 		installationMethod: config.installationMethod ?? "development",
 		daemonLifecycle: config.daemonLifecycle,
 		url: config.apiUrl
-	})).get("/api/terminal-presets", async (context) => context.json({ presets: await service.listTerminalPresets() })).get("/api/terminal-preset-definitions", queryInput(terminalPresetDefinitionsQuerySchema), async (context) => context.json(await service.listTerminalPresetDefinitions(context.req.valid("query")))).post("/api/terminal-presets", jsonInput(createTerminalPresetSchema), async (context) => {
+	})).get("/api/update", async (context) => {
+		context.header("Cache-Control", "no-store");
+		return context.json(await applicationUpdate.status());
+	}).post("/api/update", async (context) => {
+		context.header("Cache-Control", "no-store");
+		return context.json(await applicationUpdate.start(), 202);
+	}).get("/api/terminal-presets", async (context) => context.json({ presets: await service.listTerminalPresets() })).get("/api/terminal-preset-definitions", queryInput(terminalPresetDefinitionsQuerySchema), async (context) => context.json(await service.listTerminalPresetDefinitions(context.req.valid("query")))).post("/api/terminal-presets", jsonInput(createTerminalPresetSchema), async (context) => {
 		const body = context.req.valid("json");
 		return context.json({ preset: await service.createTerminalPreset(body) }, 201);
 	}).patch("/api/terminal-presets/:presetId", jsonInput(updateTerminalPresetSchema), async (context) => {
@@ -7636,6 +7983,9 @@ function createApp({ service, config, tmux, terminalMetadata, webDist }) {
 	}).post("/api/projects/:projectId/open", async (context) => context.json({ project: await service.openProject(context.req.param("projectId")) })).post("/api/projects/:projectId/close", async (context) => {
 		await service.closeProject(context.req.param("projectId"));
 		return context.json({ ok: true });
+	}).delete("/api/projects/:projectId/recent", async (context) => {
+		await service.dismissRecentProject(context.req.param("projectId"));
+		return context.json({ ok: true });
 	}).get("/api/projects/:projectId", async (context) => context.json({ project: await service.getProjectSnapshot(context.req.param("projectId")) })).patch("/api/projects/:projectId", jsonInput(updateProjectSchema), async (context) => {
 		const body = context.req.valid("json");
 		const projectId = context.req.param("projectId");
@@ -7650,17 +8000,21 @@ 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");
 		await service.refreshPr(worktreeId, false);
 		return context.json({ worktree: await service.getWorktreeSnapshot(worktreeId) });
+	}).post("/api/worktrees/:worktreeId/open", jsonInput(requestWorkspaceOpenSchema), async (context) => {
+		await service.requestWorkspaceOpen(context.req.param("worktreeId"), context.req.valid("json").sourceTerminalId);
+		return context.json({ ok: true });
 	}).get("/api/worktrees/:worktreeId/web-panel-definitions", async (context) => context.json({ definitions: await service.listWebPanelDefinitions(context.req.param("worktreeId")) })).post("/api/worktrees/:worktreeId/panels", jsonInput(createWebPanelSchema), async (context) => {
 		const body = context.req.valid("json");
 		return context.json({ panel: await service.createWebPanel(context.req.param("worktreeId"), body.definitionId, {
@@ -7712,22 +8066,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 +8090,14 @@ 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;
+		if (body.shellCommand) options.shellCommand = body.shellCommand;
+		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 +8148,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 +8186,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"
@@ -7872,6 +8217,247 @@ function createApp({ service, config, tmux, terminalMetadata, webDist }) {
 	return routes;
 }
 //#endregion
+//#region src/server/application-update.ts
+const POLL_INTERVAL_MS = 10 * 6e4;
+const POLL_JITTER_MS = 6e4;
+const updateResultSchema = z.looseObject({
+	schemaVersion: z.literal(1),
+	operationId: z.string().uuid(),
+	status: z.enum(["current", "updated"]),
+	phase: z.literal("complete"),
+	fromVersion: z.string(),
+	toVersion: z.string()
+});
+const updateErrorSchema = z.looseObject({ error: z.looseObject({
+	code: z.string(),
+	message: z.string(),
+	details: z.looseObject({
+		operationId: z.string().optional(),
+		recovery: z.string().optional()
+	}).optional()
+}) });
+async function readValidatedJson(filePath, schema) {
+	return fs.readFile(filePath, "utf8").then((value) => schema.safeParse(JSON.parse(value))).then((result) => result.success ? result.data : null).catch(() => null);
+}
+async function fileExists(filePath) {
+	return fs.access(filePath).then(() => true).catch(() => false);
+}
+function createApplicationUpdateManager(config, dependencies = {}) {
+	const environment = dependencies.environment ?? process.env;
+	const resolveRelease = dependencies.resolveRelease ?? resolveLatestTreeportRelease;
+	const inspectInstallation = dependencies.inspectInstallation ?? inspectLocalUpdateInstallation;
+	const readProgress = dependencies.readProgress ?? readLocalUpdateProgress;
+	const readServiceStatus = dependencies.readServiceStatus ?? serviceStatus;
+	const spawnProcess = dependencies.spawnProcess ?? spawn;
+	const random = dependencies.random ?? Math.random;
+	const pollIntervalMs = dependencies.pollIntervalMs ?? POLL_INTERVAL_MS;
+	const pollJitterMs = dependencies.pollJitterMs ?? POLL_JITTER_MS;
+	const updateDirectory = path.join(config.dataDir, "updates");
+	const resultPath = path.join(updateDirectory, "web-update-result.json");
+	const errorPath = path.join(updateDirectory, "web-update-error.json");
+	const currentVersion = config.appVersion ?? "development";
+	const staticBlockedReason = config.installationMethod !== "npm" ? "This Treeport installation cannot update itself. Update it with its installation method." : config.daemonLifecycle === "external" ? "This Treeport daemon is managed by another process. Update it on the host." : !isCanonicalTreeportVersion(currentVersion) ? "Development and prerelease Treeport versions do not update from the stable npm channel." : null;
+	let latestVersion = null;
+	let checkedAt = null;
+	let capabilityChecked = staticBlockedReason !== null;
+	let canUpdate = false;
+	let blockedReason = staticBlockedReason;
+	let installation = null;
+	let checking = false;
+	let checkPromise = null;
+	let pollingStarted = false;
+	let disposed = false;
+	let pollTimer = null;
+	let launching = false;
+	let launchError = null;
+	const refreshCapability = async () => {
+		if (staticBlockedReason) {
+			capabilityChecked = true;
+			canUpdate = false;
+			blockedReason = staticBlockedReason;
+			installation = null;
+			return;
+		}
+		const [installationResult, serviceResult] = await Promise.all([inspectInstallation(environment).then((value) => ({
+			value,
+			error: null
+		}), (cause) => ({
+			value: null,
+			error: cause
+		})), config.daemonLifecycle === "service" ? readServiceStatus().then((value) => ({
+			value,
+			error: null
+		}), (cause) => ({
+			value: null,
+			error: cause
+		})) : Promise.resolve({
+			value: null,
+			error: null
+		})]);
+		capabilityChecked = true;
+		installation = installationResult.value;
+		if (!installation) {
+			canUpdate = false;
+			blockedReason = installationResult.error instanceof Error ? installationResult.error.message : "Treeport could not verify this npm installation.";
+			return;
+		}
+		if (serviceResult.error) {
+			canUpdate = false;
+			blockedReason = "Treeport could not verify the service update lifecycle.";
+			return;
+		}
+		if (serviceResult.value?.mode === "headless" && (serviceResult.value.active || serviceResult.value.daemon?.running)) {
+			canUpdate = false;
+			blockedReason = "Stop the advanced headless service with its administrator action before you update Treeport.";
+			return;
+		}
+		canUpdate = true;
+		blockedReason = null;
+	};
+	const status = async () => {
+		const [progress, result, updateError, resultFileExists, errorFileExists] = await Promise.all([
+			readProgress(config.dataDir),
+			readValidatedJson(resultPath, updateResultSchema),
+			readValidatedJson(errorPath, updateErrorSchema),
+			fileExists(resultPath),
+			fileExists(errorPath)
+		]);
+		if (progress.active) launching = false;
+		const resultMatchesOperation = !result || !progress.operationId || result.operationId === progress.operationId;
+		const errorOperationId = updateError?.error.details?.operationId ?? null;
+		const errorMatchesOperation = !updateError || !errorOperationId || !progress.operationId || errorOperationId === progress.operationId;
+		const available = Boolean(latestVersion && isCanonicalTreeportVersion(currentVersion) && compareTreeportVersions(latestVersion, currentVersion) > 0);
+		const recoveryError = progress.recoveryAction;
+		const cliError = errorMatchesOperation ? updateError?.error : null;
+		const interrupted = Boolean(!progress.active && progress.phase && progress.phase !== "complete" && (resultFileExists || errorFileExists) && !result && !updateError);
+		const error = launchError ?? (cliError ? [cliError.message, cliError.details?.recovery].filter((value, index, values) => Boolean(value && values.indexOf(value) === index)).join(" ") : recoveryError) ?? (interrupted ? "The update process stopped before it returned a result. Retry the update or run `treeport update` on the host." : null);
+		const inactiveFailedPhase = interrupted || progress.phase === "rollback" || progress.phase === "recovery_required";
+		const phase = progress.active ? progress.phase ?? "starting" : launching ? "starting" : launchError || cliError || inactiveFailedPhase ? progress.phase === "recovery_required" ? "recovery_required" : "failed" : result && resultMatchesOperation ? "complete" : progress.phase === "complete" ? "complete" : checking ? "checking" : "idle";
+		return {
+			currentVersion,
+			latestVersion,
+			updateAvailable: available,
+			checkedAt,
+			canUpdate: canUpdate && !progress.active && !launching,
+			blockedReason: capabilityChecked ? blockedReason : "Treeport is checking whether this installation can update itself.",
+			phase,
+			operationId: progress.operationId ?? result?.operationId ?? null,
+			targetVersion: progress.toVersion ?? result?.toVersion ?? latestVersion ?? null,
+			error: error || null
+		};
+	};
+	const check = async () => {
+		if (staticBlockedReason || disposed) return;
+		if ((await readProgress(config.dataDir)).active) return;
+		if (checkPromise) return checkPromise;
+		checking = true;
+		checkPromise = Promise.all([resolveRelease(environment).then((value) => ({
+			value,
+			error: null
+		}), (cause) => ({
+			value: null,
+			error: cause
+		})), refreshCapability()]).then(([releaseResult]) => {
+			if (releaseResult.value) {
+				latestVersion = releaseResult.value.version;
+				checkedAt = (/* @__PURE__ */ new Date()).toISOString();
+			} else console.warn("[Treeport] Application update check failed:", releaseResult.error instanceof Error ? releaseResult.error.message : String(releaseResult.error));
+		});
+		await checkPromise.finally(() => {
+			checking = false;
+			checkPromise = null;
+		});
+	};
+	const scheduleNextCheck = () => {
+		if (disposed || !pollingStarted || staticBlockedReason) return;
+		const delay = pollIntervalMs + Math.floor(random() * pollJitterMs);
+		pollTimer = setTimeout(() => {
+			pollTimer = null;
+			check().finally(scheduleNextCheck);
+		}, delay);
+		pollTimer.unref?.();
+	};
+	return {
+		status,
+		check,
+		beginPolling() {
+			if (pollingStarted || disposed || staticBlockedReason) return;
+			pollingStarted = true;
+			check().finally(scheduleNextCheck);
+		},
+		async start() {
+			const currentStatus = await status();
+			if (!currentStatus.updateAvailable) throw new DomainError("APPLICATION_UPDATE_NOT_AVAILABLE", "A newer stable Treeport release is not available.", 409);
+			if (launching || [
+				"starting",
+				"inspect",
+				"resolve",
+				"stage",
+				"verify",
+				"stop",
+				"activate",
+				"restart",
+				"health_check",
+				"rollback"
+			].includes(currentStatus.phase)) throw new DomainError("APPLICATION_UPDATE_IN_PROGRESS", "Another Treeport update is already running.", 409);
+			launching = true;
+			launchError = null;
+			const launchResult = await (async () => {
+				await refreshCapability();
+				if (!canUpdate || !installation) throw new DomainError("APPLICATION_UPDATE_BLOCKED", blockedReason ?? "This Treeport installation cannot update itself.", 409);
+				const entrypoint = installation.entrypoint;
+				await fs.mkdir(updateDirectory, {
+					recursive: true,
+					mode: 448
+				});
+				await Promise.all([fs.rm(resultPath, { force: true }), fs.rm(errorPath, { force: true })]);
+				const [resultFile, errorFile] = await Promise.all([fs.open(resultPath, "wx", 384), fs.open(errorPath, "wx", 384)]);
+				const spawnResult = await new Promise((resolve, reject) => {
+					const child = spawnProcess(entrypoint, ["update", "--json"], {
+						env: environment,
+						detached: true,
+						shell: false,
+						stdio: [
+							"ignore",
+							resultFile.fd,
+							errorFile.fd
+						]
+					});
+					child.once("spawn", () => resolve(child));
+					child.once("error", reject);
+					child.once("exit", () => {
+						launching = false;
+					});
+				}).then((child) => ({
+					child,
+					error: null
+				}), (cause) => ({
+					child: null,
+					error: cause
+				}));
+				await Promise.all([resultFile.close(), errorFile.close()]);
+				if (!spawnResult.child) throw spawnResult.error instanceof Error ? spawnResult.error : /* @__PURE__ */ new Error("Treeport could not start the update process.");
+				spawnResult.child.unref();
+			})().then(() => ({ error: null }), (cause) => ({ error: cause }));
+			if (launchResult.error) {
+				launching = false;
+				if (launchResult.error instanceof DomainError) throw launchResult.error;
+				launchError = launchResult.error instanceof Error ? launchResult.error.message : "Treeport could not start the update process.";
+				throw new DomainError("APPLICATION_UPDATE_START_FAILED", "Treeport could not start the update process.", 500);
+			}
+			return status();
+		},
+		dispose() {
+			disposed = true;
+			pollingStarted = false;
+			if (pollTimer) {
+				clearTimeout(pollTimer);
+				pollTimer = null;
+			}
+		}
+	};
+}
+//#endregion
 //#region src/server/daemon-ownership.ts
 function processExists(pid) {
 	try {
@@ -7909,7 +8495,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;
@@ -7963,7 +8551,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) {
@@ -8010,14 +8598,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;
@@ -8092,8 +8690,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"));
@@ -8274,7 +8872,7 @@ var TerminalAttachmentManager = class {
 			catch: (cause) => new AttachmentInitializationError(phase, cause)
 		});
 		return Effect.gen(this, function* () {
-			const terminal = yield* promisePhase("refresh_terminal", () => this.service.refreshTerminalStatus(connection.terminalId));
+			const terminal = yield* promisePhase("refresh_terminal", () => this.service.refreshTerminalStatus(connection.terminalId, false));
 			if (!isInitializing()) return;
 			if (terminal.status === "missing") return yield* Effect.fail(new AttachmentInitializationError("refresh_terminal", /* @__PURE__ */ new Error("The tmux session for this terminal is missing")));
 			const worktree = yield* promisePhase("resolve_worktree", () => this.service.getWorktree(terminal.worktreeId));
@@ -8283,12 +8881,12 @@ var TerminalAttachmentManager = class {
 			const initialDimensions = yield* Effect.tryPromise({
 				try: () => this.enqueueTerminal(connection.terminalId, async () => {
 					if (!isInitializing()) return null;
+					const current = this.dimensions.get(connection.terminalId);
+					if (current) return current;
 					await this.tmux.useManualWindowSize(worktree.tmuxSocketName, terminal.tmuxSessionName).catch((cause) => {
 						throw new AttachmentInitializationError("configure_window_size", cause);
 					});
 					if (!isInitializing()) return null;
-					const current = this.dimensions.get(connection.terminalId);
-					if (current) return current;
 					const sessionSize = await this.tmux.sessionSize(worktree.tmuxSocketName, terminal.tmuxSessionName).catch((cause) => {
 						throw new AttachmentInitializationError("read_session_size", cause);
 					});
@@ -8511,11 +9109,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);
@@ -8551,13 +9149,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);
@@ -8757,7 +9355,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) {
@@ -8780,103 +9378,126 @@ function createSocketServer(httpServer, { service, config, tmux, terminalMetadat
 }
 //#endregion
 //#region src/server/index.ts
-const config = loadConfig();
-const ownership = await acquireDaemonOwnership(config);
-const prerequisites = await checkRuntimePrerequisites(config);
-const runner = new SpawnCommandRunner();
-const database = await openDatabase(config.databasePath, { backupDirectory: path.join(config.dataDir, "database-backups") });
-const git = new GitAdapter(runner, config.gitPath);
-const launcherPath = fileURLToPath(new URL("./core/launcher.js", import.meta.url));
-const tmux = new TmuxAdapter(runner, config.runtimeDir, config.tmuxPath, launcherPath);
-const service = new TreeportService({
-	config,
-	database,
-	runner,
-	git,
-	tmux,
-	gh: new GhAdapter(runner, config.ghPath)
-});
-await service.initialize();
-const terminalMetadata = new TerminalMetadataManager(service, tmux, config.tmuxPath);
-await terminalMetadata.initialize();
-const honoListener = getRequestListener(createApp({
-	service,
-	config,
-	tmux,
-	terminalMetadata
-}).fetch);
-let vite = null;
-const server = createServer((request, response) => {
-	const security = authorizeRequest(request);
-	if (!security.allowed) {
-		rejectHttpRequest(request, response, security);
-		return;
-	}
-	service.handleWebPanelDevelopmentRequest(request, response, () => {
-		if (vite && !request.url?.startsWith("/api")) {
-			vite.middlewares(request, response, () => {
+async function main() {
+	const config = loadConfig();
+	const updateStartup = await createUpdateStartupReporter(config);
+	try {
+		const ownership = await acquireDaemonOwnership(config);
+		const prerequisites = await checkRuntimePrerequisites(config);
+		const runner = new SpawnCommandRunner();
+		await updateStartup.databaseOpening();
+		const database = await openDatabase(config.databasePath, { backupDirectory: path.join(config.dataDir, "database-backups") });
+		await updateStartup.databaseOpened({
+			migrationState: database.migrationState,
+			snapshotPaths: database.migrationSnapshotPaths
+		});
+		const git = new GitAdapter(runner, config.gitPath);
+		const launcherPath = fileURLToPath(new URL("./core/launcher.js", import.meta.url));
+		const tmux = new TmuxAdapter(runner, config.runtimeDir, config.tmuxPath, launcherPath);
+		const service = new TreeportService({
+			config,
+			database,
+			runner,
+			git,
+			tmux,
+			gh: new GhAdapter(runner, config.ghPath)
+		});
+		await service.initialize();
+		const terminalMetadata = new TerminalMetadataManager(service, tmux, config.tmuxPath);
+		await terminalMetadata.initialize();
+		const applicationUpdate = createApplicationUpdateManager(config);
+		const honoListener = getRequestListener(createApp({
+			service,
+			config,
+			tmux,
+			applicationUpdate,
+			terminalMetadata
+		}).fetch);
+		let vite = null;
+		const server = createServer((request, response) => {
+			const security = authorizeRequest(request);
+			if (!security.allowed) {
+				rejectHttpRequest(request, response, security);
+				return;
+			}
+			service.handleWebPanelDevelopmentRequest(request, response, () => {
+				if (vite && !request.url?.startsWith("/api")) {
+					vite.middlewares(request, response, () => {
+						honoListener(request, response);
+					});
+					return;
+				}
 				honoListener(request, response);
 			});
-			return;
-		}
-		honoListener(request, response);
-	});
-});
-server.on("upgrade", (request, socket) => {
-	const security = authorizeRequest(request, { socketUpgrade: true });
-	if (security.allowed) return;
-	const statusText = security.status === 400 ? "Bad Request" : security.status === 403 ? "Forbidden" : "Unauthorized";
-	socket.write(`HTTP/1.1 ${security.status} ${statusText}\r\nConnection: close\r\nCache-Control: no-store\r\n\r\n`);
-	socket.destroy();
-});
-if (config.webDevelopment) {
-	const { createServer: createViteServer } = await import("vite");
-	vite = await createViteServer({
-		configFile: path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../../vite.config.ts"),
-		appType: "spa",
-		server: {
-			middlewareMode: true,
-			hmr: { server }
+		});
+		server.on("upgrade", (request, socket) => {
+			const security = authorizeRequest(request, { socketUpgrade: true });
+			if (security.allowed) return;
+			const statusText = security.status === 400 ? "Bad Request" : security.status === 403 ? "Forbidden" : "Unauthorized";
+			socket.write(`HTTP/1.1 ${security.status} ${statusText}\r\nConnection: close\r\nCache-Control: no-store\r\n\r\n`);
+			socket.destroy();
+		});
+		if (config.webDevelopment) {
+			const { createServer: createViteServer } = await import("vite");
+			vite = await createViteServer({
+				configFile: path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../../vite.config.ts"),
+				appType: "spa",
+				server: {
+					middlewareMode: true,
+					hmr: { server }
+				}
+			});
 		}
-	});
-}
-service.attachHttpServer(server);
-const { io, attachments } = createSocketServer(server, {
-	service,
-	config,
-	tmux,
-	terminalMetadata
-});
-await new Promise((resolve, reject) => {
-	server.once("error", reject);
-	server.listen(config.port, config.host, () => {
-		server.off("error", reject);
-		resolve();
-	});
-});
-await ownership.publish();
-console.log(`Treeport ${config.appVersion} listening on ${config.apiUrl}`);
-console.log(`database: ${config.databasePath}`);
-console.log(`git: ${prerequisites.gitVersion}`);
-console.log(`tmux: ${prerequisites.tmuxVersion}`);
-let shuttingDown = false;
-function shutdown() {
-	if (shuttingDown) return;
-	shuttingDown = true;
-	attachments.dispose();
-	terminalMetadata.dispose();
-	io.close(() => {
-		Promise.all([service.drainMutations(), terminalMetadata.drain()]).then(async () => {
-			await service.disposeWebPanelRuntime();
-			await vite?.close();
-			database.close();
-			await ownership.release();
-			process.exit(0);
+		service.attachHttpServer(server);
+		const { io, attachments } = createSocketServer(server, {
+			service,
+			config,
+			tmux,
+			terminalMetadata
 		});
-	});
-	setTimeout(() => process.exit(1), 5e3).unref();
+		await new Promise((resolve, reject) => {
+			server.once("error", reject);
+			server.listen(config.port, config.host, () => {
+				server.off("error", reject);
+				resolve();
+			});
+		});
+		await ownership.publish();
+		await updateStartup.ready();
+		applicationUpdate.beginPolling();
+		console.log(`Treeport ${config.appVersion} listening on ${config.apiUrl}`);
+		console.log(`database: ${config.databasePath}`);
+		console.log(`git: ${prerequisites.gitVersion}`);
+		console.log(`tmux: ${prerequisites.tmuxVersion}`);
+		let shuttingDown = false;
+		function shutdown() {
+			if (shuttingDown) return;
+			shuttingDown = true;
+			applicationUpdate.dispose();
+			attachments.dispose();
+			terminalMetadata.dispose();
+			const viteClosed = vite?.close();
+			io.close(() => {
+				Promise.all([
+					service.drainMutations(),
+					terminalMetadata.drain(),
+					viteClosed
+				]).then(async () => {
+					await service.disposeWebPanelRuntime();
+					database.close();
+					await ownership.release();
+					process.exit(0);
+				});
+			});
+			setTimeout(() => process.exit(1), 5e3).unref();
+		}
+		process.once("SIGINT", shutdown);
+		process.once("SIGTERM", shutdown);
+	} catch (error) {
+		await updateStartup.failed(error instanceof Error ? error : new Error(String(error)));
+		throw error;
+	}
 }
-process.once("SIGINT", shutdown);
-process.once("SIGTERM", shutdown);
+await main();
 //#endregion
 export {};