Address CodeRabbit's comments

Author: pietro909

src/worker/browser/service-worker-manager.ts

@@ -66,6 +66,8 @@ function attachUpdateHandlers(
     registration: ServiceWorkerRegistration,
     options: ReturnType<typeof normalizeOptions>
 ) {
+    // Guard: only the first caller per registration attaches handlers.
+    // Subsequent calls with different options are silently ignored.
     if (handshakes.has(registration)) return;
     handshakes.add(registration);
 
@@ -196,10 +198,8 @@ export async function getActiveServiceWorker(
     path?: string
 ): Promise<ServiceWorker> {
     ensureServiceWorkerSupport();
-    // Avoid mixing registrations when a specific script path is provided.
-    const options = normalizeOptions(path ?? "");
     const registration: ServiceWorkerRegistration = path
-        ? await registerOnce(options)
+        ? await registerOnce(normalizeOptions(path))
         : await navigator.serviceWorker.ready;
     let serviceWorker =
         registration.active ||

test/service-worker-manager.test.ts

@@ -12,17 +12,32 @@ const stubNavigator = (serviceWorker: Partial<ServiceWorkerContainer>) => {
 const createServiceWorkerContainer = (
     registration: Partial<ServiceWorkerRegistration> = {}
 ) => {
-    const listeners = new Map<string, (evt?: Event) => void>();
+    const listeners = new Map<string, Array<(evt?: Event) => void>>();
     return {
         register: vi.fn().mockResolvedValue(registration),
         ready: Promise.resolve(registration as ServiceWorkerRegistration),
         controller: null,
         addEventListener: (event: string, cb: (evt?: Event) => void) => {
-            listeners.set(event, cb);
+            const cbs = listeners.get(event);
+            if (cbs) {
+                cbs.push(cb);
+            } else {
+                listeners.set(event, [cb]);
+            }
+        },
+        removeEventListener: (event: string, cb?: (evt?: Event) => void) => {
+            if (!cb) {
+                listeners.delete(event);
+                return;
+            }
+            const cbs = listeners.get(event);
+            if (!cbs) return;
+            const idx = cbs.indexOf(cb);
+            if (idx !== -1) cbs.splice(idx, 1);
+            if (cbs.length === 0) listeners.delete(event);
         },
-        removeEventListener: (event: string) => listeners.delete(event),
         dispatch: (event: string, evt: Event = new Event(event)) => {
-            listeners.get(event)?.(evt);
+            listeners.get(event)?.forEach((cb) => cb(evt));
         },
     };
 };