workerdeck 3.0.1 → 3.2.0

package/build/{instance-CTA80T2q.mjs → instance-BmQhZ3Px.mjs}

@@ -1,9 +1,9 @@
 import { createReadStream, existsSync } from "node:fs";
 import { dirname, isAbsolute, join, resolve, sep } from "node:path";
-import { createFileProfileStore, createFileSessionStore, createFileSpendStore, createWorkerServer } from "@workerdeck/server";
+import { createFileProfileStore, createFileSessionStore, createFileSpendStore, createWorkerServer, readJsonOr, writeJsonAtomic } from "@workerdeck/server";
 import { dashboardDir } from "@workerdeck/web";
-import { chmod, mkdir, readFile, rename, stat, writeFile } from "node:fs/promises";
 import { createHash, createHmac, createPrivateKey, randomBytes, sign, timingSafeEqual } from "node:crypto";
+import { chmod, mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import { connect, constants } from "node:http2";
 import { CHECKLIST_TEXT_MAX, isAgentRecord, parseUserQuestions, subagentLabel } from "@workerdeck/protocol";
 import { homedir } from "node:os";
@@ -40,14 +40,90 @@ function respondJson(res, status, body, headers) {
 		...headers
 	}).end(JSON.stringify(body));
 }
+async function isAuthenticated(authenticate, req) {
+	const principal = await authenticate(req);
+	return principal !== null && principal !== void 0 && principal !== false;
+}
+function isJsonRequest(req) {
+	return (req.headers["content-type"] ?? "").split(";")[0].trim().toLowerCase() === "application/json";
+}
 //#endregion
