@orkestrel/browser 0.0.25 → 0.0.27

package/dist/src/server/index.cjs

@@ -1,11 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-let _src_core = require("../core/index.cjs");
-let _orkestrel_contract = require("@orkestrel/contract");
 let node_fs = require("node:fs");
 let node_fs_promises = require("node:fs/promises");
 let node_os = require("node:os");
 let node_path = require("node:path");
 let node_child_process = require("node:child_process");
+let _orkestrel_contract = require("@orkestrel/contract");
+let _src_core = require("../core/index.cjs");
 let node_crypto = require("node:crypto");
 let node_http = require("node:http");
 let node_https = require("node:https");
@@ -43,12 +43,15 @@ var BROWSER_CDP_LIST_PATH = "/json/list";
 *
 * @remarks
 * Disables account sync so extension installs cannot reset URL loader factories during page imports.
-* Edge can still sign a fresh Windows profile in to the operating-system account.
+* Disables Edge's implicit sign-in so fresh automation profiles carry no Microsoft account.
+* Chromium ignores the unknown Edge feature name on Chrome and Chromium.
+* The launcher merges disabled features with the caller's into one switch.
 */
 var BROWSER_LAUNCH_ARGS = Object.freeze([
 	"--no-first-run",
 	"--no-default-browser-check",
-	"--disable-sync"
+	"--disable-sync",
+	"--disable-features=msImplicitSignin"
 ]);
 /**
 * Names the flag that enables headless mode on a launched browser process, `'--headless=new'`.
@@ -224,9 +227,9 @@ var BROWSER_RUN_DIRECTORY = "runs";
 /** Bounds a file-store listing page by default. */
 var BROWSER_FILE_STORE_LIMIT = 100;
 /** Names the refusal when no browser can serve a call. */
-var BROWSER_SERVER_UNAVAILABLE = "BROWSER_SERVER_UNAVAILABLE";
+var BROWSER_SERVER_UNAVAILABLE = "SERVER_UNAVAILABLE";
 /** Names a failed attempt to warm a browser. */
-var BROWSER_SERVER_LAUNCH = "BROWSER_SERVER_LAUNCH";
+var BROWSER_SERVER_LAUNCH = "SERVER_LAUNCH";
 /** Sets the default number of warm browsers to 1. */
 var BROWSER_SERVER_POOL_SIZE = 1;
 /** Sets the default context capacity per browser, including the shared holder. */
@@ -240,21 +243,21 @@ var BROWSER_SERVER_RESTARTS = 1;
 /** Names the browser process record in each profile. */
 var BROWSER_SERVER_RECORD = "browse.json";
 /** Names the diagnostic when the warm floor spends its restart bound. */
-var BROWSER_SERVER_EXHAUSTED = "BROWSER_SERVER_EXHAUSTED";
+var BROWSER_SERVER_EXHAUSTED = "SERVER_EXHAUSTED";
 /** Names a failed browser server teardown. */
-var BROWSER_SERVER_TEARDOWN = "BROWSER_SERVER_TEARDOWN";
+var BROWSER_SERVER_TEARDOWN = "SERVER_TEARDOWN";
 /** Names a failed profile sweep. */
-var BROWSER_SERVER_SWEEP = "BROWSER_SERVER_SWEEP";
+var BROWSER_SERVER_SWEEP = "SERVER_SWEEP";
 /** Names a refused browser server option. */
-var BROWSER_SERVER_OPTIONS = "BROWSER_SERVER_OPTIONS";
+var BROWSER_SERVER_OPTIONS = "ARGUMENT";
 /** Names the notice that a browser and its session state were lost. */
-var BROWSER_SERVER_CRASH = "BROWSER_SERVER_CRASH";
+var BROWSER_SERVER_CRASH = "SERVER_CRASH";
 /** Names an interrupted call whose outcome is unknown. */
-var BROWSER_SERVER_UNRESOLVED = "BROWSER_SERVER_UNRESOLVED";
+var BROWSER_SERVER_UNRESOLVED = "SERVER_UNRESOLVED";
 /** Names the refusal when every browser is admitted to a holder. */
-var BROWSER_SERVER_BUSY = "BROWSER_SERVER_BUSY";
+var BROWSER_SERVER_BUSY = "SERVER_BUSY";
 /** Names the refusal for an unknown or ended holder. */
