rollipop 1.0.0-alpha.21 → 1.0.0-alpha.22

package/dist/index.js

@@ -24,7 +24,6 @@ import { createDevMiddleware } from "@react-native/dev-middleware";
 import Fastify from "fastify";
 import mitt from "mitt";
 import http from "node:http";
-import EventEmitter from "node:events";
 import stripAnsi from "strip-ansi";
 import { SourceMapConsumer } from "source-map";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
@@ -36,6 +35,7 @@ import { asConst } from "json-schema-to-ts";
 import mime from "mime";
 import Ajv from "ajv";
 import { codeFrameColumns } from "@babel/code-frame";
+import EventEmitter from "node:events";
 import * as ws from "ws";
 import * as babel from "@babel/core";
 import * as swc from "@swc/core";
@@ -105,7 +105,7 @@ var constants_exports = /* @__PURE__ */ __exportAll({
 	IMAGE_EXTENSIONS: () => IMAGE_EXTENSIONS,
 	ROLLIPOP_VERSION: () => ROLLIPOP_VERSION
 });
-const ROLLIPOP_VERSION = "1.0.0-alpha.21";
+const ROLLIPOP_VERSION = "1.0.0-alpha.22";
 const GLOBAL_IDENTIFIER = "global";
 /**
 * @see {@link https://github.com/facebook/metro/blob/0.81.x/docs/Configuration.md#resolvermainfields}
@@ -639,6 +639,8 @@ var ProgressBarStatusReporter = class {
 	update(event) {
 		switch (event.type) {
 			case "bundle_build_started":
+				this.progressBar.setCurrent(0);
+				if (this.flags & ProgressFlags.FILE_CHANGED) this.progressBar.setTotal(0);
 				this.flags |= ProgressFlags.BUILD_IN_PROGRESS;
 				this.progressBar.start();
 				this.renderManager.start();
@@ -655,10 +657,6 @@ var ProgressBarStatusReporter = class {
 				break;
 			case "transform":
 				const { id, totalModules, transformedModules } = event;
-				if (this.flags & ProgressFlags.FILE_CHANGED) {
-					logger$2.debug("Transformed changed file", { id });
-					return;
-				}
 				this.renderProgress(id, totalModules, transformedModules);
 				break;
 			case "watch_change":
@@ -809,6 +807,7 @@ function mergeConfig(baseConfig, ...overrideConfigs) {
 //#endregion
 //#region src/config/load-config.ts
 const CONFIG_FILE_NAME = "rollipop";
+const INTERNAL_PLUGIN_HOOKS = ["transformCacheHit"];
 async function loadConfig(options = {}) {
 	const { cwd = process.cwd(), configFile, mode, context = {} } = options;
 	const defaultConfig = await getDefaultConfig(cwd, mode);
@@ -843,7 +842,12 @@ async function flattenPluginOption(pluginOption) {
 	const awaitedPluginOption = await pluginOption;
 	if (Array.isArray(awaitedPluginOption)) return (await Promise.all(awaitedPluginOption.map(flattenPluginOption))).flat();
 	if (awaitedPluginOption == null || awaitedPluginOption === false) return [];
-	return [awaitedPluginOption];
+	return [stripInternalPluginHooks(awaitedPluginOption)];
+}
+function stripInternalPluginHooks(plugin) {
+	const maybeInternalPlugin = plugin;
+	if (!INTERNAL_PLUGIN_HOOKS.some((hook) => hook in maybeInternalPlugin)) return plugin;
+	return omit(maybeInternalPlugin, INTERNAL_PLUGIN_HOOKS);
 }
 async function resolvePluginConfig(baseConfig, plugins) {
 	let mergedConfig = omit(baseConfig, ["plugins"]);
@@ -1043,30 +1047,14 @@ function iife(body, path = "<unknown>") {
 }
 //#endregion
 //#region src/utils/config.ts
-function bindReporter(config, eventSource, onEvent) {
-	const originalReporter = config.reporter;
-	config.reporter = { update(event) {
-		switch (event.type) {
-			case "bundle_build_started":
-				eventSource.emit("buildStart");
-				break;
-			case "bundle_build_done":
-				eventSource.emit("buildDone");
-				break;
-			case "bundle_build_failed":
-				eventSource.emit("buildFailed", event.error);
-				break;
-			case "transform":
-				eventSource.emit("transform", event.id, event.totalModules, event.transformedModules);
-				break;
-			case "watch_change":
-				eventSource.emit("watchChange", event.id);
-				break;
-		}
-		originalReporter?.update(event);
+function bindReporter(config, onEvent) {
+	const reporter = { update(event) {
 		onEvent?.(event);
 	} };
-	return config;
+	return {
+		...config,
+		reporter
+	};
 }
 function resolveHmrConfig(config) {
 	if (config.mode !== "development") return null;
@@ -1298,7 +1286,7 @@ var FileSystemBundleStore = class {
 };
 //#endregion
 //#region src/server/bundler-pool.ts
-var BundlerDevEngine = class extends EventEmitter {
+var BundlerDevEngine = class {
 	initializeHandle;
 	isHmrEnabled;
 	_id;
@@ -1307,24 +1295,14 @@ var BundlerDevEngine = class extends EventEmitter {
 	_devEngine = null;
 	_state = "idle";
 	_status = "idle";
-	constructor(options, config, buildOptions, onReporterEvent) {
-		super();
+	constructor(options, config, buildOptions, eventBus) {
 		this.options = options;
 		this.config = config;
 		this.buildOptions = buildOptions;
-		this.onReporterEvent = onReporterEvent;
+		this.eventBus = eventBus;
 		this._id = Bundler.createId(config, buildOptions);
 		this.initializeHandle = taskHandler();
 		this.isHmrEnabled = Boolean(buildOptions.dev && config.devMode.hmr);
-		this.on("buildStart", () => {
-			this._status = "building";
-		});
-		this.on("buildDone", () => {
-			this._status = "build-done";
-		});
-		this.on("buildFailed", () => {
-			this._status = "build-failed";
-		});
 		this.initialize();
 	}
 	get id() {
@@ -1344,8 +1322,24 @@ var BundlerDevEngine = class extends EventEmitter {
 	async initialize() {
 		if (this._state !== "idle" || this._devEngine != null) return this;
 		this._state = "initializing";
-		const onEvent = this.onReporterEvent ? (event) => this.onReporterEvent(this._id, event) : void 0;
-		const devEngine = await Bundler.devEngine(bindReporter(this.config, this, onEvent), this.buildOptions, {
+		const config = bindReporter(this.config, (event) => {
+			switch (event.type) {
+				case "bundle_build_started":
+					this._status = "building";
+					break;
+				case "bundle_build_done":
+					this._status = "build-done";
+					break;
+				case "bundle_build_failed":
+					this._status = "build-failed";
+					break;
+			}
+			this.eventBus.emit({
+				...event,
+				bundlerId: this.id
+			});
+		});
+		const devEngine = await Bundler.devEngine(config, this.buildOptions, {
 			host: this.options.server.host,
 			port: this.options.server.port,
 			onHmrUpdates: (errorOrResult) => {
@@ -1355,17 +1349,25 @@ var BundlerDevEngine = class extends EventEmitter {
 						bundlerId: this.id,
 						error: errorOrResult
 					});
-					const normalizedError = normalizeRolldownError(errorOrResult);
-					this.config.reporter?.update({
+					const event = {
 						type: "bundle_build_failed",
-						error: normalizedError
+						error: normalizeRolldownError(errorOrResult)
+					};
+					this._status = "build-failed";
+					this.eventBus.emit({
+						...event,
+						bundlerId: this.id
 					});
 				} else {
 					logger$1.trace("Detected changed files", {
 						bundlerId: this.id,
 						changedFiles: errorOrResult.changedFiles
 					});
-					this.emit("hmrUpdates", errorOrResult.updates);
+					this.eventBus.emit({
+						bundlerId: this.id,
+						type: "hmr_updates",
+						updates: errorOrResult.updates
+					});
 				}
 			},
 			onOutput: (errorOrResult) => {
@@ -1374,7 +1376,15 @@ var BundlerDevEngine = class extends EventEmitter {
 					logger$1.trace("onOutput", { bundlerId: this.id });
 					logger$1.error(errorOrResult.message);
 					this.buildFailedError = normalizedError;
-					this.emit("buildFailed", normalizedError);
+					const event = {
+						type: "bundle_build_failed",
+						error: normalizedError
+					};
+					this._status = "build-failed";
+					this.eventBus.emit({
+						...event,
+						bundlerId: this.id
+					});
 				} else {
 					const output = errorOrResult.output[0];
 					this.updateBundleStore(output);
@@ -1410,16 +1420,13 @@ var BundlerDevEngine = class extends EventEmitter {
 };
 var BundlerPool = class BundlerPool {
 	static instances = /* @__PURE__ */ new Map();