-//#region src/apns/activities.ts
-const FILENAME$1 = "apns-activities.json";
-const TOKEN_PATTERN$1 = /^[0-9a-fA-F]{32,200}$/;
-const MAX_BODY_BYTES$1 = 4096;
-function isEnvironment$1(value) {
+//#region src/apns/json-registry.ts
+const TOKEN_PATTERN = /^[0-9a-fA-F]{32,200}$/;
+const MAX_BODY_BYTES = 4096;
+function isEnvironment(value) {
 	return value === "development" || value === "production";
 }
+function jsonRecordFile(options, filename, field) {
+	const path = options.dir === null ? null : join(options.dir, filename);
+	return {
+		load: async () => {
+			if (path === null) return [];
+			const records = (await readJsonOr(path, null))?.[field];
+			return Array.isArray(records) ? records : [];
+		},
+		save: async (records) => {
+			if (path === null) return;
+			try {
+				await writeJsonAtomic(path, { [field]: records }, {
+					indent: 2,
+					trailingNewline: true
+				});
+			} catch (error) {
+				options.onError?.(error, {
+					op: "write",
+					path
+				});
+			}
+		}
+	};
+}
+function jsonPushRoute(route, registry, authenticate, handle) {
+	return async (req, res) => {
+		let pathname;
+		try {
+			pathname = new URL(req.url ?? "/", "http://internal").pathname;
+		} catch {
+			return false;
+		}
+		if (pathname !== route) return false;
+		if (registry === null) {
+			res.writeHead(404, { "content-type": "text/plain; charset=utf-8" });
+			res.end("this gateway runs without push\n");
+			return true;
+		}
+		if (req.method !== "POST" && req.method !== "DELETE") {
+			res.writeHead(405, { allow: "POST, DELETE" }).end();
+			return true;
+		}
+		if (!await isAuthenticated(authenticate, req)) {
+			respondJson(res, 401, { error: "unauthorized" });
+			return true;
+		}
+		if (!isJsonRequest(req)) {
+			respondJson(res, 415, { error: "expected content-type application/json" });
+			return true;
+		}
+		const raw = await readBody(req, MAX_BODY_BYTES);
+		if (raw === null) {
+			respondJson(res, 413, { error: "body too large" });
+			res.once("finish", () => req.destroy());
+			return true;
+		}
+		let body;
+		try {
+			body = JSON.parse(raw);
+		} catch {
+			respondJson(res, 400, { error: "invalid JSON body" });
+			return true;
+		}
+		await handle(registry, req, res, body);
+		return true;
+	};
+}
+//#endregion
+//#region src/apns/activities.ts
+const FILENAME$1 = "apns-activities.json";
 function keyOf(deviceToken, sessionId) {
 	return `${deviceToken}:${sessionId}`;
 }
@@ -64,28 +140,10 @@ function persistable(record) {
 	};
 }
 async function createActivityRegistry(options) {
-	const path = options.dir === null ? null : join(options.dir, FILENAME$1);
+	const file = jsonRecordFile(options, FILENAME$1, "activities");
 	const records = /* @__PURE__ */ new Map();
-	if (path !== null) try {
-		const parsed = JSON.parse(await readFile(path, "utf8"));
-		for (const record of parsed.activities ?? []) if (typeof record?.deviceToken === "string" && typeof record.sessionId === "string" && isEnvironment$1(record.environment)) records.set(keyOf(record.deviceToken, record.sessionId), record);
-	} catch {}
-	const persist = async () => {
-		if (path === null) return;
-		try {
-			await mkdir(options.dir, {
-				recursive: true,
-				mode: 448
-			});
-			await writeFile(path, `${JSON.stringify({ activities: [...records.values()].map(persistable) }, null, 2)}\n`, { mode: 384 });
-			await chmod(path, 384);
-		} catch (error) {
-			options.onError?.(error, {
-				op: "write",
-				path
-			});
-		}
-	};
+	for (const record of await file.load()) if (typeof record?.deviceToken === "string" && typeof record.sessionId === "string" && isEnvironment(record.environment)) records.set(keyOf(record.deviceToken, record.sessionId), record);
+	const persist = () => file.save([...records.values()].map(persistable));
 	return {
 		list: () => [...records.values()],
 		get: (deviceToken, sessionId) => records.get(keyOf(deviceToken, sessionId)),
@@ -134,74 +192,40 @@ async function createActivityRegistry(options) {
 	};
 }
 function createActivityRoute(registry, authenticate) {
-	return async (req, res) => {
-		let pathname;
-		try {
-			pathname = new URL(req.url ?? "/", "http://internal").pathname;
-		} catch {
-			return false;
-		}
-		if (pathname !== "/apns/activities") return false;
-		if (registry === null) {
-			res.writeHead(404, { "content-type": "text/plain; charset=utf-8" });
-			res.end("this gateway runs without push\n");
-			return true;
-		}
-		if (req.method !== "POST" && req.method !== "DELETE") {
-			res.writeHead(405, { allow: "POST, DELETE" }).end();
-			return true;
-		}
-		if (authenticate(req) === null) {
-			respondJson(res, 401, { error: "unauthorized" });
-			return true;
-		}
-		const raw = await readBody(req, MAX_BODY_BYTES$1);
-		if (raw === null) {
-			respondJson(res, 413, { error: "body too large" });
-			res.once("finish", () => req.destroy());
-			return true;
-		}
-		let body;
-		try {
-			body = JSON.parse(raw);
-		} catch {
-			respondJson(res, 400, { error: "invalid JSON body" });
-			return true;
-		}
+	return jsonPushRoute("/apns/activities", registry, authenticate, async (activities, req, res, body) => {
 		const token = body.token;
-		if (typeof token !== "string" || !TOKEN_PATTERN$1.test(token)) {
+		if (typeof token !== "string" || !TOKEN_PATTERN.test(token)) {
 			respondJson(res, 400, { error: "token must be a hex Live Activity update token" });
-			return true;
+			return;
 		}
 		if (req.method === "DELETE") {
-			await registry.removeByUpdateToken(token);
+			await activities.removeByUpdateToken(token);
 			res.writeHead(204).end();
-			return true;
+			return;
 		}
 		const sessionId = body.sessionId;
 		if (typeof sessionId !== "string" || sessionId === "") {
 			respondJson(res, 400, { error: "sessionId is required" });
-			return true;
+			return;
 		}
-		if (!isEnvironment$1(body.environment)) {
+		if (!isEnvironment(body.environment)) {
 			respondJson(res, 400, { error: "environment must be 'development' or 'production'" });
-			return true;
+			return;
 		}
-		const deviceToken = typeof body.deviceToken === "string" && TOKEN_PATTERN$1.test(body.deviceToken) ? body.deviceToken : void 0;
-		if (await registry.attach({
+		const deviceToken = typeof body.deviceToken === "string" && TOKEN_PATTERN.test(body.deviceToken) ? body.deviceToken : void 0;
+		if (await activities.attach({
 			sessionId,
 			deviceToken,
 			environment: body.environment
 		}, token) === void 0) {
 			respondJson(res, 404, { error: "no activity awaiting a token for this session" });
-			return true;
+			return;
 		}
 		respondJson(res, 200, {
 			attached: true,
 			sessionId
 		});
-		return true;
-	};
+	});
 }
 //#endregion
 //#region src/apns/devices.ts
@@ -217,11 +241,6 @@ const DEFAULT_NOTIFY = [
 	"session_error"
 ];
 const FILENAME = "apns-devices.json";
-const TOKEN_PATTERN = /^[0-9a-fA-F]{32,200}$/;
-const MAX_BODY_BYTES = 4096;
-function isEnvironment(value) {
-	return value === "development" || value === "production";
-}
 function isNotifyList(value) {
 	return Array.isArray(value) && value.every((entry) => NOTIFY_EVENTS.includes(entry));
 }
@@ -229,32 +248,17 @@ function sameNotify(a, b) {
 	if (a === void 0 || b === void 0) return a === b;
 	return a.length === b.length && a.every((entry, index) => entry === b[index]);
 }
+function optionalString(value) {
+	return typeof value === "string" && value.length > 0 && value.length <= 200 ? value : void 0;
+}
 function wantsNotification(device, type) {
 	return (device.notify ?? DEFAULT_NOTIFY).includes(type);
 }
 async function createDeviceRegistry(options) {
-	const path = options.dir === null ? null : join(options.dir, FILENAME);
+	const file = jsonRecordFile(options, FILENAME, "devices");
 	const devices = /* @__PURE__ */ new Map();
-	if (path !== null) try {
-		const parsed = JSON.parse(await readFile(path, "utf8"));
-		for (const record of parsed.devices ?? []) if (typeof record?.token === "string" && isEnvironment(record.environment)) devices.set(record.token, record);
-	} catch {}
-	const persist = async () => {
-		if (path === null) return;
-		try {
-			await mkdir(options.dir, {
-				recursive: true,
-				mode: 448
-			});
-			await writeFile(path, `${JSON.stringify({ devices: [...devices.values()] }, null, 2)}\n`, { mode: 384 });
-			await chmod(path, 384);
-		} catch (error) {
-			options.onError?.(error, {
-				op: "write",
-				path
-			});
-		}
-	};
+	for (const record of await file.load()) if (typeof record?.token === "string" && isEnvironment(record.environment)) devices.set(record.token, record);
+	const persist = () => file.save([...devices.values()]);
 	return {
 		list: () => [...devices.values()],
 		async register(record) {
@@ -279,70 +283,40 @@ async function createDeviceRegistry(options) {
 	};
 }
 function createDeviceRoute(registry, authenticate) {
-	return async (req, res) => {
-		let pathname;
-		try {
-			pathname = new URL(req.url ?? "/", "http://internal").pathname;
-		} catch {
-			return false;
-		}
-		if (pathname !== "/apns/devices") return false;
-		if (registry === null) {
-			res.writeHead(404, { "content-type": "text/plain; charset=utf-8" });
-			res.end("this gateway runs without push\n");
-			return true;
-		}
-		if (req.method !== "POST" && req.method !== "DELETE") {
-			res.writeHead(405, { allow: "POST, DELETE" }).end();
-			return true;
-		}
-		if (authenticate(req) === null) {
-			respondJson(res, 401, { error: "unauthorized" });
-			return true;
-		}
-		const raw = await readBody(req, MAX_BODY_BYTES);
-		if (raw === null) {
-			respondJson(res, 413, { error: "body too large" });
-			res.once("finish", () => req.destroy());
-			return true;
-		}
-		let body;
-		try {
-			body = JSON.parse(raw);
-		} catch {
-			respondJson(res, 400, { error: "invalid JSON body" });
-			return true;
-		}
+	return jsonPushRoute("/apns/devices", registry, authenticate, async (devices, req, res, body) => {
 		const token = body.token;
 		if (typeof token !== "string" || !TOKEN_PATTERN.test(token)) {
 			respondJson(res, 400, { error: "token must be a hex APNs device token" });
-			return true;
+			return;
 		}
 		if (req.method === "DELETE") {
-			await registry.remove(token);
+			await devices.remove(token);
 			res.writeHead(204).end();
-			return true;
+			return;
 		}
 		if (!isEnvironment(body.environment)) {
 			respondJson(res, 400, { error: "environment must be 'development' or 'production'" });
-			return true;
+			return;
 		}
-		const optionalString = (value) => typeof value === "string" && value.length > 0 && value.length <= 200 ? value : void 0;
 		const startTokenGiven = Object.hasOwn(body, "liveActivityStartToken");
 		const startToken = body.liveActivityStartToken;
 		if (startTokenGiven && startToken !== null && (typeof startToken !== "string" || !TOKEN_PATTERN.test(startToken))) {
 			respondJson(res, 400, { error: "liveActivityStartToken must be a hex token or null" });
-			return true;
+			return;
 		}
 		const notifyGiven = Object.hasOwn(body, "notify");
 		if (notifyGiven && !isNotifyList(body.notify)) {
 			respondJson(res, 400, { error: `notify must be an array of ${NOTIFY_EVENTS.join(", ")}` });
-			return true;
+			return;
+		}
+		const previous = devices.list().find((record) => record.token === token);
+		if (previous === void 0 && devices.list().length >= 64) {
+			respondJson(res, 409, { error: `device limit reached (64); unregister one first` });
+			return;
 		}
-		const previous = registry.list().find((record) => record.token === token);
 		const liveActivityStartToken = startTokenGiven ? startToken ?? void 0 : previous?.liveActivityStartToken;
 		const notify = notifyGiven ? body.notify : previous?.notify;
-		await registry.register({
+		await devices.register({
 			token,
 			environment: body.environment,
 			hostId: optionalString(body.hostId),
@@ -355,8 +329,7 @@ function createDeviceRoute(registry, authenticate) {
 			registered: true,
 			environment: body.environment
 		});
-		return true;
-	};
+	});
 }
 //#endregion
 //#region src/apns/routes.ts
@@ -834,16 +807,6 @@ const CATEGORY = {
 	permission: "PERMISSION_REQUEST",
 	event: "SESSION_EVENT"
 };
-function label(session) {
-	const title = session.title?.trim();
-	if (title !== void 0 && title !== "") return title;
-	const leaf = session.cwd.split("/").filter(Boolean).at(-1);
-	return leaf !== void 0 && leaf !== "" ? leaf : session.id;
-}
-function oneLine(text, limit = BODY_LIMIT) {
-	const flat = (text ?? "").replace(/\s+/g, " ").trim();
-	return flat.length <= limit ? flat : `${flat.slice(0, limit - 1)}…`;
-}
 function collapseKey(sessionId) {
 	return createHash("sha256").update(sessionId).digest("base64url").slice(0, 32);
 }
@@ -863,7 +826,7 @@ function titleFor(notification, name) {
 	}
 }
 function bodyFor(notification) {
-	const preview = oneLine(notification.preview);
+	const preview = clamp(notification.preview ?? "", BODY_LIMIT);
 	if (preview !== "") return preview;
 	switch (notification.type) {
 		case "permission_requested": return "The agent is waiting for your approval.";
@@ -874,7 +837,7 @@ function bodyFor(notification) {
 }
 function buildPush(notification, hostId) {
 	const permission = notification.type === "permission_requested";
-	const name = label(notification.session);
+	const name = sessionLabel(notification.session);
 	let body = bodyFor(notification);
 	const build = (text) => ({
 		aps: {
@@ -895,7 +858,7 @@ function buildPush(notification, hostId) {
 	});
 	let payload = build(body);
 	while (Buffer.byteLength(JSON.stringify(payload)) > MAX_PAYLOAD_BYTES && body.length > 16) {
-		body = oneLine(body, Math.floor(body.length / 2));
+		body = clamp(body, Math.floor(body.length / 2));
 		payload = build(body);
 	}
 	return {
@@ -1328,15 +1291,8 @@ async function createAuthSessionStore(options) {
 			version: FORMAT_VERSION,
 			sessions: entries.map(([key, s]) => [key, s.expiresAt])
 		};
-		const tmp = `${path}.${process.pid}.tmp`;
 		try {
-			await mkdir(dirname(path), {
-				recursive: true,
-				mode: 448
-			});
-			await writeFile(tmp, `${JSON.stringify(body)}\n`, { mode: 384 });
-			await chmod(tmp, 384);
-			await rename(tmp, path);
+			await writeJsonAtomic(path, body, { trailingNewline: true });
 			warned = false;
 		} catch (error) {
 			if (!warned) {
@@ -1354,328 +1310,423 @@ async function createAuthSessionStore(options) {
 	};
 }
 //#endregion
-//#region src/auth/auth.ts
-const MIN_SECRET_LENGTH = 12;
-const DEFAULT_COOKIE_NAME = "workerdeck_session";
-const DEFAULT_TTL_MS = 6048e5;
-const DEFAULT_THROTTLE_WINDOW_MS = 9e5;
-const DEFAULT_MAX_FAILURES_PER_IP = 10;
-const DEFAULT_MAX_FAILURES_GLOBAL = 100;
-const MAX_SESSIONS = 100;
-const MAX_LOGIN_BODY_BYTES = 4096;
+//#region src/auth/origin.ts
 const SAFE_METHODS = /* @__PURE__ */ new Set([
 	"GET",
 	"HEAD",
 	"OPTIONS"
 ]);
-function sha256(value) {
-	return createHash("sha256").update(value).digest();
-}
-function createCliAuth(options = {}) {
-	const { secret } = options;
-	const enabled = secret !== void 0;
-	if (secret !== void 0 && secret.length < MIN_SECRET_LENGTH) throw new Error(`createCliAuth: secret must be at least ${MIN_SECRET_LENGTH} characters - use a long random value, or leave it unset to run without auth on loopback`);
-	const cookieName = options.cookieName ?? DEFAULT_COOKIE_NAME;
-	const ttlMs = options.ttlMs ?? DEFAULT_TTL_MS;
-	if (!(ttlMs > 0)) throw new Error("createCliAuth: ttlMs must be positive");
-	const trustProxy = options.trustProxy === true;
-	const windowMs = options.throttle?.windowMs ?? DEFAULT_THROTTLE_WINDOW_MS;
-	const maxFailuresPerIp = options.throttle?.maxFailuresPerIp ?? DEFAULT_MAX_FAILURES_PER_IP;
-	const maxFailuresGlobal = options.throttle?.maxFailuresGlobal ?? DEFAULT_MAX_FAILURES_GLOBAL;
-	const allowedOrigins = new Set((options.allowedOrigins ?? []).map((entry) => {
+function parseAllowedOrigins(entries) {
+	return new Set(entries.map((entry) => {
 		try {
 			return new URL(entry).origin;
 		} catch {
 			throw new Error(`createCliAuth: allowedOrigins entry is not a valid origin: ${JSON.stringify(entry)}`);
 		}
 	}));
-	const secretDigest = secret === void 0 ? void 0 : sha256(secret);
-	const secretMatches = (candidate) => secretDigest !== void 0 && timingSafeEqual(sha256(candidate), secretDigest);
-	const sessions = /* @__PURE__ */ new Map();
-	const store = options.sessions;
-	const tokenKey = (token) => secret === void 0 ? sha256(token).toString("hex") : createHmac("sha256", secret).update(token).digest("hex");
-	if (store?.initial !== void 0) for (const [key, entry] of store.initial) {
-		if (sessions.size >= MAX_SESSIONS) break;
-		sessions.set(key, { expiresAt: entry.expiresAt });
+}
+function isLoopbackAddress(ip) {
+	return ip === "::1" || ip.startsWith("127.") || ip.startsWith("::ffff:127.");
+}
+function forwardedLast(value) {
+	if (value === void 0) return;
+	const last = (Array.isArray(value) ? value.join(",") : value).split(",").at(-1)?.trim();
+	return last === "" ? void 0 : last;
+}
+function isSecure(req, trustProxy) {
+	if (req.socket.encrypted === true) return true;
+	return trustProxy && forwardedLast(req.headers["x-forwarded-proto"])?.toLowerCase() === "https";
+}
+function clientIp(req, trustProxy) {
+	return (trustProxy ? forwardedLast(req.headers["x-forwarded-for"]) : void 0) ?? req.socket.remoteAddress ?? "unknown";
+}
+function isUpgradeRequest(req) {
+	const upgrade = req.headers.upgrade;
+	return typeof upgrade === "string" && upgrade.toLowerCase().includes("websocket");
+}
+function isUnsafeMethod(req) {
+	return !SAFE_METHODS.has((req.method ?? "GET").toUpperCase());
+}
+function originVerdict(req, policy) {
+	const raw = req.headers.origin;
+	if (raw === void 0) return "absent";
+	let origin;
+	try {
+		origin = new URL(raw).origin;
+	} catch {
+		return "foreign";
 	}
-	const persist = () => store?.save([...sessions]);
-	const createSession = () => {
-		if (sessions.size >= MAX_SESSIONS) {
-			const oldest = sessions.keys().next().value;
-			if (oldest !== void 0) sessions.delete(oldest);
-		}
-		const token = randomBytes(32).toString("base64url");
-		sessions.set(tokenKey(token), { expiresAt: Date.now() + ttlMs });
-		persist();
-		return token;
-	};
-	const cookieToken = (req) => {
-		const header = req.headers.cookie;
-		if (typeof header !== "string") return;
-		for (const part of header.split(";")) {
-			const eq = part.indexOf("=");
-			if (eq === -1) continue;
-			if (part.slice(0, eq).trim() === cookieName) return part.slice(eq + 1).trim();
-		}
-	};
-	const hasSession = (req) => {
-		const token = cookieToken(req);
-		if (token === void 0 || token === "") return false;
-		const key = tokenKey(token);
-		const entry = sessions.get(key);
-		if (entry === void 0) return false;
-		if (entry.expiresAt <= Date.now()) {
-			sessions.delete(key);
-			persist();
-			return false;
-		}
-		return true;
-	};
-	const forwardedLast = (value) => {
-		if (value === void 0) return;
-		const last = (Array.isArray(value) ? value.join(",") : value).split(",").at(-1)?.trim();
-		return last === "" ? void 0 : last;
-	};
-	const isSecure = (req) => {
-		if (req.socket.encrypted === true) return true;
-		return trustProxy && forwardedLast(req.headers["x-forwarded-proto"])?.toLowerCase() === "https";
-	};
-	const expectedOrigin = (req) => {
-		const host = (trustProxy ? forwardedLast(req.headers["x-forwarded-host"]) : void 0) ?? req.headers.host;
-		if (host === void 0 || host === "") return null;
-		try {
-			return new URL(`${isSecure(req) ? "https" : "http"}://${host}`).origin;
-		} catch {
-			return null;
-		}
-	};
-	const originVerdict = (req) => {
-		const raw = req.headers.origin;
-		if (raw === void 0) return "absent";
-		let origin;
-		try {
-			origin = new URL(raw).origin;
-		} catch {
-			return "foreign";
-		}
-		if (allowedOrigins.has(origin)) return "ok";
-		const expected = expectedOrigin(req);
-		return expected !== null && origin === expected ? "ok" : "foreign";
-	};
-	const headerSecret = (req) => {
-		const key = req.headers["x-workerdeck-key"];
-		if (typeof key === "string" && key !== "") return key;
-		const authorization = req.headers.authorization;
-		if (typeof authorization === "string") {
-			const match = /^Bearer\s+(.+)$/i.exec(authorization);
-			if (match !== null) return match[1];
-		}
-	};
-	const openPrincipal = {
-		via: "open",
-		canManageProfiles: true
-	};
-	const isUpgradeRequest = (req) => {
-		const upgrade = req.headers.upgrade;
-		return typeof upgrade === "string" && upgrade.toLowerCase().includes("websocket");
-	};
-	const querySecret = (req) => {
-		if (!isUpgradeRequest(req)) return;
-		const key = new URL(req.url ?? "/", "http://internal").searchParams.get("key");
-		return key !== null && key !== "" ? key : void 0;
-	};
-	const authenticate = (req) => {
-		if (!enabled) return openPrincipal;
-		const provided = headerSecret(req) ?? querySecret(req);
-		if (provided !== void 0) return secretMatches(provided) ? {
-			via: "header",
-			canManageProfiles: true
-		} : null;
-		if (!hasSession(req)) return null;
-		const verdict = originVerdict(req);
-		if (verdict === "foreign") return null;
-		const isUpgrade = isUpgradeRequest(req);
-		const unsafe = !SAFE_METHODS.has((req.method ?? "GET").toUpperCase());
-		if ((isUpgrade || unsafe) && verdict !== "ok") return null;
-		return {
-			via: "cookie",
-			canManageProfiles: true
-		};
-	};
-	const failures = /* @__PURE__ */ new Map();
-	const globalFailures = {
-		count: 0,
-		windowStart: 0
-	};
-	const clientIp = (req) => (trustProxy ? forwardedLast(req.headers["x-forwarded-for"]) : void 0) ?? req.socket.remoteAddress ?? "unknown";
-	const blockedMs = (entry, max, now) => entry !== void 0 && entry.count >= max && now - entry.windowStart < windowMs ? entry.windowStart + windowMs - now : 0;
-	const loginBlockedMs = (ip, now) => Math.max(blockedMs(failures.get(ip), maxFailuresPerIp, now), blockedMs(globalFailures, maxFailuresGlobal, now));
-	const recordFailure = (ip, now) => {
-		if (failures.size > 256) {
-			for (const [key, entry] of failures) if (now - entry.windowStart >= windowMs) failures.delete(key);
-		}
-		const entry = failures.get(ip);
-		if (entry === void 0 || now - entry.windowStart >= windowMs) failures.set(ip, {
-			count: 1,
-			windowStart: now
-		});
-		else entry.count += 1;
-		if (now - globalFailures.windowStart >= windowMs) {
-			globalFailures.count = 1;
-			globalFailures.windowStart = now;
-		} else globalFailures.count += 1;
-	};
-	const cookieAttributes = (req) => {
-		const attrs = [
-			"Path=/",
-			"HttpOnly",
-			"SameSite=Lax"
-		];
-		if (isSecure(req)) attrs.push("Secure");
-		return attrs;
+	if (policy.allowedOrigins.has(origin)) return "ok";
+	const expected = expectedOrigin(req, policy.trustProxy);
+	return expected !== null && origin === expected ? "ok" : "foreign";
+}
+function isCrossSiteBrowserRequest(req, policy) {
+	if (originVerdict(req, policy) === "foreign") return true;
+	return (isUnsafeMethod(req) || isUpgradeRequest(req)) && req.headers["sec-fetch-site"] === "cross-site";
+}
+function cookieOriginAccepted(req, policy) {
+	const verdict = originVerdict(req, policy);
+	if (verdict === "foreign") return false;
+	return !((isUpgradeRequest(req) || isUnsafeMethod(req)) && verdict !== "ok");
+}
+function expectedOrigin(req, trustProxy) {
+	const host = (trustProxy ? forwardedLast(req.headers["x-forwarded-host"]) : void 0) ?? req.headers.host;
+	if (host === void 0 || host === "") return null;
+	try {
+		return new URL(`${isSecure(req, trustProxy) ? "https" : "http"}://${host}`).origin;
+	} catch {
+		return null;
+	}
+}
+//#endregion
+//#region src/auth/secret.ts
+function sha256(value) {
+	return createHash("sha256").update(value).digest();
+}
+function secretMatcher(secret) {
+	const digest = secret === void 0 ? void 0 : sha256(secret);
+	return (candidate) => digest !== void 0 && timingSafeEqual(sha256(candidate), digest);
+}
+function headerSecret(req) {
+	const key = req.headers["x-workerdeck-key"];
+	if (typeof key === "string" && key !== "") return key;
+	const authorization = req.headers.authorization;
+	if (typeof authorization === "string") {
+		const match = /^Bearer\s+(.+)$/i.exec(authorization);
+		if (match !== null) return match[1];
+	}
+}
+function querySecret(req) {
+	if (!isUpgradeRequest(req)) return;
+	const key = new URL(req.url ?? "/", "http://internal").searchParams.get("key");
+	return key !== null && key !== "" ? key : void 0;
+}
+//#endregion
+//#region src/auth/cookie-sessions.ts
+const MAX_SESSIONS = 100;
+function createCookieSessions(options) {
+	const entries = /* @__PURE__ */ new Map();
+	for (const [key, entry] of options.store?.initial ?? []) {
+		if (entries.size >= MAX_SESSIONS) break;
+		entries.set(key, { expiresAt: entry.expiresAt });
+	}
+	return {
+		...options,
+		entries
 	};
-	const setCookieValue = (token, req) => [
-		`${cookieName}=${token}`,
-		`Max-Age=${Math.ceil(ttlMs / 1e3)}`,
-		...cookieAttributes(req)
+}
+function mintSession(sessions) {
+	if (sessions.entries.size >= MAX_SESSIONS) {
+		const oldest = sessions.entries.keys().next().value;
+		if (oldest !== void 0) sessions.entries.delete(oldest);
+	}
+	const token = randomBytes(32).toString("base64url");
+	sessions.entries.set(tokenKey(sessions, token), { expiresAt: Date.now() + sessions.ttlMs });
+	persist(sessions);
+	return token;
+}
+function hasSession(sessions, req) {
+	const token = cookieToken(sessions, req);
+	if (token === void 0 || token === "") return false;
+	const key = tokenKey(sessions, token);
+	const entry = sessions.entries.get(key);
+	if (entry === void 0) return false;
+	if (entry.expiresAt <= Date.now()) {
+		sessions.entries.delete(key);
+		persist(sessions);
+		return false;
+	}
+	return true;
+}
+function revokeSession(sessions, req) {
+	const token = cookieToken(sessions, req);
+	if (token !== void 0 && token !== "" && sessions.entries.delete(tokenKey(sessions, token))) persist(sessions);
+}
+function setCookieValue(sessions, token, req) {
+	return [
+		`${sessions.cookieName}=${token}`,
+		`Max-Age=${Math.ceil(sessions.ttlMs / 1e3)}`,
+		...cookieAttributes(sessions, req)
 	].join("; ");
-	const clearCookieValue = (req) => [
-		`${cookieName}=`,
+}
+function clearCookieValue(sessions, req) {
+	return [
+		`${sessions.cookieName}=`,
 		"Max-Age=0",
-		...cookieAttributes(req)
+		...cookieAttributes(sessions, req)
 	].join("; ");
-	const respondRedirect = (res, location, headers) => {
-		res.writeHead(303, {
-			location,
-			"cache-control": "no-store",
-			...headers
-		}).end();
-	};
-	const wantsJson = (req) => (req.headers.accept ?? "").includes("application/json");
-	const handleLogin = async (req, res) => {
-		const json = wantsJson(req);
-		if (!enabled) {
-			respondJson(res, 409, { error: "auth is disabled: no secret is configured" });
-			return;
-		}
-		if (originVerdict(req) === "foreign") {
-			respondJson(res, 403, { error: "origin not allowed" });
-			return;
-		}
-		const ip = clientIp(req);
-		const blocked = loginBlockedMs(ip, Date.now());
-		if (blocked > 0) {
-			const retryAfter = String(Math.ceil(blocked / 1e3));
-			if (json) respondJson(res, 429, { error: "too many failed attempts" }, { "retry-after": retryAfter });
-			else respondRedirect(res, "/?auth=throttled", { "retry-after": retryAfter });
-			return;
-		}
-		const body = await readBody(req, MAX_LOGIN_BODY_BYTES);
-		if (body === null) {
-			respondJson(res, 413, { error: "body too large" });
-			res.once("finish", () => req.destroy());
-			return;
-		}
-		const contentType = (req.headers["content-type"] ?? "").split(";")[0].trim().toLowerCase();
-		let candidate;
-		if (contentType === "application/x-www-form-urlencoded") candidate = new URLSearchParams(body).get("secret");
-		else if (contentType === "application/json") try {
-			candidate = JSON.parse(body).secret;
-		} catch {
-			respondJson(res, 400, { error: "invalid body" });
-			return;
-		}
-		else {
-			respondJson(res, 415, { error: "expected application/x-www-form-urlencoded or application/json" });
-			return;
-		}
-		if (typeof candidate !== "string" || candidate === "") {
-			respondJson(res, 400, { error: "missing secret" });
-			return;
-		}
-		if (!secretMatches(candidate)) {
-			recordFailure(ip, Date.now());
-			if (json) respondJson(res, 401, { error: "invalid secret" });
-			else respondRedirect(res, "/?auth=failed");
-			return;
+}
+function persist(sessions) {
+	sessions.store?.save([...sessions.entries]);
+}
+function tokenKey(sessions, token) {
+	return sessions.secret === void 0 ? sha256(token).toString("hex") : createHmac("sha256", sessions.secret).update(token).digest("hex");
+}
+function cookieToken(sessions, req) {
+	const header = req.headers.cookie;
+	if (typeof header !== "string") return;
+	for (const part of header.split(";")) {
+		const eq = part.indexOf("=");
+		if (eq === -1) continue;
+		if (part.slice(0, eq).trim() === sessions.cookieName) return part.slice(eq + 1).trim();
+	}
+}
+function cookieAttributes(sessions, req) {
+	const attrs = [
+		"Path=/",
+		"HttpOnly",
+		"SameSite=Lax"
+	];
+	if (isSecure(req, sessions.trustProxy)) attrs.push("Secure");
+	return attrs;
+}
+//#endregion
+//#region src/auth/throttle.ts
+const PRUNE_ABOVE = 256;
+function createLoginThrottle(options) {
+	return {
+		...options,
+		failures: /* @__PURE__ */ new Map(),
+		global: {
+			count: 0,
+			windowStart: 0
 		}
-		failures.delete(ip);
-		const cookie = setCookieValue(createSession(), req);
-		if (json) res.writeHead(204, {
-			"set-cookie": cookie,
-			"cache-control": "no-store"
-		}).end();
-		else respondRedirect(res, "/", { "set-cookie": cookie });
 	};
-	const handleLogout = (req, res) => {
-		const json = wantsJson(req);
-		if (enabled) {
-			if (originVerdict(req) === "foreign") {
-				respondJson(res, 403, { error: "origin not allowed" });
-				return;
+}
+function ipBlockedMs(throttle, ip, now) {
+	return blockedMs(throttle.failures.get(ip), throttle.maxFailuresPerIp, throttle.windowMs, now);
+}
+function loginBlockedMs(throttle, ip, now) {
+	return Math.max(ipBlockedMs(throttle, ip, now), blockedMs(throttle.global, throttle.maxFailuresGlobal, throttle.windowMs, now));
+}
+function recordFailure(throttle, ip, now, countGlobally = true) {
+	const { failures, windowMs } = throttle;
+	if (failures.size > PRUNE_ABOVE) {
+		for (const [key, entry] of failures) if (now - entry.windowStart >= windowMs) failures.delete(key);
+	}
+	const entry = failures.get(ip);
+	if (entry === void 0 || now - entry.windowStart >= windowMs) failures.set(ip, {
+		count: 1,
+		windowStart: now
+	});
+	else entry.count += 1;
+	if (!countGlobally) return;
+	if (now - throttle.global.windowStart >= windowMs) {
+		throttle.global.count = 1;
+		throttle.global.windowStart = now;
+	} else throttle.global.count += 1;
+}
+function forgiveIp(throttle, ip) {
+	throttle.failures.delete(ip);
+}
+function blockedMs(entry, max, windowMs, now) {
+	return entry !== void 0 && entry.count >= max && now - entry.windowStart < windowMs ? entry.windowStart + windowMs - now : 0;
+}
+//#endregion
+//#region src/auth/auth.ts
+const MIN_SECRET_LENGTH = 12;
+const DEFAULT_COOKIE_NAME = "workerdeck_session";
+const DEFAULT_TTL_MS = 6048e5;
+const DEFAULT_THROTTLE_WINDOW_MS = 9e5;
+const DEFAULT_MAX_FAILURES_PER_IP = 10;
+const DEFAULT_MAX_FAILURES_GLOBAL = 100;
+const MAX_LOGIN_BODY_BYTES = 4096;
+const OPEN_PRINCIPAL = {
+	via: "open",
+	canManageProfiles: true
+};
+function createCliAuth(options = {}) {
+	const state = authState(options);
+	const { enabled } = state;
+	return {
+		enabled,
+		authenticate: (req) => authenticateRequest(state, req),
+		handleAuthRequest: (req, res) => {
+			let pathname;
+			try {
+				pathname = new URL(req.url ?? "/", "http://internal").pathname;
+			} catch {
+				return false;
 			}
-			const token = cookieToken(req);
-			if (token !== void 0 && token !== "" && sessions.delete(tokenKey(token))) persist();
-		}
-		const cookie = clearCookieValue(req);
-		if (json) res.writeHead(204, {
-			"set-cookie": cookie,
-			"cache-control": "no-store"
-		}).end();
-		else respondRedirect(res, "/", { "set-cookie": cookie });
-	};
-	const handleAuthRoute = async (pathname, req, res) => {
-		if (pathname === "/auth/status") {
-			if (req.method !== "GET") respondJson(res, 405, { error: "method not allowed" }, { allow: "GET" });
-			else respondJson(res, 200, {
-				enabled,
-				authenticated: enabled ? hasSession(req) : true
-			});
-			return;
-		}
-		if (pathname === "/auth/login") {
-			if (req.method !== "POST") respondJson(res, 405, { error: "method not allowed" }, { allow: "POST" });
-			else await handleLogin(req, res);
-			return;
-		}
-		if (pathname === "/auth/logout") {
-			if (req.method !== "POST") respondJson(res, 405, { error: "method not allowed" }, { allow: "POST" });
-			else handleLogout(req, res);
-			return;
-		}
-		respondJson(res, 404, { error: "not found" });
+			if (pathname !== "/auth" && !pathname.startsWith("/auth/")) return false;
+			return handleAuthRoute(state, pathname, req, res).then(() => true);
+		},
+		hasValidSession: (req) => enabled ? hasSession(state.sessions, req) : true,
+		loginPage
 	};
-	const handleAuthRequest = (req, res) => {
-		let pathname;
-		try {
-			pathname = new URL(req.url ?? "/", "http://internal").pathname;
-		} catch {
-			return false;
-		}
-		if (pathname !== "/auth" && !pathname.startsWith("/auth/")) return false;
-		return handleAuthRoute(pathname, req, res).then(() => true);
+}
+function authState(options) {
+	const { secret } = options;
+	if (secret !== void 0 && secret.length < MIN_SECRET_LENGTH) throw new Error(`createCliAuth: secret must be at least ${MIN_SECRET_LENGTH} characters - use a long random value, or leave it unset to run without auth on loopback`);
+	const cookieName = options.cookieName ?? DEFAULT_COOKIE_NAME;
+	const ttlMs = options.ttlMs ?? DEFAULT_TTL_MS;
+	if (!(ttlMs > 0)) throw new Error("createCliAuth: ttlMs must be positive");
+	const trustProxy = options.trustProxy === true;
+	const throttle = createLoginThrottle({
+		windowMs: options.throttle?.windowMs ?? DEFAULT_THROTTLE_WINDOW_MS,
+		maxFailuresPerIp: options.throttle?.maxFailuresPerIp ?? DEFAULT_MAX_FAILURES_PER_IP,
+		maxFailuresGlobal: options.throttle?.maxFailuresGlobal ?? DEFAULT_MAX_FAILURES_GLOBAL
+	});
+	const policy = {
+		trustProxy,
+		allowedOrigins: parseAllowedOrigins(options.allowedOrigins ?? [])
 	};
-	const loginPage = (req) => {
-		let reason = null;
-		try {
-			reason = new URL(req.url ?? "/", "http://internal").searchParams.get("auth");
-		} catch {
-			reason = null;
+	return {
+		enabled: secret !== void 0,
+		policy,
+		sessions: createCookieSessions({
+			secret,
+			cookieName,
+			ttlMs,
+			trustProxy,
+			store: options.sessions
+		}),
+		throttle,
+		secretMatches: secretMatcher(secret)
+	};
+}
+function authenticateRequest(state, req) {
+	if (!state.enabled) return isCrossSiteBrowserRequest(req, state.policy) ? null : OPEN_PRINCIPAL;
+	const provided = headerSecret(req) ?? querySecret(req);
+	if (provided !== void 0) return headerAttempt(state, req, provided) ? {
+		via: "header",
+		canManageProfiles: true
+	} : null;
+	if (!hasSession(state.sessions, req)) return null;
+	return cookieOriginAccepted(req, state.policy) ? {
+		via: "cookie",
+		canManageProfiles: true
+	} : null;
+}
+function headerAttempt(state, req, provided) {
+	const ip = clientIp(req, state.policy.trustProxy);
+	const throttled = !isLoopbackAddress(ip);
+	const now = Date.now();
+	if (throttled && ipBlockedMs(state.throttle, ip, now) > 0) return false;
+	if (state.secretMatches(provided)) return true;
+	if (throttled) recordFailure(state.throttle, ip, now, false);
+	return false;
+}
+async function handleAuthRoute(state, pathname, req, res) {
+	if (pathname === "/auth/status") {
+		if (req.method !== "GET") respondJson(res, 405, { error: "method not allowed" }, { allow: "GET" });
+		else respondJson(res, 200, {
+			enabled: state.enabled,
+			authenticated: state.enabled ? hasSession(state.sessions, req) : true
+		});
+		return;
+	}
+	if (pathname === "/auth/login") {
+		if (req.method !== "POST") respondJson(res, 405, { error: "method not allowed" }, { allow: "POST" });
+		else await handleLogin(state, req, res);
+		return;
+	}
+	if (pathname === "/auth/logout") {
+		if (req.method !== "POST") respondJson(res, 405, { error: "method not allowed" }, { allow: "POST" });
+		else handleLogout(state, req, res);
+		return;
+	}
+	respondJson(res, 404, { error: "not found" });
+}
+async function handleLogin(state, req, res) {
+	const json = wantsJson(req);
+	if (!state.enabled) {
+		respondJson(res, 409, { error: "auth is disabled: no secret is configured" });
+		return;
+	}
+	if (originVerdict(req, state.policy) === "foreign") {
+		respondJson(res, 403, { error: "origin not allowed" });
+		return;
+	}
+	const ip = clientIp(req, state.policy.trustProxy);
+	const blocked = loginBlockedMs(state.throttle, ip, Date.now());
+	if (blocked > 0) {
+		const retryAfter = String(Math.ceil(blocked / 1e3));
+		if (json) respondJson(res, 429, { error: "too many failed attempts" }, { "retry-after": retryAfter });
+		else respondRedirect(res, "/?auth=throttled", { "retry-after": retryAfter });
+		return;
+	}
+	const candidate = await readLoginSecret(req, res);
+	if (candidate === void 0) return;
+	if (!state.secretMatches(candidate)) {
+		recordFailure(state.throttle, ip, Date.now());
+		if (json) respondJson(res, 401, { error: "invalid secret" });
+		else respondRedirect(res, "/?auth=failed");
+		return;
+	}
+	forgiveIp(state.throttle, ip);
+	const cookie = setCookieValue(state.sessions, mintSession(state.sessions), req);
+	if (json) res.writeHead(204, {
+		"set-cookie": cookie,
+		"cache-control": "no-store"
+	}).end();
+	else respondRedirect(res, "/", { "set-cookie": cookie });
+}
+async function readLoginSecret(req, res) {
+	const body = await readBody(req, MAX_LOGIN_BODY_BYTES);
+	if (body === null) {
+		respondJson(res, 413, { error: "body too large" });
+		res.once("finish", () => req.destroy());
+		return;
+	}
+	const contentType = (req.headers["content-type"] ?? "").split(";")[0].trim().toLowerCase();
+	let candidate;
+	if (contentType === "application/x-www-form-urlencoded") candidate = new URLSearchParams(body).get("secret");
+	else if (contentType === "application/json") try {
+		candidate = JSON.parse(body).secret;
+	} catch {
+		respondJson(res, 400, { error: "invalid body" });
+		return;
+	}
+	else {
+		respondJson(res, 415, { error: "expected application/x-www-form-urlencoded or application/json" });
+		return;
+	}
+	if (typeof candidate !== "string" || candidate === "") {
+		respondJson(res, 400, { error: "missing secret" });
+		return;
+	}
+	return candidate;
+}
+function handleLogout(state, req, res) {
+	const json = wantsJson(req);
+	if (state.enabled) {
+		if (originVerdict(req, state.policy) === "foreign") {
+			respondJson(res, 403, { error: "origin not allowed" });
+			return;
 		}
-		return {
-			action: "/auth/login",
-			field: "secret",
-			error: reason === "failed" ? "Invalid access key. Try again." : reason === "throttled" ? "Too many failed attempts. Wait a few minutes, then try again." : void 0
-		};
-	};
+		revokeSession(state.sessions, req);
+	}
+	const cookie = clearCookieValue(state.sessions, req);
+	if (json) res.writeHead(204, {
+		"set-cookie": cookie,
+		"cache-control": "no-store"
+	}).end();
+	else respondRedirect(res, "/", { "set-cookie": cookie });
+}
+function loginPage(req) {
+	let reason = null;
+	try {
+		reason = new URL(req.url ?? "/", "http://internal").searchParams.get("auth");
+	} catch {
+		reason = null;
+	}
 	return {
-		enabled,
-		authenticate,
-		handleAuthRequest,
-		hasValidSession: (req) => enabled ? hasSession(req) : true,
-		loginPage
+		action: "/auth/login",
+		field: "secret",
+		error: reason === "failed" ? "Invalid access key. Try again." : reason === "throttled" ? "Too many failed attempts. Wait a few minutes, then try again." : void 0
 	};
 }
+function respondRedirect(res, location, headers) {
+	res.writeHead(303, {
+		location,
+		"cache-control": "no-store",
+		...headers
+	}).end();
+}
+function wantsJson(req) {
+	return (req.headers.accept ?? "").includes("application/json");
+}
 //#endregion
 //#region src/config.ts
 const CONFIG_BASENAMES = [
@@ -1684,6 +1735,41 @@ const CONFIG_BASENAMES = [
 	"workerdeck.config.cjs"
 ];
 var ConfigError = class extends Error {};
+const SWITCHES = /* @__PURE__ */ new Map([
+	["-h", (f) => f.help = true],
+	["--help", (f) => f.help = true],
+	["-v", (f) => f.version = true],
+	["--version", (f) => f.version = true],
+	["--no-profile-store", (f) => f.profileStore = false],
+	["--fs-write", (f) => f.fsWrite = true],
+	["--shell", (f) => f.shell = true],
+	["--trust-proxy", (f) => f.trustProxy = true],
+	["--no-parking-store", (f) => f.parking = false],
+	["--insecure", (f) => f.insecure = true],
+	["--no-web", (f) => f.web = false],
+	["--no-keep-awake", (f) => f.keepAwake = false],
+	["--open", (f) => f.open = true],
+	["--hot-reload", (f) => f.hotReload = true]
+]);
+const VALUED = /* @__PURE__ */ new Map([
+	["-c", (f, v) => f.config = v],
+	["--config", (f, v) => f.config = v],
+	["-p", (f, v, name) => f.port = parsePort(v, name)],
+	["--port", (f, v, name) => f.port = parsePort(v, name)],
+	["--host", (f, v) => f.host = v],
+	["--auth-key", (f, v) => f.authKey = v],
+	["--profile", (f, v) => f.profiles.push(parseProfile(v))],
+	["--profile-root", (f, v) => f.profileRoots.push(resolve(v))],
+	["--cwd-root", (f, v) => f.cwdRoots.push(resolve(v))],
+	["--fs-root", (f, v) => f.fsRoots.push(resolve(v))],
+	["--shell-agent-write", (f, v, name) => f.shellAgentWrite = parseShellAgentWrite(v, name)],
+	["--allowed-origin", (f, v) => f.allowedOrigins.push(v)],
+	["--allowed-host", (f, v) => f.allowedHosts.push(v)],
+	["--insecure-host", (f, v) => f.insecureHosts.push(v)],
+	["--approval-timeout", (f, v, name) => f.approvalTimeoutMs = parseDuration(v, name)],
+	["--state-dir", (f, v) => f.stateDir = resolve(v)],
+	["--cors-origin", (f, v) => f.corsOrigins.push(v)]
+]);
 function parseDuration(raw, source) {
 	if (raw === "none" || raw === "never") return null;
 	const match = /^(\d+(?:\.\d+)?)(ms|s|m|h)?$/.exec(raw);
@@ -1717,129 +1803,33 @@ function parseArgs(argv) {
 		insecureHosts: [],
 		corsOrigins: []
 	};
-	const next = (i, name) => {
-		const value = argv[i + 1];
-		if (value === void 0 || value.startsWith("-")) throw new ConfigError(`${name} requires a value`);
-		return value;
-	};
 	for (let i = 0; i < argv.length; i++) {
 		const arg = argv[i];
-		switch (arg) {
-			case "-h":
-			case "--help":
-				flags.help = true;
-				break;
-			case "-v":
-			case "--version":
-				flags.version = true;
-				break;
-			case "-c":
-			case "--config":
-				flags.config = next(i, arg);
-				i++;
-				break;
-			case "-p":
-			case "--port":
-				flags.port = parsePort(next(i, arg), arg);
-				i++;
-				break;
-			case "--host":
-				flags.host = next(i, arg);
-				i++;
-				break;
-			case "--auth-key":
-				flags.authKey = next(i, arg);
-				i++;
-				break;
-			case "--profile": {
-				const raw = next(i, arg);
-				i++;
-				const eq = raw.indexOf("=");
-				if (eq <= 0) throw new ConfigError(`--profile expects name=dir, got: ${raw}`);
-				const name = raw.slice(0, eq);
-				const dir = raw.slice(eq + 1);
-				if (!dir) throw new ConfigError(`--profile ${name}= is missing a directory`);
-				flags.profiles.push({
-					name,
-					configDir: resolve(dir)
-				});
-				break;
-			}
-			case "--profile-root":
-				flags.profileRoots.push(resolve(next(i, arg)));
-				i++;
-				break;
-			case "--no-profile-store":
-				flags.profileStore = false;
-				break;
-			case "--cwd-root":
-				flags.cwdRoots.push(resolve(next(i, arg)));
-				i++;
-				break;
-			case "--fs-root":
-				flags.fsRoots.push(resolve(next(i, arg)));
-				i++;
-				break;
-			case "--fs-write":
-				flags.fsWrite = true;
-				break;
-			case "--shell":
-				flags.shell = true;
-				break;
-			case "--shell-agent-write":
-				flags.shellAgentWrite = parseShellAgentWrite(next(i, arg), arg);
-				i++;
-				break;
-			case "--allowed-origin":
-				flags.allowedOrigins.push(next(i, arg));
-				i++;
-				break;
-			case "--allowed-host":
-				flags.allowedHosts.push(next(i, arg));
-				i++;
-				break;
-			case "--insecure-host":
-				flags.insecureHosts.push(next(i, arg));
-				i++;
-				break;
-			case "--trust-proxy":
-				flags.trustProxy = true;
-				break;
-			case "--approval-timeout":
-				flags.approvalTimeoutMs = parseDuration(next(i, arg), arg);
-				i++;
-				break;
-			case "--state-dir":
-				flags.stateDir = resolve(next(i, arg));
-				i++;
-				break;
-			case "--no-parking-store":
-				flags.parking = false;
-				break;
-			case "--insecure":
-				flags.insecure = true;
-				break;
-			case "--no-web":
-				flags.web = false;
-				break;
-			case "--no-keep-awake":
-				flags.keepAwake = false;
-				break;
-			case "--cors-origin":
-				flags.corsOrigins.push(next(i, arg));
-				i++;
-				break;
-			case "--open":
-				flags.open = true;
-				break;
-			case "--hot-reload":
-				flags.hotReload = true;
-				break;
-			default: throw new ConfigError(`unknown option: ${arg}`);
+		const toggle = SWITCHES.get(arg);
+		if (toggle) {
+			toggle(flags);
+			continue;
 		}
+		const take = VALUED.get(arg);
+		if (!take) throw new ConfigError(`unknown option: ${arg}`);
+		const value = argv[i + 1];
+		if (value === void 0 || value.startsWith("-")) throw new ConfigError(`${arg} requires a value`);
+		take(flags, value, arg);
+		i++;
 	}
 	return flags;
 }
+function parseProfile(raw) {
+	const eq = raw.indexOf("=");
+	if (eq <= 0) throw new ConfigError(`--profile expects name=dir, got: ${raw}`);
+	const name = raw.slice(0, eq);
+	const dir = raw.slice(eq + 1);
+	if (!dir) throw new ConfigError(`--profile ${name}= is missing a directory`);
+	return {
+		name,
+		configDir: resolve(dir)
+	};
+}
 async function loadConfigFile(explicit, cwd = process.cwd()) {
 	let path = null;
 	if (explicit) {
@@ -1911,10 +1901,9 @@ function resolveInstanceConfig(flags, loaded, env = process.env, cwd = process.c
 	const bindHost = host.trim().replace(/^\[|\]$/g, "").toLowerCase();
 	const generateAuthKey = !authKey && !hostAuthenticates && !loaded.options.allowUnauthenticated && !isLoopback(host) && !flags.insecure && !insecureHosts.has(bindHost);
 	const stateDir = flags.parking === false || loaded.options.stateDir === null ? null : flags.stateDir ?? env.WORKERDECK_STATE_DIR ?? loaded.options.stateDir ?? defaultStateDir(loaded.path);
-	const envCwdRoots = env.WORKERDECK_CWD_ROOTS?.split(":").filter(Boolean).map((p) => resolve(cwd, p));
-	const cwdRoots = flags.cwdRoots.length ? flags.cwdRoots : envCwdRoots;
-	const envFsRoots = env.WORKERDECK_FS_ROOTS?.split(":").filter(Boolean).map((p) => resolve(cwd, p));
-	const fsRoots = flags.fsRoots.length ? flags.fsRoots : envFsRoots;
+	const envRoots = (name) => env[name]?.split(":").filter(Boolean).map((p) => resolve(cwd, p));
+	const cwdRoots = flags.cwdRoots.length ? flags.cwdRoots : envRoots("WORKERDECK_CWD_ROOTS");
+	const fsRoots = flags.fsRoots.length ? flags.fsRoots : envRoots("WORKERDECK_FS_ROOTS");
 	const auth = {
 		...loaded.options.auth,
 		secret: authKey,
@@ -2192,15 +2181,36 @@ function resolveWithinRoot(root, pathname) {
 	if (candidate !== base && !candidate.startsWith(base + sep)) return null;
 	return candidate;
 }
+function dashboardCsp(html) {
+	return [
+		"default-src 'self'",
+		["script-src 'self' 'wasm-unsafe-eval'", ...[...html.matchAll(/<script(?![^>]*\bsrc=)[^>]*>([\s\S]*?)<\/script>/gi)].map((match) => `'sha256-${createHash("sha256").update(match[1], "utf8").digest("base64")}'`)].join(" "),
+		"style-src 'self' 'unsafe-inline'",
+		"img-src 'self' data: blob: http://127.0.0.1:* http://localhost:*",
+		"font-src 'self' data:",
+		"connect-src 'self' http: https: ws: wss:",
+		"worker-src 'self' blob:",
+		"object-src 'none'",
+		"base-uri 'self'",
+		"form-action 'self'",
+		"frame-ancestors 'none'"
+	].join("; ");
+}
+function htmlHeaders(html) {
+	return {
+		"content-security-policy": dashboardCsp(html),
+		"x-frame-options": "DENY",
+		"x-content-type-options": "nosniff",
+		"referrer-policy": "same-origin"
+	};
+}
 function sendHtml(req, res, status, html, cache) {
 	const body = Buffer.from(html, "utf8");
 	res.writeHead(status, {
 		"content-type": "text/html; charset=utf-8",
 		"content-length": body.byteLength,
 		"cache-control": cache,
-		"x-frame-options": "DENY",
-		"x-content-type-options": "nosniff",
-		"referrer-policy": "same-origin"
+		...htmlHeaders(html)
 	});
 	res.end(req.method === "HEAD" ? void 0 : body);
 }
@@ -2214,8 +2224,15 @@ async function serveFile(req, res, filePath, options = {}) {
 	} catch {
 		return "not-found";
 	}
+	const contentType = contentTypeFor(filePath);
+	if (contentType.startsWith("text/html")) {
+		const html = await readFile(filePath, "utf8").catch(() => void 0);
+		if (html === void 0) return "not-found";
+		sendHtml(req, res, 200, html, options.immutable ? "public, max-age=31536000, immutable" : "no-cache, must-revalidate");
+		return "served";
+	}
 	res.writeHead(200, {
-		"content-type": contentTypeFor(filePath),
+		"content-type": contentType,
 		"content-length": size,
 		"cache-control": options.immutable ? "public, max-age=31536000, immutable" : "no-cache, must-revalidate",
 		"x-content-type-options": "nosniff"
@@ -2252,6 +2269,12 @@ function createHostGuard(allowedHosts) {
 		return isLoopbackHostname(hostname) || allowedHosts.has(hostname);
 	};
 }
+function isOperatorPrincipal(principal, policyDeclared) {
+	if (principal === null || principal === void 0 || principal === false) return false;
+	const { operator, scope } = typeof principal === "object" ? principal : {};
+	if (typeof operator === "boolean") return operator;
+	return !(typeof scope === "object" && scope !== null && Object.keys(scope).length > 0) && !policyDeclared;
+}
 function createFallback(auth, webRoot, hostAllowed, apnsRoute) {
 	return async (req, res) => {
 		if (!hostAllowed(req)) {
@@ -2318,27 +2341,20 @@ async function startInstance(config, options = {}) {
 	if (config.allowedHosts === null && !config.hostAuthenticates && !auth.enabled) throw new Error("refusing to serve: the resolved config expects auth but no shared secret was materialized - this instance would be open while believing itself authenticated");
 	if (config.corsOrigins.length > 0 && !config.hostAuthenticates && !auth.enabled) throw new Error("refusing to serve: corsOrigins is set but this instance has no auth - a cross-origin page could drive it with no credential. Set --auth-key.");
 	const hostAllowed = createHostGuard(config.allowedHosts);
-	const authenticateHost = (req) => hostAllowed(req) ? auth.authenticate(req) : null;
+	const authenticateRequest = config.hostAuthenticates ? config.options.authenticate : auth.authenticate;
+	const policyDeclared = config.options.authorizeSession !== void 0;
+	const authenticatePush = async (req) => {
+		if (!hostAllowed(req)) return null;
+		const principal = await authenticateRequest(req);
+		return isOperatorPrincipal(principal, policyDeclared) ? principal : null;
+	};
 	const apns = config.apns === void 0 ? void 0 : await createApnsForwarder({
 		config: config.apns,
 		stateDir: config.stateDir,
-		authenticate: authenticateHost
-	});
-	const fallback = createFallback(auth, webRoot, hostAllowed, apns?.handleRequest ?? createApnsRoute(null, authenticateHost));
-	const parking = { ...config.options.parking };
-	if (config.stateDir && !parking.store) parking.store = createFileSessionStore({
-		dir: join(config.stateDir, "parked"),
-		onError: (error, context) => {
-			process.stderr.write(`[workerdeck] parked-session store ${context.op} failed for ${context.path}: ${error instanceof Error ? error.message : String(error)}\n`);
-		}
-	});
-	const profileStore = config.profileStore && config.stateDir ? createFileProfileStore(join(config.stateDir, "profiles.json")) : void 0;
-	const shell = { ...config.options.shell };
-	if (config.stateDir && shell.artifactDir === void 0) shell.artifactDir = join(config.stateDir, "shells");
-	const spend = { ...config.options.spend };
-	if (config.stateDir && !spend.store) spend.store = createFileSpendStore(join(config.stateDir, "spend.json"), (error) => {
-		process.stderr.write(`[workerdeck] spend ledger write failed: ${error instanceof Error ? error.message : String(error)}\n`);
+		authenticate: authenticatePush
 	});
+	const fallback = createFallback(auth, webRoot, hostAllowed, apns?.handleRequest ?? createApnsRoute(null, authenticatePush));
+	const { parking, profileStore, shell, spend } = stateDirDefaults(config);
 	const server = createWorkerServer({
 		...config.options,
 		...profileStore ? { profileStore } : {},
@@ -2355,7 +2371,7 @@ async function startInstance(config, options = {}) {
 		},
 		fallback,
 		...config.corsOrigins.length ? { cors: { origins: config.corsOrigins } } : {},
-		authenticate: config.hostAuthenticates ? (req) => hostAllowed(req) ? config.options.authenticate(req) : null : (req) => hostAllowed(req) ? auth.authenticate(req) : null
+		authenticate: (req) => hostAllowed(req) ? authenticateRequest(req) : null
 	});
 	const wake = config.keepAwake ? createWakeLock({ onUnavailable: (reason) => {
 		if (!options.quiet) process.stderr.write(`[workerdeck] not holding the machine awake: ${reason}\n`);
@@ -2391,30 +2407,18 @@ async function startInstance(config, options = {}) {
 		resolveClosed = r;
 	});
 	if (!options.quiet) {
-		const line = (text) => void process.stdout.write(`${text}\n`);
-		line("");
-		line(`  workerdeck  ${url}`);
-		if (config.hostAuthenticates) line("  auth: the config file supplies its own `authenticate`");
-		else if (generated?.source === "created") {
-			line(`  auth: generated key  ${generated.key}`);
-			line(`        stored in ${generated.path} - later starts reuse it without printing it`);
-		} else if (generated?.source === "ephemeral") {
-			line(`  auth: generated key  ${generated.key}`);
-			line("        ephemeral - no state dir to keep it, so the next start mints a new one");
-		} else if (generated?.source === "stored") line(`  auth: shared key from ${generated.path}`);
-		else if (auth.enabled) line("  auth: shared key - browsers sign in, services send a header");
-		else line("  NO AUTH - anyone who can reach this port gets a session");
-		if (!config.web) line("  dashboard: off - bare gateway, /v1 and /auth only");
-		if (!config.keepAwake) line("  keep-awake: off - this machine may sleep mid-turn");
-		if (config.corsOrigins.length) line(`  cors: ${config.corsOrigins.join(", ")} may call /v1 (still key-gated)`);
-		line(config.stateDir ? `  parked sessions persist in ${join(config.stateDir, "parked")}` : "  parked sessions are in memory only - a restart drops them");
-		if (apns) {
-			const count = apns.deviceCount();
-			const cards = apns.activity.count();
-			line(`  push: APNs forwarder on ${config.apns?.topic} - ${count === 0 ? "no devices registered yet" : `${count} device(s)`}${cards === 0 ? "" : `, ${cards} live card(s)`}`);
-		}
-		if (config.configPath) line(`  config ${config.configPath}`);
-		line("");
+		const push = apns && {
+			topic: config.apns?.topic,
+			devices: apns.deviceCount(),
+			cards: apns.activity.count()
+		};
+		process.stdout.write(bannerLines({
+			url,
+			config,
+			generated,
+			authEnabled: auth.enabled,
+			push
+		}).join("\n") + "\n");
 	}
 	return {
 		server,
@@ -2435,7 +2439,52 @@ async function startInstance(config, options = {}) {
 		}
 	};
 }
+function stateDirDefaults(config) {
+	const { stateDir } = config;
+	const parking = { ...config.options.parking };
+	const shell = { ...config.options.shell };
+	const spend = { ...config.options.spend };
+	if (!stateDir) return {
+		parking,
+		shell,
+		spend
+	};
+	parking.store ??= createFileSessionStore({
+		dir: join(stateDir, "parked"),
+		onError: (error, context) => {
+			process.stderr.write(`[workerdeck] parked-session store ${context.op} failed for ${context.path}: ${error instanceof Error ? error.message : String(error)}\n`);
+		}
+	});
+	if (shell.artifactDir === void 0) shell.artifactDir = join(stateDir, "shells");
+	spend.store ??= createFileSpendStore(join(stateDir, "spend.json"), (error) => {
+		process.stderr.write(`[workerdeck] spend ledger write failed: ${error instanceof Error ? error.message : String(error)}\n`);
+	});
+	const profileStore = config.profileStore ? createFileProfileStore(join(stateDir, "profiles.json")) : void 0;
+	return {
+		parking,
+		shell,
+		spend,
+		...profileStore ? { profileStore } : {}
+	};
+}
+function bannerLines({ url, config, generated, authEnabled, push }) {
+	const lines = ["", `  workerdeck  ${url}`];
+	if (config.hostAuthenticates) lines.push("  auth: the config file supplies its own `authenticate`");
+	else if (generated?.source === "created") lines.push(`  auth: generated key  ${generated.key}`, `        stored in ${generated.path} - later starts reuse it without printing it`);
+	else if (generated?.source === "ephemeral") lines.push(`  auth: generated key  ${generated.key}`, "        ephemeral - no state dir to keep it, so the next start mints a new one");
+	else if (generated?.source === "stored") lines.push(`  auth: shared key from ${generated.path}`);
+	else if (authEnabled) lines.push("  auth: shared key - browsers sign in, services send a header");
+	else lines.push("  NO AUTH - anyone who can reach this port gets a session");
+	if (!config.web) lines.push("  dashboard: off - bare gateway, /v1 and /auth only");
+	if (!config.keepAwake) lines.push("  keep-awake: off - this machine may sleep mid-turn");
+	if (config.corsOrigins.length) lines.push(`  cors: ${config.corsOrigins.join(", ")} may call /v1 (still key-gated)`);
+	lines.push(config.stateDir ? `  parked sessions persist in ${join(config.stateDir, "parked")}` : "  parked sessions are in memory only - a restart drops them");
+	if (push) lines.push(`  push: APNs forwarder on ${push.topic} - ${push.devices === 0 ? "no devices registered yet" : `${push.devices} device(s)`}${push.cards === 0 ? "" : `, ${push.cards} live card(s)`}`);
+	if (config.configPath) lines.push(`  config ${config.configPath}`);
+	lines.push("");
+	return lines;
+}
 //#endregion
 export { createActivityRegistry as C, createDeviceRoute as S, createApnsForwarder as _, ConfigError as a, createApnsRoute as b, isLoopback as c, parseArgs as d, resolveInstanceConfig as f, buildPush as g, materializeAuthKey as h, renderLoginPage as i, isLoopbackHostname as l, createAuthSessionStore as m, resolveWebRoot as n, defaultStateDir as o, createCliAuth as p, startInstance as r, hostnameOf as s, createHostGuard as t, loadConfigFile as u, createApnsClient as v, createActivityRoute as w, createDeviceRegistry as x, loadApnsKey as y };
 
-//# sourceMappingURL=instance-CTA80T2q.mjs.map
+//# sourceMappingURL=instance-BmQhZ3Px.mjs.map