-var BROWSER_SERVER_HOLDER = "BROWSER_SERVER_HOLDER";
+var BROWSER_SERVER_HOLDER = "SERVER_HOLDER";
 /** Defines the holder tools independently of the shared browser's vocabulary. */
 var BROWSER_SERVER_COPY = Object.freeze({
 	acquire: Object.freeze({
@@ -330,46 +333,6 @@ var BROWSER_SERVER_COPY = Object.freeze({
 	})
 });
 //#endregion
-//#region src/server/errors.ts
-/**
-* Reports that an operation requiring an active connection was attempted while disconnected,
-* under the code `BROWSER_NOT_CONNECTED_ERROR`.
-*/
-var BrowserNotConnectedError = class extends _src_core.BrowserError {
-	constructor(context) {
-		super("Browser is not connected", "BROWSER_NOT_CONNECTED_ERROR", context);
-		this.name = "BrowserNotConnectedError";
-	}
-};
-/**
-* Reports that an operation was attempted after the browser wrapper was destroyed, under the
-* code `BROWSER_DESTROYED_ERROR`.
-*/
-var BrowserDestroyedError = class extends _src_core.BrowserError {
-	constructor(context) {
-		super("Browser has been destroyed", "BROWSER_DESTROYED_ERROR", context);
-		this.name = "BrowserDestroyedError";
-	}
-};
-/**
-* Narrows an unknown value to a `BrowserNotConnectedError`.
-*
-* @param value - Value to check
-* @returns True if value is a BrowserNotConnectedError instance; false otherwise
-*/
-function isBrowserNotConnectedError(value) {
-	return (0, _orkestrel_contract.isInstance)(value, BrowserNotConnectedError);
-}
-/**
-* Narrows an unknown value to a `BrowserDestroyedError`.
-*
-* @param value - Value to check
-* @returns True if value is a BrowserDestroyedError instance; false otherwise
-*/
-function isBrowserDestroyedError(value) {
-	return (0, _orkestrel_contract.isInstance)(value, BrowserDestroyedError);
-}
-//#endregion
 //#region src/server/helpers.ts
 /**
 * Parses positive integer viewport dimensions in WIDTHxHEIGHT form.
@@ -432,15 +395,15 @@ function parseBrowserProfileRecord(text) {
 * @param url - The lost page's last URL, when known
 * @returns The coded diagnostic and any operation-lifecycle guidance
 * @example
-* describeBrowserServerLoss('BROWSER_SERVER_UNAVAILABLE', new Error('Browser exited'))
+* describeBrowserServerLoss('SERVER_UNAVAILABLE', new Error('Browser exited'))
 */
 function describeBrowserServerLoss(code, cause, url) {
 	const pid = (0, _src_core.isBrowserError)(cause) ? cause.context?.["pid"] : void 0;
 	const message = `${code}: ${(cause === void 0 ? "Browser session lost" : (0, _orkestrel_contract.isError)(cause) ? cause.message : String(cause)).replace(/\.+$/u, "")}${(0, _orkestrel_contract.isNumber)(pid) ? ` (pid ${pid})` : ""}.`;
-	if (code !== "BROWSER_SERVER_CRASH" && code !== "BROWSER_SERVER_UNRESOLVED") return message;
-	const lost = `Lost the page${url === void 0 ? "" : ` at ${url}`}, its tabs, every element reference, the retained reading, dialogs, holds, an unsaved recording, the active replay, and the isolated context's cookies.`;
+	if (code !== "SERVER_CRASH" && code !== "SERVER_UNRESOLVED") return message;
+	const lost = `Lost the page${url === void 0 ? "" : ` at ${url}`}, its tabs, every element reference, the last projection, dialogs, holds, an unsaved recording, the active replay, and the isolated context's cookies.`;
 	const next = `The next call acquires a browser that starts at about:blank, or answers ${BROWSER_SERVER_UNAVAILABLE} when none can serve.`;
-	return code === "BROWSER_SERVER_UNRESOLVED" ? `${message} The outcome is unknown. ${lost} Browse did not repeat the call. ${next}` : `${message} ${lost}`;
+	return code === "SERVER_UNRESOLVED" ? `${message} The outcome is unknown. ${lost} Browse did not repeat the call. ${next}` : `${message} ${lost}`;
 }
 /**
 * Formats a process identifier and UUID token as a lock entry name.
@@ -515,16 +478,6 @@ function findSystemBrowsers(options) {
 	return browsers;
 }
 /**
-* Locates a Chrome/Chromium/Edge executable on this machine — the first entry
-* of {@link findSystemBrowsers}.
-*
-* @param options - Overrides for the candidate sources; see {@link SystemBrowserOptions}
-* @returns The first discovered browser, or undefined
-*/
-function findSystemBrowser(options) {
-	return findSystemBrowsers(options)[0];
-}
-/**
 * Classifies an executable path/name into a {@link BrowserEngine} by
 * case-insensitive hint, checked in the order edge → chromium → chrome.
 *
@@ -580,7 +533,7 @@ async function removeBrowserProfile(profile) {
 	if (!profile.temporary) return;
 	const path = (0, node_path.resolve)(profile.path);
 	const temporary = (0, node_path.resolve)((0, node_os.tmpdir)());
-	if ((0, node_path.dirname)(path) !== temporary || !(0, node_path.basename)(path).startsWith("orkestrel-browser-")) throw new _src_core.BrowserError("Refusing to remove an unsafe browser profile path", void 0, { path });
+	if ((0, node_path.dirname)(path) !== temporary || !(0, node_path.basename)(path).startsWith("orkestrel-browser-")) throw new _src_core.BrowserError("ARGUMENT", "Refusing to remove an unsafe browser profile path", { path });
 	await (0, node_fs_promises.rm)(path, {
 		recursive: true,
 		force: true,
@@ -687,6 +640,10 @@ function findStorePaths(base, platform) {
 * Launches a browser process with raw-CDP debugging flags.
 *
 * @remarks
+* Merges every caller and library `--disable-features` value into one switch because Chromium
+* reads only the last occurrence. Keeps `msImplicitSignin` disabled alongside caller features;
+* Chrome and Chromium ignore this Edge feature name. Preserves the caller's other arguments.
+*
 * POSIX launches own an isolated process group so lifecycle teardown can
 * signal and await every Chromium subprocess without affecting the caller.
 * Windows launches are not detached and own no group, so teardown there
@@ -704,8 +661,18 @@ function findStorePaths(base, platform) {
 */
 function launchBrowserProcess(executable, port, headless, profile, extra) {
 	const args = [];
-	if (extra !== void 0) args.push(...extra);
-	args.push(`--remote-debugging-port=${port ?? 0}`, ...BROWSER_LAUNCH_ARGS);
+	const features = /* @__PURE__ */ new Set();
+	for (const arg of [
+		...extra ?? [],
+		`--remote-debugging-port=${port ?? 0}`,
+		...BROWSER_LAUNCH_ARGS
+	]) {
+		if (arg === "--disable-features") continue;
+		if (arg.startsWith("--disable-features=")) {
+			for (const feature of arg.slice(19).split(",")) if (feature.trim() !== "") features.add(feature.trim());
+		} else args.push(arg);
+	}
+	args.push(`--disable-features=${[...features].join(",")}`);
 	if (headless) args.push(BROWSER_HEADLESS_ARG);
 	if (profile !== void 0) args.push(`--user-data-dir=${profile}`);
 	return (0, node_child_process.spawn)(executable, args, {
@@ -756,18 +723,18 @@ function readBrowserEndpoint(stream, signal) {
 	stream.on("close", () => {
 		const endpoint = found ? void 0 : BROWSER_DEVTOOLS_PATTERN.exec(pending)?.[1];
 		if (endpoint !== void 0) read.resolve(endpoint);
-		else read.reject(new _src_core.BrowserConnectionError("Browser closed its standard error before reporting a CDP endpoint"));
+		else read.reject(new _src_core.BrowserError("CONNECTION", "Browser closed its standard error before reporting a CDP endpoint"));
 	});
 	return read.promise;
 }
 /**
 * Fetches the current CDP target list from a browser's `/json/list` endpoint, as a `Result`
-* carrying either the targets or a coded `BrowserConnectionError`.
+* carrying either the targets or a coded `BrowserError`.
 *
 * @remarks
 * The endpoint is a network boundary, so an unreachable host, a non-2xx
 * response, and a body that is not a JSON array each come back as a failed
-* `Result` carrying a coded `BrowserConnectionError`. An entry missing a
+* `Result` carrying a coded `BrowserError`. An entry missing a
 * required string field is skipped rather than failing the whole list.
 *
 * @param port - Port the browser exposes its CDP endpoint on
@@ -792,7 +759,7 @@ async function fetchCDPTargets(port, timeout, host = BROWSER_DEFAULT_HOST) {
 		const response = await fetch(url, { signal: controller.signal });
 		if (!response.ok) return {
 			success: false,
-			error: new _src_core.BrowserConnectionError("CDP target list request was refused", {
+			error: new _src_core.BrowserError("CONNECTION", "CDP target list request was refused", {
 				url,
 				status: response.status
 			})
@@ -800,7 +767,7 @@ async function fetchCDPTargets(port, timeout, host = BROWSER_DEFAULT_HOST) {
 		const list = await response.json();
 		if (!(0, _orkestrel_contract.isArray)(list)) return {
 			success: false,
-			error: new _src_core.BrowserConnectionError("CDP target list is not a JSON array", { url })
+			error: new _src_core.BrowserError("CONNECTION", "CDP target list is not a JSON array", { url })
 		};
 		const targets = [];
 		for (const entry of list) {
@@ -820,9 +787,9 @@ async function fetchCDPTargets(port, timeout, host = BROWSER_DEFAULT_HOST) {
 	} catch (error) {
 		return {
 			success: false,
-			error: new _src_core.BrowserConnectionError("CDP target list is unreachable", {
+			error: new _src_core.BrowserError("CONNECTION", "CDP target list is unreachable", {
 				url,
-				error
+				error: (0, _orkestrel_contract.isJSONValue)(error) ? error : String(error)
 			})
 		};
 	} finally {
@@ -888,7 +855,7 @@ var WebSocketCDPTransport = class {
 	}
 	async send(data) {
 		const socket = this.#socket;
-		if (socket === void 0 || socket.readyState !== _orkestrel_websocket.WEBSOCKET_READY_OPEN) throw new _src_core.BrowserConnectionError("WebSocket CDP transport is not open", { url: this.#url });
+		if (socket === void 0 || socket.readyState !== _orkestrel_websocket.WEBSOCKET_READY_OPEN) throw new _src_core.BrowserError("CONNECTION", "WebSocket CDP transport is not open", { url: this.#url });
 		socket.send(data);
 	}
 	async close() {
@@ -896,12 +863,12 @@ var WebSocketCDPTransport = class {
 	}
 	async #start() {
 		const parsed = (0, _orkestrel_contract.attempt)(() => new URL(this.#url));
-		if (!parsed.success) throw new _src_core.BrowserConnectionError(`WebSocket CDP URL is invalid: ${this.#url}`, {
+		if (!parsed.success) throw new _src_core.BrowserError("CONNECTION", `WebSocket CDP URL is invalid: ${this.#url}`, {
 			url: this.#url,
-			error: parsed.error
+			error: (0, _orkestrel_contract.isJSONValue)(parsed.error) ? parsed.error : String(parsed.error)
 		});
 		const url = parsed.value;
-		if (url.protocol !== "ws:" && url.protocol !== "wss:") throw new _src_core.BrowserConnectionError(`WebSocket CDP connection requires a ws: or wss: URL: ${this.#url}`, { url: this.#url });
+		if (url.protocol !== "ws:" && url.protocol !== "wss:") throw new _src_core.BrowserError("CONNECTION", `WebSocket CDP connection requires a ws: or wss: URL: ${this.#url}`, { url: this.#url });
 		const key = (0, node_crypto.randomBytes)(16).toString("base64");
 		const deferred = Promise.withResolvers();
 		const options = {
@@ -933,7 +900,7 @@ var WebSocketCDPTransport = class {
 	async #close() {
 		const request = this.#request;
 		if (request !== void 0) {
-			this.#rejectRequest(request, new _src_core.BrowserConnectionError(`WebSocket CDP connection to ${this.#url} was closed before it finished connecting`, { url: this.#url }));
+			this.#rejectRequest(request, new _src_core.BrowserError("CONNECTION", `WebSocket CDP connection to ${this.#url} was closed before it finished connecting`, { url: this.#url }));
 			request.destroy();
 		}
 		await this.#starting.pending?.catch(() => void 0);
@@ -962,7 +929,7 @@ var WebSocketCDPTransport = class {
 		const accept = response.headers["sec-websocket-accept"];
 		if (!(0, _orkestrel_contract.isString)(accept) || accept !== (0, _orkestrel_websocket.computeWebSocketAccept)(key)) {
 			socket.destroy();
-			this.#rejectRequest(request, new _src_core.BrowserConnectionError(`WebSocket CDP connection to ${this.#url} failed: Sec-WebSocket-Accept mismatch`, { url: this.#url }));
+			this.#rejectRequest(request, new _src_core.BrowserError("CONNECTION", `WebSocket CDP connection to ${this.#url} failed: Sec-WebSocket-Accept mismatch`, { url: this.#url }));
 			return;
 		}
 		try {
@@ -978,13 +945,13 @@ var WebSocketCDPTransport = class {
 	#decline(request, response) {
 		response.resume();
 		const reason = response.statusCode === void 0 ? "upgrade was declined without a status code" : `upgrade declined with status ${response.statusCode}`;
-		this.#rejectRequest(request, new _src_core.BrowserConnectionError(`WebSocket CDP connection to ${this.#url} failed: ${reason}`, { url: this.#url }));
+		this.#rejectRequest(request, new _src_core.BrowserError("CONNECTION", `WebSocket CDP connection to ${this.#url} failed: ${reason}`, { url: this.#url }));
 	}
 	#fail(request, error) {
-		this.#rejectRequest(request, new _src_core.BrowserConnectionError(`WebSocket CDP connection to ${this.#url} failed: ${error.message}`, { url: this.#url }));
+		this.#rejectRequest(request, new _src_core.BrowserError("CONNECTION", `WebSocket CDP connection to ${this.#url} failed: ${error.message}`, { url: this.#url }));
 	}
 	#expire(request) {
-		this.#rejectRequest(request, new _src_core.BrowserConnectionError(`WebSocket CDP connection to ${this.#url} timed out after ${this.#timeout}ms`, {
+		this.#rejectRequest(request, new _src_core.BrowserError("CONNECTION", `WebSocket CDP connection to ${this.#url} timed out after ${this.#timeout}ms`, {
 			url: this.#url,
 			timeout: this.#timeout
 		}));
@@ -1056,7 +1023,7 @@ var FileBrowserWriter = class {
 };
 //#endregion
 //#region package.json
-var version = "0.0.25";
+var version = "0.0.27";
 //#endregion
 //#region src/server/BrowserMCPServer.ts
 /**
@@ -1064,9 +1031,9 @@ var version = "0.0.25";
 * the Model Context Protocol on stdio, and warms Chromium at server start.
 *
 * @remarks
-* The server's own manager holds one dispatcher per name of the vocabulary — `look`, `read`, `plain`,
-* `click`, `type`, `press`, `navigate`, `wait`, `dialog`, `tabs`, `switch`, `record`, `save`,
-* `journeys`, `edit`, `replay`, and `forget` — each carrying the description, parameters, and annotations
+* The server's own manager holds one dispatcher per name of the vocabulary — `read`, `click`,
+* `type`, `press`, `navigate`, `wait`, `dialog`, `switch`, `record`, `save`, `journeys`, `edit`,
+* `replay`, `forget`, and `capture` — each carrying the description, parameters, and annotations
 * `BROWSER_TOOL_COPY` gives, so `tools/list` answers before Chromium starts and with Chromium
 * absent. After the launch, a tool the toolset's manager adds under another name, such as a page
 * tool it adopts, is mirrored as a dispatcher with that tool's definition, and the mirror is
@@ -1103,7 +1070,7 @@ var version = "0.0.25";
 * ```ts
 * import { BrowserMCPServer } from '@orkestrel/browser/server'
 *
-* const server = new BrowserMCPServer({ root: 'tmp/browsers', readonly: true })
+* const server = new BrowserMCPServer({ root: 'tmp/browsers', journeys: { readonly: true } })
 * await server.start()
 * await server.destroy()
 * ```
@@ -1166,8 +1133,8 @@ var BrowserMCPServer = class {
 	constructor(options) {
 		const size = options?.pool?.size ?? 1;
 		const contexts = options?.pool?.contexts ?? 2;
-		if (!(0, _orkestrel_contract.isInteger)(size) || size < 1 || size > 3) throw new _src_core.BrowserError(`pool.size must be an integer from 1 through 3`, BROWSER_SERVER_OPTIONS);
-		if (!(0, _orkestrel_contract.isInteger)(contexts) || contexts < 1 || contexts > 4) throw new _src_core.BrowserError(`pool.contexts must be an integer from 1 through 4`, BROWSER_SERVER_OPTIONS);
+		if (!(0, _orkestrel_contract.isInteger)(size) || size < 1 || size > 3) throw new _src_core.BrowserError(BROWSER_SERVER_OPTIONS, `pool.size must be an integer from 1 through 3`, { subject: "server" });
+		if (!(0, _orkestrel_contract.isInteger)(contexts) || contexts < 1 || contexts > 4) throw new _src_core.BrowserError(BROWSER_SERVER_OPTIONS, `pool.contexts must be an integer from 1 through 4`, { subject: "server" });
 		this.#admission = size * contexts;
 		this.#log = options?.log ?? process.stderr;
 		this.#reference = this.#issue.bind(this);
@@ -1182,11 +1149,11 @@ var BrowserMCPServer = class {
 			restarts: 1
 		});
 		this.#root = (0, node_path.resolve)(options?.root ?? "tmp/browsers");
-		this.#headless = options?.headless ?? true;
-		this.#executable = options?.executable;
-		this.#viewport = options?.viewport;
-		this.#readonly = options?.readonly ?? false;
-		this.#launcher = options?.launch ?? createBrowser;
+		this.#headless = options?.browser?.headless ?? true;
+		this.#executable = options?.browser?.executable;
+		this.#viewport = options?.browser?.viewport;
+		this.#readonly = options?.journeys?.readonly ?? false;
+		this.#launcher = options?.pool?.launch ?? createBrowser;
 		this.#input = options?.stdio?.input ?? process.stdin;
 		this.#tools = (0, _orkestrel_tool.createToolManager)();
 		const names = [..._src_core.BROWSER_TOOL_NAMES, ..._src_core.BROWSER_JOURNEY_TOOL_NAMES];
@@ -1250,7 +1217,7 @@ var BrowserMCPServer = class {
 			warming.then(this.#exhaust.bind(this));
 		} catch (error) {
 			if (this.#closing !== void 0) return;
-			if ((0, _src_core.isBrowserError)(error) && error.code === "BROWSER_SERVER_UNAVAILABLE") throw error;
+			if ((0, _src_core.isBrowserError)(error) && error.code === "SERVER_UNAVAILABLE") throw error;
 			throw this.#unavailable((0, _orkestrel_pool.isPoolError)(error) ? error.cause ?? this.#failure : error);
 		}
 	}
@@ -1300,12 +1267,16 @@ var BrowserMCPServer = class {
 			signal: context.signal,
 			...context.caller === void 0 ? {} : { caller: context.caller }
 		});
-		if (!result.success || typeof result.value !== "string") return result;
+		if (!result.success) return {
+			...result,
+			error: (0, _src_core.boundBrowserText)(result.error, _src_core.BROWSER_TOOL_LIMIT, _src_core.BROWSER_TOOL_CUT_FOOTER)
+		};
+		if (typeof result.value !== "string") return result;
 		return {
 			resultType: "complete",
 			content: [{
 				type: "text",
-				text: result.value
+				text: context.call.name === "acquire" || context.call.name === "tools" ? result.value : (0, _src_core.boundBrowserText)(result.value, _src_core.BROWSER_TOOL_LIMIT, _src_core.BROWSER_TOOL_CUT_FOOTER)
 			}]
 		};
 	}
@@ -1321,8 +1292,8 @@ var BrowserMCPServer = class {
 		context.signal.throwIfAborted();
 		if (this.#closing !== void 0) throw this.#ended();
 		const purpose = args["purpose"];
-		if (!(0, _orkestrel_contract.isString)(purpose) || purpose.trim().length === 0) throw new _src_core.BrowserError("purpose must describe the work", "BROWSER_TOOLSET_ARGUMENT");
-		if (this.#holders.size >= this.#admission) throw new _src_core.BrowserError(`${BROWSER_SERVER_BUSY}: ${[...this.#holders.values()].map((holder) => `${holder.id} (${holder.purpose})`).join(", ")}. Call destroy for a holder no longer needed or call the named tools to share the shared browser.`, BROWSER_SERVER_BUSY);
+		if (!(0, _orkestrel_contract.isString)(purpose) || purpose.trim().length === 0) throw new _src_core.BrowserError("ARGUMENT", "purpose must describe the work", { subject: "toolset" });
+		if (this.#holders.size >= this.#admission) throw new _src_core.BrowserError(BROWSER_SERVER_BUSY, `${BROWSER_SERVER_BUSY}: ${[...this.#holders.values()].map((holder) => `${holder.id} (${holder.purpose})`).join(", ")}. Call destroy for a holder no longer needed or call the named tools to share the shared browser.`);
 		const holder = {
 			id: (0, node_crypto.randomUUID)(),
 			purpose,
@@ -1349,14 +1320,14 @@ var BrowserMCPServer = class {
 	}
 	#holder(value) {
 		const holder = (0, _orkestrel_contract.isString)(value) ? this.#holders.get(value) : void 0;
-		if (holder === void 0 || holder === this.#shared || holder.abort.signal.aborted) throw new _src_core.BrowserError(`${BROWSER_SERVER_HOLDER}: unknown or ended holder`, BROWSER_SERVER_HOLDER);
+		if (holder === void 0 || holder === this.#shared || holder.abort.signal.aborted) throw new _src_core.BrowserError(BROWSER_SERVER_HOLDER, `${BROWSER_SERVER_HOLDER}: unknown or ended holder`);
 		return holder;
 	}
 	async #dispatch(args, context) {
 		const holder = this.#holder(args["holder"]);
 		const name = args["name"];
 		const parameters = args["arguments"];
-		if (!(0, _orkestrel_contract.isString)(name) || !(0, _orkestrel_contract.isRecord)(parameters)) throw new _src_core.BrowserError("execute requires name and arguments", "BROWSER_TOOLSET_ARGUMENT");
+		if (!(0, _orkestrel_contract.isString)(name) || !(0, _orkestrel_contract.isRecord)(parameters)) throw new _src_core.BrowserError("ARGUMENT", "execute requires name and arguments", { subject: "toolset" });
 		return this.#forward(holder, name, parameters, context);
 	}
 	async #catalog(args, context) {
@@ -1373,8 +1344,8 @@ var BrowserMCPServer = class {
 			return this.#annotate(holder, JSON.stringify(catalog));
 		} catch (error) {
 			context.signal.throwIfAborted();
-			if (holder.abort.signal.aborted) throw new _src_core.BrowserError(`${BROWSER_SERVER_UNRESOLVED}: the holder ended during the call`, BROWSER_SERVER_UNRESOLVED);
-			if ((0, _src_core.isBrowserError)(error)) throw new _src_core.BrowserError(this.#annotate(holder, `${error.code}: ${error.message}`), error.code);
+			if (holder.abort.signal.aborted) throw new _src_core.BrowserError(BROWSER_SERVER_UNRESOLVED, `${BROWSER_SERVER_UNRESOLVED}: the holder ended during the call`);
+			if ((0, _src_core.isBrowserError)(error)) throw new _src_core.BrowserError(error.code, this.#annotate(holder, `${error.code}: ${error.message}`));
 			throw error;
 		}
 	}
@@ -1411,7 +1382,7 @@ var BrowserMCPServer = class {
 		context.signal.throwIfAborted();
 		const journey = args["journey"];
 		if (name !== "replay" && name !== "forget" || !(0, _orkestrel_contract.isString)(journey)) return this.#perform(holder, name, args, context);
-		if (this.#writers.has(journey) || name === "forget" && this.#readers.has(journey)) throw new _src_core.BrowserError(`BROWSER_JOURNEY_LOCKED: Journey ${journey} is locked; call ${name} again.`, "BROWSER_JOURNEY_LOCKED", { name: journey });
+		if (this.#writers.has(journey) || name === "forget" && this.#readers.has(journey)) throw new _src_core.BrowserError("STORE_LOCKED", `STORE_LOCKED: Journey ${journey} is locked; call ${name} again.`, { name: journey });
 		const reader = Symbol(journey);
 		if (name === "forget") this.#writers.add(journey);
 		else {
@@ -1437,8 +1408,8 @@ var BrowserMCPServer = class {
 			lease = await this.#serve(holder, signal);
 		} catch (error) {
 			context.signal.throwIfAborted();
-			if (holder !== this.#shared && holder.abort.signal.aborted) throw new _src_core.BrowserError(`${BROWSER_SERVER_UNRESOLVED}: the holder ended during the call`, BROWSER_SERVER_UNRESOLVED);
-			if ((0, _src_core.isBrowserError)(error)) throw new _src_core.BrowserError(this.#annotate(holder, `${error.code}: ${error.message}`), error.code);
+			if (holder !== this.#shared && holder.abort.signal.aborted) throw new _src_core.BrowserError(BROWSER_SERVER_UNRESOLVED, `${BROWSER_SERVER_UNRESOLVED}: the holder ended during the call`);
+			if ((0, _src_core.isBrowserError)(error)) throw new _src_core.BrowserError(error.code, this.#annotate(holder, `${error.code}: ${error.message}`));
 			throw error;
 		}
 		let result;
@@ -1463,7 +1434,7 @@ var BrowserMCPServer = class {
 			};
 		}
 		context.signal.throwIfAborted();
-		if (holder !== this.#shared && holder.abort.signal.aborted) throw new _src_core.BrowserError(BROWSER_SERVER_UNRESOLVED + ": the holder ended during the call", BROWSER_SERVER_UNRESOLVED);
+		if (holder !== this.#shared && holder.abort.signal.aborted) throw new _src_core.BrowserError(BROWSER_SERVER_UNRESOLVED, BROWSER_SERVER_UNRESOLVED + ": the holder ended during the call");
 		if (!result.success) {
 			if (this.#leases.get(holder) === lease && !context.signal.aborted) try {
 				await this.#race(this.#ping(lease.token.value), context.signal);
@@ -1471,9 +1442,9 @@ var BrowserMCPServer = class {
 			context.signal.throwIfAborted();
 			if (this.#leases.get(holder) !== lease) {
 				const loss = this.#departures.get(lease);
-				throw new _src_core.BrowserError(this.#annotate(holder, describeBrowserServerLoss(BROWSER_SERVER_UNRESOLVED, loss?.cause, loss?.url), lease), BROWSER_SERVER_UNRESOLVED);
+				throw new _src_core.BrowserError(BROWSER_SERVER_UNRESOLVED, this.#annotate(holder, describeBrowserServerLoss(BROWSER_SERVER_UNRESOLVED, loss?.cause, loss?.url), lease));
 			}
-			throw new _src_core.BrowserError(this.#annotate(holder, result.error, lease));
+			throw new _src_core.BrowserError("PROTOCOL", (0, _src_core.boundBrowserText)(this.#annotate(holder, result.error, lease), _src_core.BROWSER_TOOL_LIMIT, _src_core.BROWSER_TOOL_CUT_FOOTER));
 		}
 		return typeof result.value === "string" ? this.#annotate(holder, result.value, lease) : result.value;
 	}
@@ -1487,6 +1458,10 @@ var BrowserMCPServer = class {
 		}
 		return [...notes, value].join("\n");
 	}
+	#notice(context) {
+		const entry = [...this.#leases].find(([, lease]) => lease.generation.context === context);
+		return entry === void 0 ? "" : this.#annotate(entry[0], "");
+	}
 	async #handshake(options) {
 		try {
 			await this.#race(this.#starting, options.signal);
@@ -1637,7 +1612,7 @@ var BrowserMCPServer = class {
 		if (this.#leases.get(holder) !== lease || this.#holders.get(holder.id) !== holder) return;
 		this.#departures.set(lease, {
 			cause,
-			url: lease.generation.toolset.view.url
+			url: lease.generation.toolset.redact(lease.generation.toolset.view.url)
 		});
 		if (holder === this.#shared) this.#unmirror();
 		this.#leases.delete(holder);
@@ -1779,6 +1754,7 @@ var BrowserMCPServer = class {
 			}
 			toolset = (0, _src_core.createBrowserToolset)(page, {
 				context,
+				notes: this.#notice.bind(this, context),
 				journeys: {
 					store: createFileBrowserJourneyStore({ root: this.#root }),
 					runs: createFileBrowserRunStore({ root: this.#root }),
@@ -1798,7 +1774,7 @@ var BrowserMCPServer = class {
 		} catch (error) {
 			await toolset?.destroy().catch(this.#fault.bind(this));
 			await context?.close().catch((failure) => {
-				if (!this.#losses.has(slot) && slot.browser.status === "connected" && this.#closing === void 0 && !(0, _src_core.isCDPConnectionError)(failure)) this.#fault(failure);
+				if (!this.#losses.has(slot) && slot.browser.status === "connected" && this.#closing === void 0 && !((0, _src_core.isBrowserError)(failure) && failure.code === "DISCONNECTED")) this.#fault(failure);
 			});
 			await (0, node_fs_promises.rm)(directory, {
 				recursive: true,
@@ -1808,7 +1784,8 @@ var BrowserMCPServer = class {
 		}
 	}
 	async #destroyRecord(slot) {
-		if ((0, _src_core.isCDPTimeoutError)(this.#losses.get(slot)?.cause) && slot.browser.pid !== void 0) try {
+		const cause = this.#losses.get(slot)?.cause;
+		if ((0, _src_core.isBrowserError)(cause) && cause.code === "TIMEOUT" && slot.browser.pid !== void 0) try {
 			process.kill(slot.browser.pid, "SIGKILL");
 		} catch (error) {
 			if (!(0, _orkestrel_contract.isError)(error) || !("code" in error) || error.code !== "ESRCH") this.#faults.add(error);
@@ -1833,7 +1810,7 @@ var BrowserMCPServer = class {
 	}
 	async #warm() {
 		if (this.#closing !== void 0) throw this.#ended();
-		if (this.#stranded !== void 0) throw new _src_core.BrowserError((0, _orkestrel_contract.isError)(this.#stranded) ? this.#stranded.message : String(this.#stranded), BROWSER_SERVER_TEARDOWN, (0, _src_core.isBrowserError)(this.#stranded) ? this.#stranded.context : void 0);
+		if (this.#stranded !== void 0) throw new _src_core.BrowserError(BROWSER_SERVER_TEARDOWN, (0, _orkestrel_contract.isError)(this.#stranded) ? this.#stranded.message : String(this.#stranded), (0, _src_core.isBrowserError)(this.#stranded) ? this.#stranded.context : void 0);
 		const profile = (0, node_path.join)(this.#root, ".profiles", formatBrowserLockEntry(process.pid, (0, node_crypto.randomUUID)()));
 		let browser;
 		let slot;
@@ -1906,7 +1883,7 @@ var BrowserMCPServer = class {
 					const record = parseBrowserProfileRecord(await (0, node_fs_promises.readFile)((0, node_path.join)(folder, BROWSER_SERVER_RECORD), "utf8"));
 					if (record === void 0) continue;
 					if (probeProcess(record.pid)) {
-						const transport = createCDPTransport({ url: record.endpoint });
+						const transport = createWebSocketCDPTransport({ url: record.endpoint });
 						const client = (0, _src_core.createCDPClient)({ transport });
 						try {
 							this.#abort.signal.throwIfAborted();
@@ -1948,7 +1925,7 @@ var BrowserMCPServer = class {
 	}
 	#unavailable(cause) {
 		const message = describeBrowserServerLoss(BROWSER_SERVER_UNAVAILABLE, cause);
-		return new _src_core.BrowserError(message.slice(BROWSER_SERVER_UNAVAILABLE.length + 2), BROWSER_SERVER_UNAVAILABLE);
+		return new _src_core.BrowserError(BROWSER_SERVER_UNAVAILABLE, message.slice(BROWSER_SERVER_UNAVAILABLE.length + 2));
 	}
 	#issue() {
 		return `e${++this.#references}`;
@@ -1980,7 +1957,7 @@ var BrowserMCPServer = class {
 		tools.emitter.off("clear", mirrored.cleared);
 	}
 	#ended() {
-		return new _src_core.BrowserError("the browser session ended", "BROWSER_TOOLSET_ENDED");
+		return new _src_core.BrowserError("CLOSED", "the browser session ended", { subject: "toolset" });
 	}
 };
 //#endregion
@@ -1993,31 +1970,32 @@ var BrowserMCPServer = class {
 * const files = new FileBrowserStore({ root: directory })
 * files.validateName('check-ready')
 */
-var FileBrowserStore = class {
+var FileBrowserStore = class FileBrowserStore {
+	static #locks = /* @__PURE__ */ new Map();
 	#root;
 	#limit;
 	constructor(options) {
 		this.#limit = options.limit ?? 100;
-		if (!Number.isSafeInteger(this.#limit) || this.#limit < 1) throw new _src_core.BrowserError("The listing cap must be a positive integer", "BROWSER_JOURNEY_ARGUMENT");
+		if (!Number.isSafeInteger(this.#limit) || this.#limit < 1) throw new _src_core.BrowserError("ARGUMENT", "The listing cap must be a positive integer", { subject: "store" });
 		try {
 			this.#root = (0, node_fs.realpathSync)(options.root);
 		} catch (error) {
-			if (error instanceof Error && "code" in error && error.code === "ENOENT") throw new _src_core.BrowserError(`Missing root: ${options.root}`, "BROWSER_JOURNEY_PATH", { path: options.root });
+			if (error instanceof Error && "code" in error && error.code === "ENOENT") throw new _src_core.BrowserError("STORE_PATH", `Missing root: ${options.root}`, { path: options.root });
 			throw this.translateError(options.root, error);
 		}
 	}
 	/** Checks a journey name before filesystem access. @param name - Journey name */
 	validateName(name) {
-		if (!_src_core.BROWSER_JOURNEY_NAME_PATTERN.test(name)) throw new _src_core.BrowserError(`Refused journey name: ${name}`, "BROWSER_JOURNEY_PATH");
+		if (!_src_core.BROWSER_JOURNEY_NAME_PATTERN.test(name)) throw new _src_core.BrowserError("STORE_PATH", `Refused journey name: ${name}`);
 	}
 	/** Checks a run id before filesystem access. @param id - Producer id */
 	validateId(id) {
-		if (!_src_core.BROWSER_RUN_ID_PATTERN.test(id)) throw new _src_core.BrowserError(`Refused run id: ${id}`, "BROWSER_JOURNEY_PATH");
+		if (!_src_core.BROWSER_RUN_ID_PATTERN.test(id)) throw new _src_core.BrowserError("STORE_PATH", `Refused run id: ${id}`);
 	}
 	/** Resolves a confined target. @param parts - Relative components @returns Absolute target */
 	resolvePath(...parts) {
 		const path = (0, node_path.resolve)(this.#root, ...parts);
-		if (path !== this.#root && !path.startsWith(this.#root.endsWith(node_path.sep) ? this.#root : this.#root + node_path.sep)) throw new _src_core.BrowserError(`Refused path: ${path}`, "BROWSER_JOURNEY_PATH");
+		if (path !== this.#root && !path.startsWith(this.#root.endsWith(node_path.sep) ? this.#root : this.#root + node_path.sep)) throw new _src_core.BrowserError("STORE_PATH", `Refused path: ${path}`);
 		return path;
 	}
 	/**
@@ -2035,8 +2013,8 @@ var FileBrowserStore = class {
 			try {
 				const status = await (0, node_fs_promises.lstat)(current);
 				options?.signal?.throwIfAborted();
-				if (status.isSymbolicLink()) throw new _src_core.BrowserError(`Refused symbolic link: ${current}`, "BROWSER_JOURNEY_PATH");
-				if (index < parts.length && !status.isDirectory()) throw new _src_core.BrowserError(`Not a directory: ${current}`, "BROWSER_JOURNEY_PATH");
+				if (status.isSymbolicLink()) throw new _src_core.BrowserError("STORE_PATH", `Refused symbolic link: ${current}`);
+				if (index < parts.length && !status.isDirectory()) throw new _src_core.BrowserError("STORE_PATH", `Not a directory: ${current}`);
 			} catch (error) {
 				options?.signal?.throwIfAborted();
 				if (error instanceof Error && "code" in error && error.code === "ENOENT") return false;
@@ -2050,7 +2028,7 @@ var FileBrowserStore = class {
 	/** Creates checked directories one component at a time. @param path - Directory @param options - Cancellation options */
 	async createDirectory(path, options) {
 		if (await this.check(path, options)) return;
-		if (path === this.#root) throw new _src_core.BrowserError(`Missing root: ${path}`, "BROWSER_JOURNEY_PATH");
+		if (path === this.#root) throw new _src_core.BrowserError("STORE_PATH", `Missing root: ${path}`);
 		await this.createDirectory((0, node_path.dirname)(path), options);
 		options?.signal?.throwIfAborted();
 		try {
@@ -2100,7 +2078,7 @@ var FileBrowserStore = class {
 				await (0, node_fs_promises.rename)(temporary, path);
 			} catch (error) {
 				const target = await (0, node_fs_promises.lstat)(path).catch(() => void 0);
-				if (error instanceof Error && "code" in error && (error.code === "EISDIR" || error.code === "EPERM") && target?.isDirectory()) throw new _src_core.BrowserError(`Cannot replace directory: ${path}`, "BROWSER_JOURNEY_FILE", { path });
+				if (error instanceof Error && "code" in error && (error.code === "EISDIR" || error.code === "EPERM") && target?.isDirectory()) throw new _src_core.BrowserError("STORE_FILE", `Cannot replace directory: ${path}`, { path });
 				throw error;
 			}
 			owned = false;
@@ -2131,6 +2109,20 @@ var FileBrowserStore = class {
 	* @returns The mutation result
 	*/
 	async lock(path, action, options) {
+		const key = this.resolvePath(path);
+		const previous = FileBrowserStore.#locks.get(key);
+		const released = Promise.withResolvers();
+		FileBrowserStore.#locks.set(key, released.promise);
+		try {
+			await previous;
+			options?.signal?.throwIfAborted();
+			return await this.#lockFile(key, action, options);
+		} finally {
+			released.resolve();
+			if (FileBrowserStore.#locks.get(key) === released.promise) FileBrowserStore.#locks.delete(key);
+		}
+	}
+	async #lockFile(path, action, options) {
 		await this.createDirectory((0, node_path.dirname)(path), options);
 		const name = formatBrowserLockEntry(process.pid, (0, node_crypto.randomUUID)());
 		const entry = this.resolvePath(path, name);
@@ -2173,7 +2165,7 @@ var FileBrowserStore = class {
 				await this.#removeLock(path);
 			}
 		}
-		throw new _src_core.BrowserError(`Journey is locked: ${path}`, "BROWSER_JOURNEY_LOCKED");
+		throw new _src_core.BrowserError("STORE_LOCKED", `Journey is locked: ${path}`);
 	}
 	/**
 	* Lists readable entries in sorted order with a bounded page and one extra readable probe.
@@ -2220,7 +2212,7 @@ var FileBrowserStore = class {
 				const reason = error instanceof _src_core.BrowserError ? error.context?.["reason"] : void 0;
 				faults.push({
 					name,
-					reason: typeof reason === "string" ? reason : error instanceof _src_core.BrowserError && error.code === "BROWSER_JOURNEY_PATH" ? "The entry path is refused" : error instanceof _src_core.BrowserError && error.code === "BROWSER_JOURNEY_ACCESS" ? "Permission denied" : error instanceof _src_core.BrowserError && error.code === "BROWSER_JOURNEY_FORMAT" ? "Unknown file format" : "The stored entry is malformed or unreadable"
+					reason: typeof reason === "string" ? reason : error instanceof _src_core.BrowserError && error.code === "STORE_PATH" ? "The entry path is refused" : error instanceof _src_core.BrowserError && error.code === "STORE_ACCESS" ? "Permission denied" : error instanceof _src_core.BrowserError && error.code === "STORE_FORMAT" ? "Unknown file format" : "The stored entry is malformed or unreadable"
 				});
 			}
 		}
@@ -2263,7 +2255,7 @@ var FileBrowserStore = class {
 	/** Translates filesystem and validation failures with their path. @param path - Failed path @param error - Cause @returns Coded error */
 	translateError(path, error) {
 		const code = error instanceof Error && "code" in error ? error.code : void 0;
-		return new _src_core.BrowserError(`${path}: ${error instanceof Error ? error.message : String(error)}`, code === "EACCES" || code === "EPERM" ? "BROWSER_JOURNEY_ACCESS" : error instanceof _src_core.BrowserError && code !== "BROWSER_JOURNEY_INVALID" ? error.code : "BROWSER_JOURNEY_FILE", { path });
+		return new _src_core.BrowserError(code === "EACCES" || code === "EPERM" ? "STORE_ACCESS" : error instanceof _src_core.BrowserError && code !== "JOURNEY_INVALID" ? error.code : "STORE_FILE", `${path}: ${error instanceof Error ? error.message : String(error)}`, { path });
 	}
 	async #readLock(path, options) {
 		await this.check(path, options);
@@ -2271,13 +2263,13 @@ var FileBrowserStore = class {
 			const entries = await (0, node_fs_promises.readdir)(path, { withFileTypes: true });
 			for (const entry of entries) {
 				await this.check(this.resolvePath(path, entry.name), options);
-				if (!entry.isFile()) throw new _src_core.BrowserError(`Journey is locked: ${path}`, "BROWSER_JOURNEY_LOCKED");
+				if (!entry.isFile()) throw new _src_core.BrowserError("STORE_LOCKED", `Journey is locked: ${path}`);
 			}
 			return entries.map((entry) => entry.name);
 		} catch (error) {
 			if (error instanceof Error && "code" in error) {
 				if (error.code === "ENOENT") return void 0;
-				if (error.code === "ENOTDIR") throw new _src_core.BrowserError(`Journey is locked: ${path}`, "BROWSER_JOURNEY_LOCKED");
+				if (error.code === "ENOTDIR") throw new _src_core.BrowserError("STORE_LOCKED", `Journey is locked: ${path}`);
 			}
 			throw this.translateError(path, error);
 		}
@@ -2289,7 +2281,7 @@ var FileBrowserStore = class {
 			return true;
 		} catch (error) {
 			if (error instanceof Error && "code" in error && (error.code === "ENOENT" || error.code === "ENOTEMPTY")) return false;
-			throw new _src_core.BrowserError(`Cannot remove lock entry: ${path}`, "BROWSER_JOURNEY_ACCESS", { path });
+			throw new _src_core.BrowserError("STORE_ACCESS", `Cannot remove lock entry: ${path}`, { path });
 		}
 	}
 	async #removeLock(path) {
@@ -2305,7 +2297,7 @@ var FileBrowserStore = class {
 					if (cause instanceof Error && "code" in cause && cause.code === "ENOENT") return;
 				}
 			}
-			throw new _src_core.BrowserError(`Cannot remove lock directory: ${path}`, "BROWSER_JOURNEY_ACCESS", { path });
+			throw new _src_core.BrowserError("STORE_ACCESS", `Cannot remove lock directory: ${path}`, { path });
 		}
 	}
 };
@@ -2331,24 +2323,29 @@ var FileBrowserJourneyStore = class {
 		if (source === void 0) return void 0;
 		try {
 			const value = (0, _orkestrel_contract.parseJSON)(source);
-			if (!(0, _orkestrel_contract.isRecord)(value) || typeof value["revision"] !== "number" || !Number.isSafeInteger(value["revision"]) || value["revision"] < 1) throw new _src_core.BrowserError("Malformed journey revision", "BROWSER_JOURNEY_FILE");
-			if (!(0, _orkestrel_contract.isRecord)(value["journey"]) || !("format" in value["journey"])) throw new _src_core.BrowserError("Missing journey format", "BROWSER_JOURNEY_FILE");
+			if (!(0, _orkestrel_contract.isRecord)(value) || typeof value["revision"] !== "number" || !Number.isSafeInteger(value["revision"]) || value["revision"] < 1) throw new _src_core.BrowserError("STORE_FILE", "Malformed journey revision");
+			if (!(0, _orkestrel_contract.isRecord)(value["journey"]) || !("format" in value["journey"])) throw new _src_core.BrowserError("STORE_FILE", "Missing journey format");
 			(0, _src_core.validateBrowserJourney)(value["journey"]);
-			if (value["journey"].name !== name) throw new _src_core.BrowserError("Journey name differs from its directory", "BROWSER_JOURNEY_FILE");
+			if (value["journey"].name !== name) throw new _src_core.BrowserError("STORE_FILE", "Journey name differs from its directory");
 			return {
 				journey: value["journey"],
 				revision: value["revision"]
 			};
 		} catch (error) {
 			const translated = this.#files.translateError(path, error);
-			throw new _src_core.BrowserError(translated.message, translated.code, {
+			throw new _src_core.BrowserError(translated.code, translated.message, {
 				...translated.context,
 				reason: (0, _src_core.normalizeBrowserJourneyReason)(error)
 			});
 		}
 	}
-	async set(journey, expected, options) {
+	async set(journey, options) {
 		options?.signal?.throwIfAborted();
+		(0, _src_core.validateBrowserJourneyWriteOptions)(options);
+		const condition = {
+			revision: options?.revision,
+			exclusive: options?.exclusive
+		};
 		this.#files.validateName(journey.name);
 		(0, _src_core.validateBrowserJourney)(journey);
 		const owned = structuredClone(journey);
@@ -2356,12 +2353,12 @@ var FileBrowserJourneyStore = class {
 		const counter = this.#files.resolvePath(owned.name, BROWSER_JOURNEY_REVISION_FILE);
 		return this.#files.lock(this.#files.resolvePath(owned.name, BROWSER_JOURNEY_LOCK_DIRECTORY), async () => {
 			const current = await this.get(owned.name, options);
-			if (expected !== void 0 && expected !== (current?.revision ?? 0)) throw new _src_core.BrowserError(`Journey ${owned.name} changed since you read it`, "BROWSER_JOURNEY_STALE");
+			if (condition.exclusive === true && current !== void 0 || condition.revision !== void 0 && condition.revision !== current?.revision) throw new _src_core.BrowserError("JOURNEY_STALE", `Journey ${owned.name} changed since you read it`);
 			const source = await this.#files.read(counter, options);
 			const previous = source === void 0 ? 0 : Number(source);
-			if (!Number.isSafeInteger(previous) || previous < 0 || source?.trim() === "") throw new _src_core.BrowserError(`Malformed revision: ${counter}`, "BROWSER_JOURNEY_FILE");
+			if (!Number.isSafeInteger(previous) || previous < 0 || source?.trim() === "") throw new _src_core.BrowserError("STORE_FILE", `Malformed revision: ${counter}`);
 			const revision = Math.max(previous, current?.revision ?? 0) + 1;
-			if (!Number.isSafeInteger(revision)) throw new _src_core.BrowserError(`Exhausted revision: ${counter}`, "BROWSER_JOURNEY_FILE");
+			if (!Number.isSafeInteger(revision)) throw new _src_core.BrowserError("STORE_FILE", `Exhausted revision: ${counter}`);
 			const saved = {
 				journey: owned,
 				revision
@@ -2386,7 +2383,7 @@ var FileBrowserJourneyStore = class {
 			const counter = this.#files.resolvePath(name, BROWSER_JOURNEY_REVISION_FILE);
 			const source = await this.#files.read(counter, options);
 			const previous = source === void 0 ? 0 : Number(source);
-			if (!Number.isSafeInteger(previous) || previous < 0 || source?.trim() === "") throw new _src_core.BrowserError(`Malformed revision: ${counter}`, "BROWSER_JOURNEY_FILE");
+			if (!Number.isSafeInteger(previous) || previous < 0 || source?.trim() === "") throw new _src_core.BrowserError("STORE_FILE", `Malformed revision: ${counter}`);
 			await this.#files.write(counter, String(Math.max(previous, current.revision ?? 0)), options);
 			await this.#files.remove(this.#files.resolvePath(name, BROWSER_JOURNEY_SNAPSHOT_FILE), options);
 		}, options);
@@ -2408,7 +2405,7 @@ var FileBrowserJourneyStore = class {
 * still refuses conflicting mutations and allocations from another process.
 * @example
 * const store = new FileBrowserRunStore({ root: directory })
-* const slot = await store.open('check-ready')
+* const slot = await store.create('check-ready')
 */
 var FileBrowserRunStore = class FileBrowserRunStore {
 	static #allocations = /* @__PURE__ */ new Map();
@@ -2418,7 +2415,7 @@ var FileBrowserRunStore = class FileBrowserRunStore {
 	constructor(options) {
 		this.#files = new FileBrowserStore(options);
 	}
-	async snapshot(bytes, options) {
+	async write(bytes, options) {
 		options?.signal?.throwIfAborted();
 		const owned = new Uint8Array(bytes);
 		const directory = await this.#files.allocate(this.#files.resolvePath(BROWSER_RUN_DIRECTORY), _src_core.generateBrowserRunId, options);
@@ -2436,7 +2433,7 @@ var FileBrowserRunStore = class FileBrowserRunStore {
 			throw this.#files.translateError(path, error);
 		}
 	}
-	async open(name, options) {
+	async create(name, options) {
 		options?.signal?.throwIfAborted();
 		this.#files.validateName(name);
 		const path = this.#files.resolvePath(name, BROWSER_JOURNEY_LOCK_DIRECTORY);
@@ -2470,10 +2467,10 @@ var FileBrowserRunStore = class FileBrowserRunStore {
 		if (source === void 0) return void 0;
 		try {
 			const value = (0, _orkestrel_contract.parseJSON)(source);
-			if (!(0, _orkestrel_contract.isRecord)(value) || !("format" in value)) throw new _src_core.BrowserError("Missing run format", "BROWSER_JOURNEY_FILE");
-			if (value["format"] === _src_core.BROWSER_JOURNEY_FORMAT_VERSION && (!(0, _orkestrel_contract.isRecord)(value["journey"]) || !("format" in value["journey"]))) throw new _src_core.BrowserError("Missing run journey format", "BROWSER_JOURNEY_FILE");
+			if (!(0, _orkestrel_contract.isRecord)(value) || !("format" in value)) throw new _src_core.BrowserError("STORE_FILE", "Missing run format");
+			if (value["format"] === _src_core.BROWSER_JOURNEY_FORMAT_VERSION && (!(0, _orkestrel_contract.isRecord)(value["journey"]) || !("format" in value["journey"]))) throw new _src_core.BrowserError("STORE_FILE", "Missing run journey format");
 			(0, _src_core.validateBrowserRun)(value);
-			if (value.id !== id || value.journey.name !== name) throw new _src_core.BrowserError("Run identity differs from its directory", "BROWSER_JOURNEY_FILE");
+			if (value.id !== id || value.journey.name !== name) throw new _src_core.BrowserError("STORE_FILE", "Run identity differs from its directory");
 			return value;
 		} catch (error) {
 			throw this.#files.translateError(path, error);
@@ -2492,7 +2489,7 @@ var FileBrowserRunStore = class FileBrowserRunStore {
 	async capture(slot, name, bytes, options) {
 		options?.signal?.throwIfAborted();
 		const directory = this.#slots.get(slot);
-		if (directory === void 0 || !/^s[1-9]\d*\.png$/.test(name)) throw new _src_core.BrowserError("Capture requires an opened slot and an sN.png name", "BROWSER_JOURNEY_PATH");
+		if (directory === void 0 || !/^s[1-9]\d*\.png$/.test(name)) throw new _src_core.BrowserError("STORE_PATH", "Capture requires an opened slot and an sN.png name");
 		const owned = new Uint8Array(bytes);
 		await this.#requireDirectory(directory, options);
 		await this.#files.write(this.#files.resolvePath(directory, name), owned, options);
@@ -2545,12 +2542,12 @@ var FileBrowserRunStore = class FileBrowserRunStore {
 		return this.#files.list(this.#files.resolvePath(name, BROWSER_RUN_DIRECTORY), (id) => this.get(name, id, options), options);
 	}
 	async #requireDirectory(directory, options) {
-		if (!this.#directories.has(directory) || !await this.#files.check(directory, options)) throw new _src_core.BrowserError(`Run directory was not opened or is missing: ${directory}`, "BROWSER_JOURNEY_PATH");
+		if (!this.#directories.has(directory) || !await this.#files.check(directory, options)) throw new _src_core.BrowserError("STORE_PATH", `Run directory was not opened or is missing: ${directory}`);
 		try {
 			options?.signal?.throwIfAborted();
 			const status = await (0, node_fs_promises.lstat)(directory);
 			options?.signal?.throwIfAborted();
-			if (!status.isDirectory()) throw new _src_core.BrowserError(`Run directory is not a directory: ${directory}`, "BROWSER_JOURNEY_PATH");
+			if (!status.isDirectory()) throw new _src_core.BrowserError("STORE_PATH", `Run directory is not a directory: ${directory}`);
 		} catch (error) {
 			options?.signal?.throwIfAborted();
 			throw this.#files.translateError(directory, error);
@@ -2587,7 +2584,7 @@ function createBrowser(options) {
 * @param options - The CDP WebSocket debugger URL (and optional timeout)
 * @returns A {@link CDPTransportInterface}
 */
-function createCDPTransport(options) {
+function createWebSocketCDPTransport(options) {
 	return new WebSocketCDPTransport(options);
 }
 /**
@@ -2596,7 +2593,7 @@ function createCDPTransport(options) {
 *
 * @returns A {@link BrowserWriterInterface} that persists bytes through `node:fs/promises`
 */
-function createBrowserWriter() {
+function createFileBrowserWriter() {
 	return new FileBrowserWriter();
 }
 /**
@@ -2630,7 +2627,7 @@ function createFileBrowserRunStore(options) {
 * ```ts
 * import { createBrowserMCPServer } from '@orkestrel/browser/server'
 *
-* const server = createBrowserMCPServer({ root: 'tmp/browsers', headless: true })
+* const server = createBrowserMCPServer({ root: 'tmp/browsers', browser: { headless: true } })
 * await server.start() // resolves after leasing a connected browser
 * await server.destroy()
 * ```
@@ -2685,7 +2682,7 @@ var Browser = class {
 			...options?.error !== void 0 ? { error: options.error } : {}
 		});
 		this.#options = options ?? {};
-		this.#engine = this.#options.engine ?? (this.#options.executable !== void 0 ? parseBrowserEngine(this.#options.executable) ?? "chromium" : "chromium");
+		this.#engine = this.#options.executable !== void 0 ? parseBrowserEngine(this.#options.executable) ?? "chromium" : this.#options.browsers?.engine ?? "chromium";
 		this.#cdpPort = this.#options.cdp?.port ?? 9222;
 		this.#cdpHost = this.#options.cdp?.host ?? "127.0.0.1";
 		queueMicrotask(() => this.#emitter.emit("idle"));
@@ -2712,9 +2709,9 @@ var Browser = class {
 		return this.#endpoint;
 	}
 	async ping(options) {
-		if (this.#destroyed) throw new BrowserDestroyedError();
+		if (this.#destroyed) throw new _src_core.BrowserError("CLOSED", "Browser has been destroyed", { subject: "browser" });
 		const client = this.#client;
-		if (this.#status !== "connected" || client === void 0) throw new BrowserNotConnectedError();
+		if (this.#status !== "connected" || client === void 0) throw new _src_core.BrowserError("DISCONNECTED", "Browser is not connected");
 		await client.send("Browser.getVersion", void 0, options);
 	}
 	async discover() {
@@ -2723,7 +2720,7 @@ var Browser = class {
 		return result;
 	}
 	async connect() {
-		if (this.#destroyed) throw new BrowserDestroyedError();
+		if (this.#destroyed) throw new _src_core.BrowserError("CLOSED", "Browser has been destroyed", { subject: "browser" });
 		const active = this.#connecting.pending;
 		if (active !== void 0) {
 			await active;
@@ -2733,8 +2730,8 @@ var Browser = class {
 		await this.#connecting.execute(() => this.#establish());
 	}
 	adopt() {
-		if (this.#destroyed) throw new BrowserDestroyedError();
-		if (this.#status !== "connected" || this.#client === void 0 || this.#endpoint === void 0) throw new BrowserNotConnectedError();
+		if (this.#destroyed) throw new _src_core.BrowserError("CLOSED", "Browser has been destroyed", { subject: "browser" });
+		if (this.#status !== "connected" || this.#client === void 0 || this.#endpoint === void 0) throw new _src_core.BrowserError("DISCONNECTED", "Browser is not connected");
 		this.#owned = true;
 	}
 	async disconnect() {
@@ -2765,12 +2762,15 @@ var Browser = class {
 		}
 	}
 	async create(options) {
-		if (this.#destroyed) throw new BrowserDestroyedError();
+		if (this.#destroyed) throw new _src_core.BrowserError("CLOSED", "Browser has been destroyed", { subject: "browser" });
 		const client = this.#client;
-		if (this.#status !== "connected" || client === void 0) throw new BrowserNotConnectedError();
+		if (this.#status !== "connected" || client === void 0) throw new _src_core.BrowserError("DISCONNECTED", "Browser is not connected");
 		let context = this.#contexts[0];
 		if (context === void 0) {
-			context = new _src_core.BrowserContext(client, void 0, this.#options.viewport, createBrowserWriter());
+			context = new _src_core.BrowserContext(client, {
+				...this.#options.viewport === void 0 ? {} : { viewport: this.#options.viewport },
+				writer: createFileBrowserWriter()
+			});
 			this.#registerContext(context);
 		}
 		const page = await context.create(options);
@@ -2798,10 +2798,11 @@ var Browser = class {
 		return shutdown;
 	}
 	async #isolate(options) {
-		if (this.#destroyed) throw new BrowserDestroyedError();
+		if (this.#destroyed) throw new _src_core.BrowserError("CLOSED", "Browser has been destroyed", { subject: "browser" });
 		const client = this.#client;
-		if (this.#status !== "connected" || client === void 0) throw new BrowserNotConnectedError();
+		if (this.#status !== "connected" || client === void 0) throw new _src_core.BrowserError("DISCONNECTED", "Browser is not connected");
 		(0, _src_core.validateBrowserContextOptions)(options);
+		if (options !== void 0 && "id" in options && options.id !== void 0) throw new _src_core.BrowserError("ARGUMENT", "An isolated context receives its id from the browser");
 		const params = { disposeOnDetach: false };
 		if (options?.proxy !== void 0) {
 			params["proxyServer"] = options.proxy.server;
@@ -2809,18 +2810,25 @@ var Browser = class {
 		}
 		if (options?.origins !== void 0) params["originsWithUniversalNetworkAccess"] = [...options.origins];
 		const result = await client.send("Target.createBrowserContext", params);
-		if (!(0, _orkestrel_contract.isRecord)(result) || !(0, _orkestrel_contract.isString)(result["browserContextId"])) throw new _src_core.BrowserConnectionError("Failed to create isolated browser context");
+		if (!(0, _orkestrel_contract.isRecord)(result) || !(0, _orkestrel_contract.isString)(result["browserContextId"])) throw new _src_core.BrowserError("CONNECTION", "Failed to create isolated browser context");
 		const id = result["browserContextId"];
-		const context = new _src_core.BrowserContext(client, id, options?.emulation?.viewport ?? this.#options.viewport, createBrowserWriter(), options?.emulation, options?.downloads, options);
+		const { proxy: _proxy, origins: _origins, ...defaults } = options ?? {};
+		const viewport = options?.viewport ?? options?.emulation?.viewport ?? this.#options.viewport;
+		const context = new _src_core.BrowserContext(client, {
+			...defaults,
+			id,
+			...viewport === void 0 ? {} : { viewport },
+			writer: options?.writer ?? createFileBrowserWriter()
+		});
 		try {
-			if (this.#destroyed || this.#client !== client) throw new BrowserDestroyedError();
+			if (this.#destroyed || this.#client !== client) throw new _src_core.BrowserError("CLOSED", "Browser has been destroyed", { subject: "browser" });
 			if (options?.downloads !== void 0) await client.send("Browser.setDownloadBehavior", {
 				behavior: options.downloads.named === true ? "allowAndName" : "allow",
 				browserContextId: id,
 				downloadPath: options.downloads.path,
 				eventsEnabled: true
 			});
-			if (this.#destroyed || this.#client !== client) throw new BrowserDestroyedError();
+			if (this.#destroyed || this.#client !== client) throw new _src_core.BrowserError("CLOSED", "Browser has been destroyed", { subject: "browser" });
 		} catch (error) {
 			await context.close().catch(() => void 0);
 			throw error;
@@ -2832,7 +2840,7 @@ var Browser = class {
 		const disconnecting = this.#disconnecting.pending;
 		if (disconnecting !== void 0) await disconnecting;
 		await this.#settleExit();
-		if (this.#destroyed) throw new BrowserDestroyedError();
+		if (this.#destroyed) throw new _src_core.BrowserError("CLOSED", "Browser has been destroyed", { subject: "browser" });
 		if (this.#status === "connected") return;
 		this.#assertNotAborted();
 		this.#status = "connecting";
@@ -2857,12 +2865,12 @@ var Browser = class {
 			this.#assertNotAborted();
 			await this.#launch();
 		} catch (error) {
-			if (this.#destroyed) throw new BrowserDestroyedError();
+			if (this.#destroyed) throw new _src_core.BrowserError("CLOSED", "Browser has been destroyed", { subject: "browser" });
 			this.#status = "error";
 			this.#emitter.emit("error", error);
-			if ((0, _src_core.isBrowserConnectionError)(error)) throw error;
+			if ((0, _src_core.isBrowserError)(error) && error.code === "CONNECTION") throw error;
 			const message = (0, _orkestrel_contract.isError)(error) ? error.message : String(error);
-			throw new _src_core.BrowserConnectionError(message, { executable: this.#options.executable });
+			throw new _src_core.BrowserError("CONNECTION", message, this.#options.executable === void 0 ? void 0 : { executable: this.#options.executable });
 		}
 	}
 	async #detach() {
@@ -2883,7 +2891,7 @@ var Browser = class {
 		this.#emitter.emit("idle");
 	}
 	#assertNotAborted() {
-		if (this.#signal().aborted) throw new _src_core.BrowserConnectionError("Connection aborted");
+		if (this.#signal().aborted) throw new _src_core.BrowserError("CONNECTION", "Connection aborted");
 	}
 	#signal() {
 		const external = this.#options.signal;
@@ -2891,10 +2899,10 @@ var Browser = class {
 	}
 	async #raceAbort(promise) {
 		const signal = this.#signal();
-		if (signal.aborted) throw new _src_core.BrowserConnectionError("Connection aborted");
+		if (signal.aborted) throw new _src_core.BrowserError("CONNECTION", "Connection aborted");
 		const aborted = Promise.withResolvers();
 		const listener = (0, node_events.addAbortListener)(signal, () => {
-			aborted.reject(new _src_core.BrowserConnectionError("Connection aborted"));
+			aborted.reject(new _src_core.BrowserError("CONNECTION", "Connection aborted"));
 		});
 		try {
 			return await Promise.race([promise, aborted.promise]);
@@ -2922,7 +2930,7 @@ var Browser = class {
 		this.#owned = void 0;
 		this.#endpoint = void 0;
 		if (connected) this.#status = "disconnected";
-		this.#emitter.emit("error", new _src_core.BrowserConnectionError("The browser process exited unexpectedly", { cause: BROWSER_PROCESS_EXIT_CAUSE }));
+		this.#emitter.emit("error", new _src_core.BrowserError("CONNECTION", "The browser process exited unexpectedly", { cause: BROWSER_PROCESS_EXIT_CAUSE }));
 		if (connected) {
 			this.#emitter.emit("disconnect");
 			this.#emitter.emit("idle");
@@ -2960,7 +2968,7 @@ var Browser = class {
 		}
 		this.#destroyContextList(contexts);
 		this.#closeClient(client);
-		this.#emitter.emit("error", new _src_core.BrowserConnectionError("The CDP transport connection was lost", { cause: BROWSER_TRANSPORT_LOSS_CAUSE }));
+		this.#emitter.emit("error", new _src_core.BrowserError("CONNECTION", "The CDP transport connection was lost", { cause: BROWSER_TRANSPORT_LOSS_CAUSE }));
 		this.#emitter.emit("disconnect");
 		this.#emitter.emit("idle");
 	}
@@ -3013,7 +3021,7 @@ var Browser = class {
 		};
 	}
 	async #assertPortFree() {
-		if (await this.#probePort()) throw new _src_core.BrowserConnectionError(`Port ${this.#cdpPort} on ${this.#cdpHost} is already occupied by another CDP endpoint`, {
+		if (await this.#probePort()) throw new _src_core.BrowserError("CONNECTION", `Port ${this.#cdpPort} on ${this.#cdpHost} is already occupied by another CDP endpoint`, {
 			port: this.#cdpPort,
 			host: this.#cdpHost
 		});
@@ -3027,7 +3035,7 @@ var Browser = class {
 		}
 	}
 	async #connectCDP(endpoint) {
-		const transport = createCDPTransport({
+		const transport = createWebSocketCDPTransport({
 			url: endpoint,
 			timeout: this.#timeout()
 		});
@@ -3060,20 +3068,20 @@ var Browser = class {
 		}
 	}
 	async #launch() {
-		if (this.#process !== void 0) throw new _src_core.BrowserConnectionError("A browser process is already active on this instance");
-		const requestedEngine = this.#options.engine ?? this.#options.browsers?.engine;
+		if (this.#process !== void 0) throw new _src_core.BrowserError("CONNECTION", "A browser process is already active on this instance");
+		const requestedEngine = this.#options.browsers?.engine;
 		let executable = this.#options.executable;
 		let resolvedEngine;
 		if (executable !== void 0) resolvedEngine = parseBrowserEngine(executable) ?? "chromium";
 		else {
-			const found = findSystemBrowser({
+			const found = findSystemBrowsers({
 				...this.#options.browsers,
 				...requestedEngine !== void 0 ? { engine: requestedEngine } : {}
-			});
+			})[0];
 			executable = found?.executable;
 			resolvedEngine = found?.engine;
 		}
-		if (executable === void 0) throw new _src_core.BrowserConnectionError("No Chromium browser found. Install Chrome, Edge, or Chromium.", requestedEngine === void 0 ? void 0 : { engine: requestedEngine });
+		if (executable === void 0) throw new _src_core.BrowserError("CONNECTION", "No Chromium browser found. Install Chrome, Edge, or Chromium.", requestedEngine === void 0 ? void 0 : { engine: requestedEngine });
 		this.#engine = resolvedEngine ?? "chromium";
 		await this.#releaseProfile();
 		const profile = await createBrowserProfile(this.#options.profile);
@@ -3089,7 +3097,7 @@ var Browser = class {
 		let client;
 		try {
 			const endpoint = await this.#waitForLaunch(process, executable, this.#options.args);
-			const transport = createCDPTransport({
+			const transport = createWebSocketCDPTransport({
 				url: endpoint,
 				timeout: this.#timeout()
 			});
@@ -3153,9 +3161,9 @@ var Browser = class {
 		}
 		if (pid === void 0) {
 			await this.#closeRemote(client);
-			throw new _src_core.BrowserConnectionError("The browser launcher exited without naming the process serving its CDP endpoint", {
-				executable: this.#options.executable,
-				pid: process.pid
+			throw new _src_core.BrowserError("CONNECTION", "The browser launcher exited without naming the process serving its CDP endpoint", {
+				...this.#options.executable === void 0 ? {} : { executable: this.#options.executable },
+				...process.pid === void 0 ? {} : { pid: process.pid }
 			});
 		}
 		this.#servingPid = pid;
@@ -3163,7 +3171,7 @@ var Browser = class {
 	async #waitForLaunch(process, executable, args) {
 		const context = {
 			executable,
-			args
+			...args === void 0 ? {} : { args }
 		};
 		const timeout = this.#timeout();
 		const controller = new AbortController();
@@ -3174,32 +3182,32 @@ var Browser = class {
 			deadline
 		]);
 		const stderr = process.stderr;
-		if (stderr === null) throw new _src_core.BrowserConnectionError("The browser process has no standard error to read", context);
+		if (stderr === null) throw new _src_core.BrowserError("CONNECTION", "The browser process has no standard error to read", context);
 		const exit = (0, node_events.once)(process, "exit", { signal });
 		exit.catch(() => void 0);
 		const ready = readBrowserEndpoint(stderr, signal).catch(async (error) => {
 			if (signal.aborted) throw error;
 			const values = await exit;
 			if (values[0] === 0 && values[1] === null) throw error;
-			throw new _src_core.BrowserConnectionError(this.#formatLaunchExit((0, _orkestrel_contract.isInteger)(values[0]) ? values[0] : null, (0, _orkestrel_contract.isString)(values[1]) ? values[1] : null), context);
+			throw new _src_core.BrowserError("CONNECTION", this.#formatLaunchExit((0, _orkestrel_contract.isInteger)(values[0]) ? values[0] : null, (0, _orkestrel_contract.isString)(values[1]) ? values[1] : null), context);
 		});
 		const exited = exit.then((values) => {
 			const code = (0, _orkestrel_contract.isInteger)(values[0]) ? values[0] : null;
 			const exitSignal = (0, _orkestrel_contract.isString)(values[1]) ? values[1] : null;
 			if (code === 0 && exitSignal === null) return ready;
-			throw new _src_core.BrowserConnectionError(this.#formatLaunchExit(code, exitSignal), context);
+			throw new _src_core.BrowserError("CONNECTION", this.#formatLaunchExit(code, exitSignal), context);
 		});
 		try {
 			return await Promise.race([ready, exited]);
 		} catch (error) {
-			if ((0, _src_core.isBrowserConnectionError)(error)) throw error;
-			if (this.#signal().aborted) throw new _src_core.BrowserConnectionError("Connection aborted", context);
-			if (deadline.aborted) throw new _src_core.BrowserConnectionError(`Browser did not report a CDP endpoint within ${timeout}ms`, {
+			if ((0, _src_core.isBrowserError)(error) && error.code === "CONNECTION") throw error;
+			if (this.#signal().aborted) throw new _src_core.BrowserError("CONNECTION", "Connection aborted", context);
+			if (deadline.aborted) throw new _src_core.BrowserError("CONNECTION", `Browser did not report a CDP endpoint within ${timeout}ms`, {
 				...context,
 				timeout
 			});
 			const message = (0, _orkestrel_contract.isError)(error) ? error.message : String(error);
-			throw new _src_core.BrowserConnectionError(message, context);
+			throw new _src_core.BrowserError("CONNECTION", message, context);
 		} finally {
 			controller.abort();
 			ready.catch(() => void 0);
@@ -3236,7 +3244,10 @@ var Browser = class {
 			});
 		}
 		if (pages.length === 0 || this.#contexts.length > 0) return;
-		const context = new _src_core.BrowserContext(client, void 0, this.#options.viewport, createBrowserWriter());
+		const context = new _src_core.BrowserContext(client, {
+			...this.#options.viewport === void 0 ? {} : { viewport: this.#options.viewport },
+			writer: createFileBrowserWriter()
+		});
 		await context.sync(pages);
 		this.#registerContext(context);
 	}
@@ -3316,7 +3327,7 @@ var Browser = class {
 		let remote = client;
 		let temporary = false;
 		if (remote === void 0 && this.#owned === true && this.#endpoint !== void 0) {
-			const transport = createCDPTransport({
+			const transport = createWebSocketCDPTransport({
 				url: this.#endpoint,
 				timeout: this.#timeout()
 			});
@@ -3419,10 +3430,11 @@ var Browser = class {
 			const code = (0, _orkestrel_contract.isError)(error) && "code" in error && (0, _orkestrel_contract.isString)(error.code) ? error.code : void 0;
 			if (code === "ESRCH") return false;
 			if (signal === 0) return code === "EPERM" ? true : void 0;
-			throw new _src_core.BrowserConnectionError("Failed to signal the browser process", {
-				pid: serving ?? pid,
+			const target = serving ?? pid;
+			throw new _src_core.BrowserError("CONNECTION", "Failed to signal the browser process", {
+				...target === void 0 ? {} : { pid: target },
 				signal,
-				cause: error
+				cause: (0, _orkestrel_contract.isJSONValue)(error) ? error : String(error)
 			});
 		}
 	}
@@ -3461,7 +3473,8 @@ var Browser = class {
 			if (await this.#waitForTerminationWithin(process, 3e3)) return;
 			if (this.#signalProcess(process, "SIGKILL") === false) return;
 			if (await this.#waitForTerminationWithin(process, 3e3, true)) return;
-			throw new _src_core.BrowserConnectionError("Browser process did not exit after SIGKILL", { pid: this.#servingPid ?? process.pid });
+			const target = this.#servingPid ?? process.pid;
+			throw new _src_core.BrowserError("CONNECTION", "Browser process did not exit after SIGKILL", { ...target === void 0 ? {} : { pid: target } });
 		} finally {
 			await this.#closeProcessPipe(process);
 		}
@@ -3541,9 +3554,7 @@ exports.BROWSER_TRANSPORT_LOSS_DEFER_MS = BROWSER_TRANSPORT_LOSS_DEFER_MS;
 exports.BROWSER_WINDOWS_ROOT_FALLBACKS = BROWSER_WINDOWS_ROOT_FALLBACKS;
 exports.BROWSER_WINDOWS_SUFFIXES = BROWSER_WINDOWS_SUFFIXES;
 exports.Browser = Browser;
-exports.BrowserDestroyedError = BrowserDestroyedError;
 exports.BrowserMCPServer = BrowserMCPServer;
-exports.BrowserNotConnectedError = BrowserNotConnectedError;
 exports.FileBrowserJourneyStore = FileBrowserJourneyStore;
 exports.FileBrowserRunStore = FileBrowserRunStore;
 exports.FileBrowserWriter = FileBrowserWriter;
@@ -3555,20 +3566,17 @@ exports.buildWindowsRoots = buildWindowsRoots;
 exports.createBrowser = createBrowser;
 exports.createBrowserMCPServer = createBrowserMCPServer;
 exports.createBrowserProfile = createBrowserProfile;
-exports.createBrowserWriter = createBrowserWriter;
-exports.createCDPTransport = createCDPTransport;
 exports.createFileBrowserJourneyStore = createFileBrowserJourneyStore;
 exports.createFileBrowserRunStore = createFileBrowserRunStore;
+exports.createFileBrowserWriter = createFileBrowserWriter;
+exports.createWebSocketCDPTransport = createWebSocketCDPTransport;
 exports.describeBrowserServerLoss = describeBrowserServerLoss;
 exports.fetchCDPTargets = fetchCDPTargets;
 exports.findEnvOverrides = findEnvOverrides;
 exports.findInstallPaths = findInstallPaths;
 exports.findStorePaths = findStorePaths;
-exports.findSystemBrowser = findSystemBrowser;
 exports.findSystemBrowsers = findSystemBrowsers;
 exports.formatBrowserLockEntry = formatBrowserLockEntry;
-exports.isBrowserDestroyedError = isBrowserDestroyedError;
-exports.isBrowserNotConnectedError = isBrowserNotConnectedError;
 exports.launchBrowserProcess = launchBrowserProcess;
 exports.normalizeExecutablePath = normalizeExecutablePath;
 exports.parseBrowserEngine = parseBrowserEngine;