@vforsh/argus-watcher 0.1.6 → 0.1.8

package/dist/sources/extension-frame-state.js

@@ -1,6 +1,8 @@
 export const createEmptyFrameState = () => ({
     topFrameId: null,
     requestedFrameId: null,
+    requestedFrameHint: null,
+    requestedFrameDetached: false,
     activeFrameId: null,
     activeAttachedAt: null,
     frames: new Map(),
@@ -103,15 +105,65 @@ export const parseExecutionContext = (params) => {
         isDefault: record.context.auxData?.isDefault === true,
     };
 };
+export const createRequestedFrameHint = (frame) => {
+    if (!frame) {
+        return null;
+    }
+    return {
+        url: frame.url || null,
+        title: frame.title?.trim() || null,
+    };
+};
 /**
  * Selection is about the user's intended target, not whether every frame-scoped command is ready.
  * Once the watcher knows the frame exists we can switch the active target; commands that require
  * an execution context still guard that separately at execution time.
  */
-export const resolveRequestedFrameId = (state, requestedFrameId) => {
+export const resolveRequestedFrameId = (state, requestedFrameId, requestedFrameHint) => {
     if (!requestedFrameId) {
         return null;
     }
-    return state.frames.has(requestedFrameId) ? requestedFrameId : null;
+    if (state.frames.has(requestedFrameId)) {
+        return requestedFrameId;
+    }
+    if (!requestedFrameHint) {
+        return null;
+    }
+    const urlMatch = requestedFrameHint.url == null ? null : findSingleMatchingFrameId(state, (frame) => frame.url === requestedFrameHint.url);
+    if (urlMatch) {
+        return urlMatch;
+    }
+    if (requestedFrameHint.url != null || !requestedFrameHint.title) {
+        return null;
+    }
+    return findSingleMatchingFrameId(state, (frame) => frame.title?.trim() === requestedFrameHint.title);
+};
+/**
+ * Pending iframe selections have two valid states:
+ * - `pending`: the iframe has never become active in this attachment yet, so keep waiting silently.
+ * - `page`: the iframe was active and then disappeared, so report the page while we wait for a safe rematch.
+ */
+export const resolveRequestedTarget = (state) => {
+    if (state.requestedFrameId == null) {
+        return { kind: 'page' };
+    }
+    const nextFrameId = resolveRequestedFrameId(state, state.requestedFrameId, state.requestedFrameHint);
+    if (nextFrameId) {
+        return { kind: 'frame', frameId: nextFrameId };
+    }
+    return state.requestedFrameDetached ? { kind: 'page' } : { kind: 'pending' };
+};
+const findSingleMatchingFrameId = (state, predicate) => {
+    let matchId = null;
+    for (const frame of state.frames.values()) {
+        if (!predicate(frame)) {
+            continue;
+        }
+        if (matchId) {
+            return null;
+        }
+        matchId = frame.frameId;
+    }
+    return matchId;
 };
 //# sourceMappingURL=extension-frame-state.js.map

package/dist/sources/extension-frame-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"extension-frame-state.js","sourceRoot":"","sources":["../../src/sources/extension-frame-state.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"extension-frame-state.js","sourceRoot":"","sources":["../../src/sources/extension-frame-state.ts"],"names":[],"mappings":"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"}

package/dist/sources/extension-session-events.d.ts

@@ -0,0 +1,21 @@
+import type { ExtensionSession } from '../native-messaging/session-manager.js';
+import type { CdpSourceEvents } from './types.js';
+import { type ExtensionFrameState } from './extension-frame-state.js';
+type RegisterExtensionSessionEventsOptions = {
+    session: ExtensionSession;
+    events: CdpSourceEvents;
+    ignoreMatcher?: ((url: string) => boolean) | null;
+    stripUrlPrefixes?: string[];
+    getOrCreateFrameState: (tabId: number) => ExtensionFrameState;
+    reconcileTargetSelection: (session: ExtensionSession) => boolean;
+    removeFrame: (tabId: number, frameId: string) => void;
+    refreshFrameTitle: (session: ExtensionSession, frameId: string, contextId?: number) => Promise<void>;
+    emitTargetChanged: (session: ExtensionSession) => void;
+    setCurrentSession: (session: ExtensionSession) => void;
+};
+/**
+ * Subscribe to extension-backed CDP events and funnel them back through the shared frame-state helpers.
+ */
+export declare const registerExtensionSessionEventHandlers: ({ session, events, ignoreMatcher, stripUrlPrefixes, getOrCreateFrameState, reconcileTargetSelection, removeFrame, refreshFrameTitle, emitTargetChanged, setCurrentSession, }: RegisterExtensionSessionEventsOptions) => void;
+export {};
+//# sourceMappingURL=extension-session-events.d.ts.map

package/dist/sources/extension-session-events.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"extension-session-events.d.ts","sourceRoot":"","sources":["../../src/sources/extension-session-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAA;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,EAAqC,KAAK,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAGxG,KAAK,qCAAqC,GAAG;IAC5C,OAAO,EAAE,gBAAgB,CAAA;IACzB,MAAM,EAAE,eAAe,CAAA;IACvB,aAAa,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,IAAI,CAAA;IACjD,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC3B,qBAAqB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,mBAAmB,CAAA;IAC7D,wBAAwB,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAA;IAChE,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IACrD,iBAAiB,EAAE,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACpG,iBAAiB,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,IAAI,CAAA;IACtD,iBAAiB,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,IAAI,CAAA;CACtD,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,qCAAqC,GAAI,8KAWnD,qCAAqC,KAAG,IA2G1C,CAAA"}

package/dist/sources/extension-session-events.js

@@ -0,0 +1,103 @@
+import { parseExecutionContext, parseFrame } from './extension-frame-state.js';
+import { toConsoleEvent, toExceptionEvent } from './extension-log-events.js';
+/**
+ * Subscribe to extension-backed CDP events and funnel them back through the shared frame-state helpers.
+ */
+export const registerExtensionSessionEventHandlers = ({ session, events, ignoreMatcher, stripUrlPrefixes, getOrCreateFrameState, reconcileTargetSelection, removeFrame, refreshFrameTitle, emitTargetChanged, setCurrentSession, }) => {
+    session.handle.onEvent('Runtime.executionContextCreated', (params, meta) => {
+        const context = parseExecutionContext(params);
+        if (!context?.isDefault || !context.frameId) {
+            return;
+        }
+        const state = getOrCreateFrameState(session.tabId);
+        state.executionContexts.set(context.frameId, context.id);
+        const frame = state.frames.get(context.frameId);
+        if (frame) {
+            frame.sessionId = meta.sessionId ?? null;
+        }
+        void refreshFrameTitle(session, context.frameId, context.id);
+        reconcileTargetSelection(session);
+    });
+    session.handle.onEvent('Runtime.executionContextsCleared', () => {
+        const state = getOrCreateFrameState(session.tabId);
+        state.executionContexts.clear();
+        state.pendingTitleLoads.clear();
+    });
+    session.handle.onEvent('Runtime.executionContextDestroyed', (params) => {
+        const record = params;
+        if (record.executionContextId == null) {
+            return;
+        }
+        const state = getOrCreateFrameState(session.tabId);
+        for (const [frameId, contextId] of state.executionContexts.entries()) {
+            if (contextId === record.executionContextId) {
+                state.executionContexts.delete(frameId);
+                state.pendingTitleLoads.delete(frameId);
+            }
+        }
+    });
+    session.handle.onEvent('Page.frameNavigated', (params, meta) => {
+        const frame = parseFrame(params);
+        if (!frame) {
+            return;
+        }
+        const state = getOrCreateFrameState(session.tabId);
+        state.frames.set(frame.frameId, frame);
+        frame.sessionId = meta.sessionId ?? null;
+        if (!frame.parentFrameId) {
+            if (!meta.sessionId) {
+                state.topFrameId = frame.frameId;
+                session.url = frame.url;
+            }
+            else if (state.topFrameId == null) {
+                state.topFrameId = frame.parentFrameId;
+            }
+        }
+        else if (state.executionContexts.has(frame.frameId)) {
+            void refreshFrameTitle(session, frame.frameId);
+        }
+        setCurrentSession(session);
+        if (!frame.parentFrameId && !meta.sessionId) {
+            events.onPageNavigation?.({ url: frame.url, title: session.title ?? null });
+        }
+        if (reconcileTargetSelection(session)) {
+            return;
+        }
+        if ((!frame.parentFrameId && state.activeFrameId == null) || state.activeFrameId === frame.frameId) {
+            emitTargetChanged(session);
+        }
+    });
+    session.handle.onEvent('Page.frameAttached', (params, meta) => {
+        const record = params;
+        if (!record.frameId) {
+            return;
+        }
+        const state = getOrCreateFrameState(session.tabId);
+        state.frames.set(record.frameId, {
+            frameId: record.frameId,
+            parentFrameId: record.parentFrameId ?? state.topFrameId ?? null,
+            url: '',
+            title: null,
+            sessionId: meta.sessionId ?? null,
+        });
+        reconcileTargetSelection(session);
+    });
+    session.handle.onEvent('Page.frameDetached', (params) => {
+        const record = params;
+        if (!record.frameId) {
+            return;
+        }
+        removeFrame(session.tabId, record.frameId);
+        reconcileTargetSelection(session);
+    });
+    session.handle.onEvent('Page.domContentEventFired', () => {
+        events.onPageLoad?.();
+    });
+    session.handle.onEvent('Runtime.consoleAPICalled', (params) => {
+        events.onLog(toConsoleEvent(params, session, { ignoreMatcher, stripUrlPrefixes }));
+    });
+    session.handle.onEvent('Runtime.exceptionThrown', (params) => {
+        events.onLog(toExceptionEvent(params, session, { ignoreMatcher, stripUrlPrefixes }));
+    });
+};
+//# sourceMappingURL=extension-session-events.js.map

package/dist/sources/extension-session-events.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"extension-session-events.js","sourceRoot":"","sources":["../../src/sources/extension-session-events.ts"],"names":[],"mappings":"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"}

package/dist/sources/extension-source.d.ts

@@ -1,7 +1,3 @@
-/**
- * Extension source for CDP access via Chrome extension Native Messaging.
- * Wraps SessionManager and provides a unified source interface.
- */
 import type { CdpSourceHandle, CdpSourceBaseOptions } from './types.js';
 export type ExtensionSourceOptions = CdpSourceBaseOptions;
 /**

package/dist/sources/extension-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extension-source.d.ts","sourceRoot":"","sources":["../../src/sources/extension-source.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,EAAE,eAAe,EAAmB,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAmBxF,MAAM,MAAM,sBAAsB,GAAG,oBAAoB,CAAA;AAEzD;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAAI,SAAS,sBAAsB,KAAG,eAskBvE,CAAA"}
+{"version":3,"file":"extension-source.d.ts","sourceRoot":"","sources":["../../src/sources/extension-source.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAmB,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAmBxF,MAAM,MAAM,sBAAsB,GAAG,oBAAoB,CAAA;AAEzD;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAAI,SAAS,sBAAsB,KAAG,eAycvE,CAAA"}

package/dist/sources/extension-source.js

@@ -1,11 +1,8 @@
-/**
- * Extension source for CDP access via Chrome extension Native Messaging.
- * Wraps SessionManager and provides a unified source interface.
- */
 import { createNativeMessaging } from '../native-messaging/messaging.js';
 import { SessionManager } from '../native-messaging/session-manager.js';
-import { buildFrameTargets, buildPageTarget, collectFrameTree, createEmptyFrameState, createNotAttachedError, frameToTarget, formatPageTargetId, parseExecutionContext, parseExtensionTargetId, parseFrame, resolveRequestedFrameId, } from './extension-frame-state.js';
-import { toConsoleEvent, toExceptionEvent } from './extension-log-events.js';
+import { buildFrameTargets, buildPageTarget, collectFrameTree, createRequestedFrameHint, createEmptyFrameState, createNotAttachedError, frameToTarget, formatPageTargetId, parseExtensionTargetId, resolveRequestedTarget, } from './extension-frame-state.js';
+import { createDelegatingSession } from './extension-delegating-session.js';
+import { registerExtensionSessionEventHandlers } from './extension-session-events.js';
 /**
  * Create an extension source that connects to Chrome via Native Messaging.
  * Returns a handle that can be used to control the source and access CDP session.
@@ -47,20 +44,21 @@ export const createExtensionSource = (options) => {
             emitStatus(null, reason);
             events.onDetach?.(reason);
         },
-        onTabsUpdated: () => {
-            // Tabs list updated - no action needed
-        },
+        onTabsUpdated: () => { },
         onTargetSelected: (tabId, frameId) => {
             const session = currentSession;
             if (!session || session.tabId !== tabId) {
-                getOrCreateFrameState(tabId).requestedFrameId = frameId;
+                const state = getOrCreateFrameState(tabId);
+                setRequestedTargetSelection(state, frameId);
                 return;
             }
             requestTargetSelection(session, frameId);
         },
     });
     // Proxy session follows the currently selected page/frame target inside the attached tab.
-    const proxySession = createDelegatingSession({
+    const { session: proxySession, controller: proxyController } = createDelegatingSession({
+        getCurrentSession: () => currentSession,
+        requireCurrentSession: getCurrentExtensionSession,
         getTargetContext: () => getCurrentTargetContext() ?? { kind: 'page' },
         mapParams: (method, params) => {
             const targetContext = getCurrentTargetContext();
@@ -76,11 +74,14 @@ export const createExtensionSource = (options) => {
             };
         },
     });
-    // Page session always stays at the top-level tab context so page-level features
-    // (indicator, inject-on-attach, similar lifecycle hooks) don't accidentally run inside an iframe.
-    const pageSession = createDelegatingSession({
+    delegatingSessions.add(proxyController);
+    // Page session stays pinned to the top-level tab for page-scoped features like the indicator and inject-on-attach.
+    const { session: pageSession, controller: pageController } = createDelegatingSession({
+        getCurrentSession: () => currentSession,
+        requireCurrentSession: getCurrentExtensionSession,
         getTargetContext: () => ({ kind: 'page' }),
     });
+    delegatingSessions.add(pageController);
     messaging.start();
     sendHostInfo();
     messaging.onDisconnect(() => {
@@ -115,7 +116,8 @@ export const createExtensionSource = (options) => {
         const target = parseExtensionTargetId(targetId);
         const session = currentSession;
         if (!session || session.tabId !== target.tabId) {
-            getOrCreateFrameState(target.tabId).requestedFrameId = target.frameId;
+            const state = getOrCreateFrameState(target.tabId);
+            setRequestedTargetSelection(state, target.frameId);
             sessionManager.attachTab(target.tabId);
             return;
         }
@@ -157,10 +159,24 @@ export const createExtensionSource = (options) => {
         for (const controller of delegatingSessions) {
             controller.dispose();
         }
+        delegatingSessions.clear();
     }
     async function bootstrapAttachedSession(session) {
         try {
-            registerSessionEventHandlers(session);
+            registerExtensionSessionEventHandlers({
+                session,
+                events,
+                ignoreMatcher,
+                stripUrlPrefixes,
+                getOrCreateFrameState,
+                reconcileTargetSelection,
+                removeFrame,
+                refreshFrameTitle,
+                emitTargetChanged,
+                setCurrentSession: (nextSession) => {
+                    currentSession = nextSession;
+                },
+            });
             await enableBootstrapDomains(session);
             await refreshFrameTree(session);
             if (currentSession?.tabId !== session.tabId) {
@@ -188,103 +204,6 @@ export const createExtensionSource = (options) => {
         await session.handle.sendAndWait('Runtime.enable');
         await session.handle.sendAndWait('Page.enable');
     }
-    function registerSessionEventHandlers(session) {
-        session.handle.onEvent('Runtime.executionContextCreated', (params, meta) => {
-            const context = parseExecutionContext(params);
-            if (!context?.isDefault || !context.frameId) {
-                return;
-            }
-            const state = getOrCreateFrameState(session.tabId);
-            state.executionContexts.set(context.frameId, context.id);
-            const frame = state.frames.get(context.frameId);
-            if (frame) {
-                frame.sessionId = meta.sessionId ?? null;
-            }
-            void refreshFrameTitle(session, context.frameId, context.id);
-            reconcileTargetSelection(session);
-        });
-        session.handle.onEvent('Runtime.executionContextsCleared', () => {
-            const state = getOrCreateFrameState(session.tabId);
-            state.executionContexts.clear();
-            state.pendingTitleLoads.clear();
-        });
-        session.handle.onEvent('Runtime.executionContextDestroyed', (params) => {
-            const record = params;
-            if (record.executionContextId == null) {
-                return;
-            }
-            const state = getOrCreateFrameState(session.tabId);
-            for (const [frameId, contextId] of state.executionContexts.entries()) {
-                if (contextId === record.executionContextId) {
-                    state.executionContexts.delete(frameId);
-                    state.pendingTitleLoads.delete(frameId);
-                }
-            }
-        });
-        session.handle.onEvent('Page.frameNavigated', (params, meta) => {
-            const frame = parseFrame(params);
-            if (!frame) {
-                return;
-            }
-            const state = getOrCreateFrameState(session.tabId);
-            state.frames.set(frame.frameId, frame);
-            frame.sessionId = meta.sessionId ?? null;
-            if (!frame.parentFrameId) {
-                if (!meta.sessionId) {
-                    state.topFrameId = frame.frameId;
-                    session.url = frame.url;
-                }
-                else if (state.topFrameId == null) {
-                    state.topFrameId = frame.parentFrameId;
-                }
-            }
-            else if (state.executionContexts.has(frame.frameId)) {
-                void refreshFrameTitle(session, frame.frameId);
-            }
-            currentSession = session;
-            if (!frame.parentFrameId && !meta.sessionId) {
-                events.onPageNavigation?.({ url: frame.url, title: session.title ?? null });
-            }
-            if (reconcileTargetSelection(session)) {
-                return;
-            }
-            if ((!frame.parentFrameId && state.activeFrameId == null) || state.activeFrameId === frame.frameId) {
-                emitTargetChanged(session);
-            }
-        });
-        session.handle.onEvent('Page.frameAttached', (params, meta) => {
-            const record = params;
-            if (!record.frameId) {
-                return;
-            }
-            const state = getOrCreateFrameState(session.tabId);
-            state.frames.set(record.frameId, {
-                frameId: record.frameId,
-                parentFrameId: record.parentFrameId ?? state.topFrameId ?? null,
-                url: '',
-                title: null,
-                sessionId: meta.sessionId ?? null,
-            });
-            reconcileTargetSelection(session);
-        });
-        session.handle.onEvent('Page.frameDetached', (params) => {
-            const record = params;
-            if (!record.frameId) {
-                return;
-            }
-            removeFrame(session.tabId, record.frameId);
-            reconcileTargetSelection(session);
-        });
-        session.handle.onEvent('Page.domContentEventFired', () => {
-            events.onPageLoad?.();
-        });
-        session.handle.onEvent('Runtime.consoleAPICalled', (params) => {
-            events.onLog(toConsoleEvent(params, session, { ignoreMatcher, stripUrlPrefixes }));
-        });
-        session.handle.onEvent('Runtime.exceptionThrown', (params) => {
-            events.onLog(toExceptionEvent(params, session, { ignoreMatcher, stripUrlPrefixes }));
-        });
-    }
     function getCurrentTargetContext() {
         const session = currentSession;
         if (!session) {
@@ -373,9 +292,15 @@ export const createExtensionSource = (options) => {
     }
     function requestTargetSelection(session, frameId) {
         const state = getOrCreateFrameState(session.tabId);
-        state.requestedFrameId = frameId;
+        setRequestedTargetSelection(state, frameId);
         reconcileTargetSelection(session);
     }
+    function setRequestedTargetSelection(state, frameId) {
+        const frame = frameId ? state.frames.get(frameId) : null;
+        state.requestedFrameId = frameId;
+        state.requestedFrameHint = createRequestedFrameHint(frame);
+        state.requestedFrameDetached = false;
+    }
     /**
      * Popup selection can arrive before the iframe's session is fully bootstrapped.
      * Keep the request pending until the frame is discovered instead of routing commands
@@ -383,25 +308,36 @@ export const createExtensionSource = (options) => {
      */
     function reconcileTargetSelection(session) {
         const state = getOrCreateFrameState(session.tabId);
-        const nextActiveFrameId = resolveRequestedFrameId(state, state.requestedFrameId);
-        if (state.requestedFrameId == null) {
-            if (state.activeFrameId == null) {
-                if (state.activeAttachedAt == null) {
-                    state.activeAttachedAt = Date.now();
-                    emitTargetChanged(session);
-                    return true;
-                }
-                return false;
-            }
-            state.activeFrameId = null;
-            state.activeAttachedAt = Date.now();
-            emitTargetChanged(session);
-            return true;
+        const resolution = resolveRequestedTarget(state);
+        if (resolution.kind === 'page') {
+            state.requestedFrameDetached = false;
+            return activatePageTarget(session, state);
         }
-        if (nextActiveFrameId == null || state.activeFrameId === nextActiveFrameId) {
+        if (resolution.kind === 'pending') {
             return false;
         }
-        state.activeFrameId = nextActiveFrameId;
+        state.requestedFrameDetached = false;
+        if (state.activeFrameId === resolution.frameId) {
+            return false;
+        }
+        return activateFrameTarget(session, state, resolution.frameId);
+    }
+    function activatePageTarget(session, state) {
+        if (state.activeFrameId == null) {
+            if (state.activeAttachedAt == null) {
+                state.activeAttachedAt = Date.now();
+                emitTargetChanged(session);
+                return true;
+            }
+            return false;
+        }
+        state.activeFrameId = null;
+        state.activeAttachedAt = Date.now();
+        emitTargetChanged(session);
+        return true;
+    }
+    function activateFrameTarget(session, state, frameId) {
+        state.activeFrameId = frameId;
         state.activeAttachedAt = Date.now();
         emitTargetChanged(session);
         return true;
@@ -418,8 +354,14 @@ export const createExtensionSource = (options) => {
         for (const childId of childIds) {
             removeFrame(tabId, childId);
         }
-        if (state.requestedFrameId === frameId) {
-            state.requestedFrameId = null;
+        /**
+         * Keep the user's requested iframe selection across reload/navigation detaches.
+         * Frame ids are ephemeral, so the stored frame hint lets selection survive a fresh id after reload.
+         */
+        if (state.activeFrameId === frameId) {
+            state.requestedFrameDetached = state.requestedFrameId === frameId;
+            state.activeFrameId = null;
+            state.activeAttachedAt = null;
         }
         state.frames.delete(frameId);
         state.executionContexts.delete(frameId);
@@ -467,55 +409,6 @@ export const createExtensionSource = (options) => {
             state.pendingTitleLoads.delete(frameId);
         }
     }
-    function createDelegatingSession(config) {
-        const subscriptions = new Set();
-        const rebindSubscriptions = () => {
-            // Delegating sessions are created before a tab may be attached, so event listeners
-            // must follow the active extension session instead of binding once and going stale.
-            for (const subscription of subscriptions) {
-                subscription.unbind();
-                if (!currentSession) {
-                    continue;
-                }
-                subscription.off = currentSession.handle.onEvent(subscription.method, subscription.handler);
-            }
-        };
-        const disposeSubscriptions = () => {
-            for (const subscription of subscriptions) {
-                subscription.unbind();
-            }
-            subscriptions.clear();
-        };
-        const controller = {
-            rebind: rebindSubscriptions,
-            dispose: () => {
-                disposeSubscriptions();
-                delegatingSessions.delete(controller);
-            },
-        };
-        delegatingSessions.add(controller);
-        controller.rebind();
-        return {
-            isAttached: () => currentSession?.handle.isAttached() ?? false,
-            sendAndWait: async (method, params, options) => {
-                const session = getCurrentExtensionSession();
-                const targetContext = config.getTargetContext();
-                const nextParams = config.mapParams ? config.mapParams(method, params) : params;
-                const nextOptions = targetContext.kind === 'frame' && targetContext.sessionId ? { ...(options ?? {}), sessionId: targetContext.sessionId } : options;
-                return session.handle.sendAndWait(method, nextParams, nextOptions);
-            },
-            onEvent: (method, handler) => {
-                const subscription = createDelegatingEventSubscription(method, handler);
-                subscriptions.add(subscription);
-                controller.rebind();
-                return () => {
-                    subscription.unbind();
-                    subscriptions.delete(subscription);
-                };
-            },
-            getTargetContext: config.getTargetContext,
-        };
-    }
 };
 /**
  * Convert TabInfo to CdpSourceTarget.
@@ -528,13 +421,4 @@ const tabToTarget = (tab) => ({
     faviconUrl: tab.faviconUrl,
     attached: tab.attached,
 });
-const createDelegatingEventSubscription = (method, handler) => ({
-    method,
-    handler,
-    off: null,
-    unbind() {
-        this.off?.();
-        this.off = null;
-    },
-});
 //# sourceMappingURL=extension-source.js.map