-	constructor(config, resolvedServerOptions, onReporterEvent) {
+	constructor(config, resolvedServerOptions, eventBus) {
 		this.config = config;
 		this.resolvedServerOptions = resolvedServerOptions;
-		this.onReporterEvent = onReporterEvent;
-	}
-	instanceKey(bundleName, buildOptions) {
-		return `${bundleName}-${Bundler.createId(this.config, buildOptions)}`;
+		this.eventBus = eventBus;
 	}
 	get(bundleName, buildOptions) {
-		const key = this.instanceKey(getBaseBundleName(bundleName), buildOptions);
+		const key = `${getBaseBundleName(bundleName)}-${Bundler.createId(this.config, buildOptions)}`;
 		const instance = BundlerPool.instances.get(key);
 		if (instance) return instance;
 		else {
@@ -1427,16 +1434,14 @@ var BundlerPool = class BundlerPool {
 				bundleName,
 				key
 			});
-			const instance = new BundlerDevEngine({ server: this.resolvedServerOptions }, this.config, buildOptions, this.onReporterEvent);
+			const instance = new BundlerDevEngine({ server: this.resolvedServerOptions }, this.config, buildOptions, this.eventBus);
 			logger$1.debug("Setting new bundler instance", { key });
 			BundlerPool.instances.set(key, instance);
 			return instance;
 		}
 	}
 	/**
-	* Look up a cached bundler by its reporter-facing id (the same id carried
-	* in SSE events such as `bundle_build_done`). Returns `undefined` when no
-	* instance with that id has been created yet.
+	* Look up a cached bundler by the id carried as `bundlerId` in events such as `bundle_build_done`. Returns `undefined` when no instance with that id has been created yet.
 	*/
 	getInstanceById(id) {
 		for (const instance of BundlerPool.instances.values()) if (instance.id === id) return instance;
@@ -1455,6 +1460,82 @@ function errorHandler(error, request, reply) {
 	reply.status(500).send("Internal Server Error");
 }
 //#endregion
+//#region src/server/events/event-bus.ts
+var EventBus = class {
+	listeners = /* @__PURE__ */ new Set();
+	emit(event) {
+		for (const listener of this.listeners) listener(event);
+	}
+	subscribe(listener) {
+		this.listeners.add(listener);
+		return () => {
+			this.listeners.delete(listener);
+		};
+	}
+};
+var ServerEventBus = class extends EventBus {};
+//#endregion
+//#region src/server/sse/adapter.ts
+function toSSEEvent(event) {
+	switch (event.type) {
+		case "client_log": return {
+			type: "client_log",
+			...event.bundlerId != null ? { bundlerId: event.bundlerId } : {},
+			data: event.data
+		};
+		case "device_connected": return {
+			type: "device_connected",
+			clientId: event.client.id
+		};
+		case "device_disconnected": return {
+			type: "device_disconnected",
+			clientId: event.client.id
+		};
+		case "server_ready":
+		case "cache_reset": return event;
+		case "bundle_build_started":
+		case "bundle_build_done":
+		case "bundle_build_failed":
+		case "watch_change": return reporterEventToSSEEvent(event);
+		case "hmr_updates":
+		case "device_message":
+		case "device_error":
+		case "transform": return null;
+	}
+}
+function reporterEventToSSEEvent(event) {
+	switch (event.type) {
+		case "bundle_build_started": return {
+			type: "bundle_build_started",
+			bundlerId: event.bundlerId
+		};
+		case "bundle_build_done": return {
+			type: "bundle_build_done",
+			bundlerId: event.bundlerId,
+			totalModules: event.totalModules,
+			transformedModules: event.transformedModules,
+			cacheHitModules: event.cacheHitModules,
+			duration: event.duration
+		};
+		case "bundle_build_failed": return {
+			type: "bundle_build_failed",
+			bundlerId: event.bundlerId,
+			error: stripAnsi(event.error.message)
+		};
+		case "watch_change": return {
+			type: "watch_change",
+			bundlerId: event.bundlerId,
+			file: event.id
+		};
+		case "client_log": return {
+			type: "client_log",
+			bundlerId: event.bundlerId,
+			data: event.data
+		};
+		case "transform": return null;
+	}
+}
+//#endregion
 //#region src/server/mcp/server.ts
 function createMcpServer(options) {
 	const { projectRoot, eventBus } = options;
@@ -1475,11 +1556,14 @@ function createMcpServer(options) {
 	});
 	server.registerTool("get_build_events", {
 		title: "Get Build Events",
-		description: "Subscribe to bundler events for a duration. Returns all events (build start/done/fail, watch changes, client logs, device connections) collected during the wait period.",
+		description: "Subscribe to bundler events for a duration. Returns all events (build start/done/fail, watch changes, client logs, device connections) collected during the wait period. Bundler-scoped events include bundlerId.",
 		inputSchema: { duration: z.number().min(1e3).max(6e4).default(1e4).describe("How long to listen for events in milliseconds (1000-60000, default 10000)") }
 	}, async ({ duration }) => {
 		const events = [];
-		const unsubscribe = eventBus.collect(events);
+		const unsubscribe = eventBus.subscribe((event) => {
+			const sseEvent = toSSEEvent(event);
+			if (sseEvent != null) events.push(sseEvent);
+		});
 		await new Promise((resolve) => setTimeout(resolve, duration));
 		unsubscribe();
 		if (events.length === 0) return { content: [{
@@ -1736,6 +1820,11 @@ const bundleRequestSchema = asConst({
 });
 new Ajv().compile(bundleRequestSchema);
 //#endregion
+//#region src/server/events/types.ts
+function isBundlerEventForId(event, bundlerId) {
+	return "bundlerId" in event && event.bundlerId === bundlerId;
+}
+//#endregion
 //#region src/server/middlewares/serve-bundle.ts
 const routeParamSchema = asConst({
 	type: "object",
@@ -1747,7 +1836,7 @@ function withGetBundleErrorHandler(reply, task) {
 	});
 }
 const plugin$2 = fp((fastify, options) => {
-	const { getBundler } = options;
+	const { eventBus, getBundler } = options;
 	const getBundleOptions = (buildOptions) => {
 		return {
 			platform: buildOptions.platform,
@@ -1771,11 +1860,10 @@ const plugin$2 = fp((fastify, options) => {
 			const bundler = getBundler(params.name, buildOptions);
 			if (accept?.includes("multipart/mixed") ?? false) {
 				const bundleResponse = new BundleResponse(reply);
-				const transformHandler = (_id, totalModules = 0, transformedModules) => {
-					bundleResponse.writeBundleState(transformedModules, totalModules);
-				};
-				bundler.on("transform", transformHandler);
-				await bundler.getBundle().then((bundle) => bundleResponse.endWithBundle(bundle.code)).catch((error) => bundleResponse.endWithError(error)).finally(() => bundler.off("transform", transformHandler));
+				const unsubscribe = eventBus.subscribe((event) => {
+					if (isBundlerEventForId(event, bundler.id) && event.type === "transform") bundleResponse.writeBundleState(event.transformedModules, event.totalModules ?? 0);
+				});
+				await bundler.getBundle().then((bundle) => bundleResponse.endWithBundle(bundle.code)).catch((error) => bundleResponse.endWithError(error)).finally(unsubscribe);
 			} else {
 				this.log.debug(`client is not support multipart/mixed content: ${accept ?? "<empty>"}`);
 				const code = (await withGetBundleErrorHandler(reply, bundler.getBundle())).code;
@@ -1803,7 +1891,7 @@ const plugin$2 = fp((fastify, options) => {
 }, { name: "serve-bundle" });
 //#endregion
 //#region src/server/middlewares/sse.ts
-const plugin$1 = fp((fastify, { eventBus }) => {
+const plugin$1 = fp((fastify, { publisher }) => {
 	fastify.get("/sse/events", (request, reply) => {
 		const res = reply.raw;
 		res.writeHead(200, {
@@ -1814,8 +1902,8 @@ const plugin$1 = fp((fastify, { eventBus }) => {
 		});
 		request.raw.socket.setNoDelay(true);
 		res.write(":ok\n\n");
-		eventBus.addClient(res);
-		request.raw.on("close", () => eventBus.removeClient(res));
+		publisher.addClient(res);
+		request.raw.on("close", () => publisher.removeClient(res));
 	});
 }, { name: "sse" });
 //#endregion
@@ -1991,14 +2079,12 @@ function printSymbolicateResult(rawStackFrame, symbolicateResult) {
 }
 //#endregion
 //#region src/server/sse/event-bus.ts
-var SSEEventBus = class {
+var SSEEventPublisher = class {
 	clients = /* @__PURE__ */ new Set();
-	listeners = /* @__PURE__ */ new Set();
-	emit(event) {
+	publish(event) {
 		const data = JSON.stringify(event);
 		const message = `event: ${event.type}\ndata: ${data}\n\n`;
 		for (const client of this.clients) if (!client.closed) client.write(message);
-		for (const listener of this.listeners) listener(event);
 	}
 	/**
 	* Subscribe an SSE HTTP response client.
@@ -2012,51 +2098,11 @@ var SSEEventBus = class {
 	removeClient(res) {
 		this.clients.delete(res);
 	}
-	/**
-	* Subscribe a listener that collects events into the given array.
-	* Returns an unsubscribe function.
-	*/
-	collect(collector) {
-		const listener = (event) => collector.push(event);
-		this.listeners.add(listener);
-		return () => this.listeners.delete(listener);
-	}
 	get clientCount() {
 		return this.clients.size;
 	}
 };
 //#endregion
-//#region src/server/sse/reporter.ts
-function toSSEEvent(id, event) {
-	switch (event.type) {
-		case "bundle_build_started": return {
-			type: "bundle_build_started",
-			id
-		};
-		case "bundle_build_done": return {
-			type: "bundle_build_done",
-			id,
-			totalModules: event.totalModules,
-			duration: event.duration
-		};
-		case "bundle_build_failed": return {
-			type: "bundle_build_failed",
-			id,
-			error: stripAnsi(event.error.message)
-		};
-		case "watch_change": return {
-			type: "watch_change",
-			id,
-			file: event.id
-		};
-		case "client_log": return {
-			type: "client_log",
-			data: event.data
-		};
-		case "transform": return null;
-	}
-}
-//#endregion
 //#region src/server/wss/server.ts
 var WebSocketServer = class extends EventEmitter {
 	clientId = 0;
@@ -2125,13 +2171,13 @@ function getWebSocketUpgradeHandler(websocketEndpoints) {
 //#region src/server/wss/hmr-server.ts
 var HMRServer = class extends WebSocketServer {
 	bundlerPool;
-	reportEvent;
+	eventBus;
 	instances = /* @__PURE__ */ new Map();
 	bindings = /* @__PURE__ */ new Map();
-	constructor({ bundlerPool, reportEvent }) {
+	constructor({ bundlerPool, eventBus }) {
 		super("hmr", { noServer: true });
 		this.bundlerPool = bundlerPool;
-		this.reportEvent = reportEvent;
+		this.eventBus = eventBus;
 	}
 	parseClientMessage(data) {
 		const parsedData = JSON.parse(this.rawDataToString(data));
@@ -2158,33 +2204,34 @@ var HMRServer = class extends WebSocketServer {
 	}
 	bindEvents(client, instance) {
 		if (this.bindings.get(client.id) == null) {
-			const handleHmrUpdates = (updates) => {
-				this.handleUpdates(client, updates);
-			};
-			const handleWatchChange = () => {
-				this.send(client, JSON.stringify({ type: "hmr:update-start" }));
-			};
-			const handleBuildFailed = (error) => {
-				this.send(client, JSON.stringify({
-					type: "hmr:error",
-					payload: {
-						type: "BuildError",
-						errors: [{ description: error.message }],
-						message: error.message
-					}
-				}));
-			};
-			instance.addListener("hmrUpdates", handleHmrUpdates);
-			instance.addListener("watchChange", handleWatchChange);
-			instance.addListener("buildFailed", handleBuildFailed);
-			this.bindings.set(client.id, {
-				hmrUpdates: handleHmrUpdates,
-				watchChange: handleWatchChange,
-				buildFailed: handleBuildFailed
+			const unsubscribe = this.eventBus.subscribe((event) => {
+				if (!isBundlerEventForId(event, instance.id)) return;
+				switch (event.type) {
+					case "hmr_updates":
+						this.handleUpdates(client, event.updates);
+						break;
+					case "watch_change":
+						this.send(client, JSON.stringify({ type: "hmr:update-start" }));
+						break;
+					case "bundle_build_failed":
+						this.sendBuildFailed(client, event.error);
+						break;
+				}
 			});
+			this.bindings.set(client.id, { unsubscribe });
 			this.logger.trace(`HMR event binding established (clientId: ${client.id})`);
 		}
 	}
+	sendBuildFailed(client, error) {
+		this.send(client, JSON.stringify({
+			type: "hmr:error",
+			payload: {
+				type: "BuildError",
+				errors: [{ description: error.message }],
+				message: error.message
+			}
+		}));
+	}
 	async handleModuleRegistered(client, modules) {
 		try {
 			const instance = this.instances.get(client.id);
@@ -2251,11 +2298,7 @@ var HMRServer = class extends WebSocketServer {
 		this.logger.trace(`HMR client cleanup (clientId: ${client.id})`);
 		const binding = this.bindings.get(client.id);
 		const instance = this.instances.get(client.id);
-		if (binding != null && instance != null) {
-			instance.removeListener("hmrUpdates", binding.hmrUpdates);
-			instance.removeListener("watchChange", binding.watchChange);
-			instance.removeListener("buildFailed", binding.buildFailed);
-		}
+		if (binding != null) binding.unsubscribe();
 		if (instance != null) try {
 			instance.devEngine.removeClient(String(client.id));
 		} catch (error) {
@@ -2302,13 +2345,16 @@ var HMRServer = class extends WebSocketServer {
 			case "hmr:invalidate":
 				this.handleInvalidate(client, message.moduleId);
 				break;
-			case "hmr:log":
-				this.reportEvent({
+			case "hmr:log": {
+				const instance = this.instances.get(client.id);
+				this.eventBus.emit({
 					type: "client_log",
+					...instance != null ? { bundlerId: instance.id } : {},
 					level: message.level,
 					data: message.data
 				});
 				break;
+			}
 		}
 	}
 	onConnection(client) {
@@ -2349,22 +2395,58 @@ async function createDevServer(config, options) {
 		loggerInstance: new DevServerLogger(),
 		disableRequestLogging: true
 	});
-	const sseEventBus = new SSEEventBus();
-	const bundlerPool = new BundlerPool(config, {
-		host,
-		port
-	}, (id, event) => {
-		const sseEvent = toSSEEvent(id, event);
-		if (sseEvent) sseEventBus.emit(sseEvent);
+	const eventBus = new ServerEventBus();
+	const ssePublisher = new SSEEventPublisher();
+	const reporter = config.reporter;
+	eventBus.subscribe((event) => {
+		const sseEvent = toSSEEvent(event);
+		if (sseEvent != null) ssePublisher.publish(sseEvent);
 	});
-	const getBundler = (bundleName, buildOptions) => {
-		return bundlerPool.get(bundleName, merge(options?.buildOptions ?? {}, buildOptions));
-	};
 	const { middleware: communityMiddleware, websocketEndpoints: communityWebsocketEndpoints, messageSocketEndpoint: { server: messageServer, broadcast }, eventsSocketEndpoint: { server: eventsServer, reportEvent } } = createDevServerMiddleware({
 		port,
 		host,
 		watchFolders: []
 	});
+	eventBus.subscribe((event) => {
+		switch (event.type) {
+			case "bundle_build_started":
+			case "bundle_build_done":
+			case "bundle_build_failed":
+			case "transform":
+			case "watch_change":
+				reporter?.update(event);
+				break;
+			case "client_log":
+				reportEvent?.(event);
+				reporter?.update(event);
+				break;
+			case "device_connected":
+				emitter.emit("device.connected", { client: event.client });
+				break;
+			case "device_message":
+				emitter.emit("device.message", {
+					client: event.client,
+					data: event.data
+				});
+				break;
+			case "device_error":
+				emitter.emit("device.error", {
+					client: event.client,
+					error: event.error
+				});
+				break;
+			case "device_disconnected":
+				emitter.emit("device.disconnected", { client: event.client });
+				break;
+		}
+	});
+	const bundlerPool = new BundlerPool(config, {
+		host,
+		port
+	}, eventBus);
+	const getBundler = (bundleName, buildOptions) => {
+		return bundlerPool.get(bundleName, merge(options?.buildOptions ?? {}, buildOptions));
+	};
 	const { middleware: devMiddleware, websocketEndpoints } = createDevMiddleware({
 		serverBaseUrl,
 		logger: {
@@ -2382,29 +2464,22 @@ async function createDevServer(config, options) {
 	});
 	const hmrServer = new HMRServer({
 		bundlerPool,
-		reportEvent: (event) => {
-			reportEvent?.(event);
-			config.reporter?.update(event);
-		}
-	}).on("connection", (client) => {
-		emitter.emit("device.connected", { client });
-		sseEventBus.emit({
-			type: "device_connected",
-			clientId: client.id
-		});
-	}).on("message", (client, data) => emitter.emit("device.message", {
+		eventBus
+	}).on("connection", (client) => eventBus.emit({
+		type: "device_connected",
+		client
+	})).on("message", (client, data) => eventBus.emit({
+		type: "device_message",
 		client,
 		data
-	})).on("error", (client, error) => emitter.emit("device.error", {
+	})).on("error", (client, error) => eventBus.emit({
+		type: "device_error",
 		client,
 		error
-	})).on("close", (client) => {
-		emitter.emit("device.disconnected", { client });
-		sseEventBus.emit({
-			type: "device_disconnected",
-			clientId: client.id
-		});
-	});
+	})).on("close", (client) => eventBus.emit({
+		type: "device_disconnected",
+		client
+	}));
 	await fastify.register(import("@fastify/middie"));
 	const devServer = {
 		...emitter,
@@ -2429,13 +2504,16 @@ async function createDevServer(config, options) {
 		})
 	};
 	const { invokePostConfigureServer } = await invokeConfigureServer(devServer, config.plugins ?? []);
-	fastify.use(requestLogger).use(communityMiddleware).use(devMiddleware).register(plugin$1, { eventBus: sseEventBus }).register(plugin$4, {
+	fastify.use(requestLogger).use(communityMiddleware).use(devMiddleware).register(plugin$1, { publisher: ssePublisher }).register(plugin$4, {
 		projectRoot,
-		eventBus: sseEventBus
+		eventBus
 	}).register(plugin$5, { bundlerPool }).register(plugin$6, {
 		projectRoot,
-		eventBus: sseEventBus
-	}).register(plugin, { getBundler }).register(plugin$2, { getBundler }).register(plugin$3, {
+		eventBus
+	}).register(plugin, { getBundler }).register(plugin$2, {
+		eventBus,
+		getBundler
+	}).register(plugin$3, {
 		projectRoot,
 		host,
 		port,
@@ -2448,7 +2526,7 @@ async function createDevServer(config, options) {
 		"/hot": hmrServer.server
 	}));
 	await invokePostConfigureServer();
-	sseEventBus.emit({
+	eventBus.emit({
 		type: "server_ready",
 		host,
 		port
@@ -3077,21 +3155,45 @@ function reporterPlugin(options) {
 	let totalModules = initialTotalModules;
 	let startedAt = 0;
 	let transformedModules = 0;
+	let cacheHitModules = 0;
 	let unknownTotalModules = totalModules === 0;
+	let rebuildPending = false;
+	function getProcessedModules() {
+		return transformedModules + cacheHitModules;
+	}
+	function reportProgress(id) {
+		const processedModules = getProcessedModules();
+		if (!unknownTotalModules && totalModules < processedModules) totalModules = processedModules;
+		reporter?.update({
+			type: "transform",
+			id,
+			totalModules: unknownTotalModules ? void 0 : totalModules,
+			transformedModules: processedModules
+		});
+	}
 	return {
 		name: "rollipop:status",
 		buildStart() {
 			startedAt = performance.now();
 			transformedModules = 0;
+			cacheHitModules = 0;
+			if (rebuildPending) {
+				totalModules = 0;
+				unknownTotalModules = false;
+				rebuildPending = false;
+			}
 			reporter?.update({ type: "bundle_build_started" });
 		},
 		buildEnd(error) {
 			const endedAt = performance.now();
-			if (transformedModules !== 0) totalModules = transformedModules;
+			const processedModules = getProcessedModules();
+			if (processedModules !== 0) totalModules = processedModules;
 			unknownTotalModules = false;
 			reporter?.update(error == null ? {
 				type: "bundle_build_done",
 				totalModules,
+				transformedModules,
+				cacheHitModules,
 				duration: endedAt - startedAt
 			} : {
 				type: "bundle_build_failed",
@@ -3102,16 +3204,15 @@ function reporterPlugin(options) {
 			order: "post",
 			handler(_code, id) {
 				++transformedModules;
-				if (!unknownTotalModules && totalModules < transformedModules) totalModules = transformedModules;
-				reporter?.update({
-					type: "transform",
-					id,
-					totalModules: unknownTotalModules ? void 0 : totalModules,
-					transformedModules
-				});
+				reportProgress(id);
 			}
 		},
+		transformCacheHit(id) {
+			++cacheHitModules;
+			reportProgress(id);
+		},
 		watchChange(id) {
+			rebuildPending = true;
 			reporter?.update({
 				type: "watch_change",
 				id
@@ -3480,7 +3581,7 @@ async function runServer(config, options) {
 }
 //#endregion
 //#region package.json
-var version = "1.0.0-alpha.21";
+var version = "1.0.0-alpha.22";
 //#endregion
 //#region src/node/logger.ts
 const logger = new Logger("cli");
@@ -3742,6 +3843,7 @@ function getAgentGuide(baseUrl = defaultBaseUrl) {
 		"  Event format:",
 		"    event: <event_type>",
 		"    data: <json_payload>",
+		"    bundler-scoped events include bundlerId",
 		"",
 		"  Useful event types:",
 		"    bundle_build_started, bundle_build_done, bundle_build_failed",
@@ -3809,6 +3911,7 @@ const action$1 = async function(options) {
 		dev: options.dev,
 		minify: options.minify,
 		cache: options.cache,
+		...options.sourcemapOutput ? { sourcemap: true } : {},
 		outfile: options.bundleOutput,
 		sourcemapOutfile: options.sourcemapOutput,
 		assetsDir: options.assetsDest