browser-debugger-cli 0.6.0 → 0.6.2

package/dist/telemetry/a11y.js

@@ -0,0 +1,280 @@
+import { callCDP } from '../ipc/client.js';
+/**
+ * Builds accessibility tree from raw CDP nodes.
+ *
+ * Pure function that filters out ignored nodes and builds the tree structure.
+ * Separated from collectA11yTree for easier unit testing.
+ *
+ * @param rawNodes - Raw AXNode array from CDP
+ * @returns Parsed accessibility tree
+ * @throws Error if no root node found
+ */
+export function buildTreeFromRawNodes(rawNodes) {
+    const nodes = new Map();
+    let root = null;
+    for (const rawNode of rawNodes) {
+        if (rawNode.ignored) {
+            continue;
+        }
+        const node = parseA11yNode(rawNode);
+        nodes.set(node.nodeId, node);
+        root ??= node;
+    }
+    if (!root) {
+        throw new Error('No root node found in accessibility tree');
+    }
+    return {
+        root,
+        nodes,
+        count: nodes.size,
+    };
+}
+/**
+ * Collects the full accessibility tree from the page via IPC.
+ *
+ * Uses the worker's persistent CDP connection through callCDP for consistency
+ * with other DOM commands and to avoid connection conflicts.
+ *
+ * @returns Parsed and filtered accessibility tree
+ * @throws Error if CDP Accessibility domain fails
+ */
+export async function collectA11yTree() {
+    await callCDP('Accessibility.enable', {});
+    try {
+        const response = await callCDP('Accessibility.getFullAXTree', {});
+        const result = response.data?.result;
+        if (!result?.nodes) {
+            throw new Error('Failed to get accessibility tree');
+        }
+        return buildTreeFromRawNodes(result.nodes);
+    }
+    finally {
+        await callCDP('Accessibility.disable', {});
+    }
+}
+/**
+ * Parses raw CDP AXNode into simplified A11yNode format.
+ *
+ * Extracts key properties (role, name, description, value) and common
+ * ARIA properties (focusable, focused, disabled, required).
+ *
+ * @param rawNode - Raw AXNode from CDP
+ * @returns Simplified A11yNode
+ */
+function parseA11yNode(rawNode) {
+    const node = {
+        nodeId: rawNode.nodeId,
+        role: extractRole(rawNode),
+    };
+    if (rawNode.name?.value) {
+        node.name = String(rawNode.name.value);
+    }
+    if (rawNode.description?.value) {
+        node.description = String(rawNode.description.value);
+    }
+    if (rawNode.value?.value) {
+        node.value = String(rawNode.value.value);
+    }
+    if (rawNode.properties) {
+        const props = {};
+        for (const prop of rawNode.properties) {
+            if (prop.name === 'focusable') {
+                node.focusable = prop.value.value === true;
+            }
+            else if (prop.name === 'focused') {
+                node.focused = prop.value.value === true;
+            }
+            else if (prop.name === 'disabled') {
+                node.disabled = prop.value.value === true;
+            }
+            else if (prop.name === 'required') {
+                node.required = prop.value.value === true;
+            }
+            else {
+                props[prop.name] = prop.value.value;
+            }
+        }
+        if (Object.keys(props).length > 0) {
+            node.properties = props;
+        }
+    }
+    if (rawNode.childIds && rawNode.childIds.length > 0) {
+        node.childIds = rawNode.childIds;
+    }
+    if (rawNode.backendDOMNodeId) {
+        node.backendDOMNodeId = rawNode.backendDOMNodeId;
+    }
+    return node;
+}
+/**
+ * Extracts role string from AXNode.
+ *
+ * Prefers explicit role over Chrome internal role.
+ *
+ * @param rawNode - Raw AXNode from CDP
+ * @returns Role string (e.g., 'button', 'textbox', 'heading')
+ */
+function extractRole(rawNode) {
+    if (rawNode.role?.value) {
+        return String(rawNode.role.value);
+    }
+    return 'unknown';
+}
+/**
+ * Queries accessibility tree by pattern (role, name, description).
+ *
+ * Performs case-insensitive matching with AND logic for multiple fields.
+ *
+ * @param tree - Accessibility tree to search
+ * @param pattern - Query pattern with optional role, name, description
+ * @returns Query result with matching nodes
+ *
+ * @example
+ * ```typescript
+ * // Find submit buttons
+ * queryA11yTree(tree, { role: 'button', name: 'Submit' });
+ *
+ * // Find all textboxes
+ * queryA11yTree(tree, { role: 'textbox' });
+ *
+ * // Find by name only
+ * queryA11yTree(tree, { name: 'Email' });
+ * ```
+ */
+export function queryA11yTree(tree, pattern) {
+    const matches = [];
+    for (const node of tree.nodes.values()) {
+        if (matchesPattern(node, pattern)) {
+            matches.push(node);
+        }
+    }
+    return {
+        nodes: matches,
+        count: matches.length,
+        pattern,
+    };
+}
+/**
+ * Checks if a node matches the query pattern.
+ *
+ * All specified fields must match (AND logic).
+ * String matching is case-insensitive.
+ *
+ * @param node - A11y node to test
+ * @param pattern - Query pattern
+ * @returns True if node matches all pattern criteria
+ */
+function matchesPattern(node, pattern) {
+    if (pattern.role) {
+        if (node.role.toLowerCase() !== pattern.role.toLowerCase()) {
+            return false;
+        }
+    }
+    if (pattern.name) {
+        if (!node.name) {
+            return false;
+        }
+        if (!node.name.toLowerCase().includes(pattern.name.toLowerCase())) {
+            return false;
+        }
+    }
+    if (pattern.description) {
+        if (!node.description) {
+            return false;
+        }
+        if (!node.description.toLowerCase().includes(pattern.description.toLowerCase())) {
+            return false;
+        }
+    }
+    return true;
+}
+/**
+ * Parses query pattern string into A11yQueryPattern object.
+ *
+ * Supports format: "role:button name:Submit description:Main"
+ * Fields are separated by spaces, case-insensitive.
+ *
+ * @param patternString - Query pattern string
+ * @returns Parsed query pattern
+ *
+ * @example
+ * ```typescript
+ * parseQueryPattern('role:button name:Submit')
+ * // => { role: 'button', name: 'Submit' }
+ *
+ * parseQueryPattern('role:textbox')
+ * // => { role: 'textbox' }
+ *
+ * parseQueryPattern('name:Email')
+ * // => { name: 'Email' }
+ * ```
+ */
+export function parseQueryPattern(patternString) {
+    const pattern = {};
+    const parts = patternString.trim().split(/\s+/);
+    for (const part of parts) {
+        const [key, ...valueParts] = part.split(':');
+        const value = valueParts.join(':');
+        if (!value) {
+            continue;
+        }
+        if (!key) {
+            continue;
+        }
+        const normalizedKey = key.toLowerCase();
+        if (normalizedKey === 'role') {
+            pattern.role = value;
+        }
+        else if (normalizedKey === 'name') {
+            pattern.name = value;
+        }
+        else if (normalizedKey === 'description' || normalizedKey === 'desc') {
+            pattern.description = value;
+        }
+    }
+    return pattern;
+}
+/**
+ * Gets accessibility properties for a DOM node by CSS selector via IPC.
+ *
+ * Uses the worker's persistent CDP connection through callCDP for consistency.
+ *
+ * @param selector - CSS selector
+ * @returns A11y node or null if not found
+ * @throws Error if selector is invalid or element not found
+ */
+export async function getA11yNodeBySelector(selector) {
+    await callCDP('Accessibility.enable', {});
+    try {
+        const docResponse = await callCDP('DOM.getDocument', {});
+        const doc = docResponse.data?.result;
+        if (!doc?.root?.nodeId) {
+            throw new Error('Failed to get document root');
+        }
+        const nodeResponse = await callCDP('DOM.querySelector', {
+            nodeId: doc.root.nodeId,
+            selector,
+        });
+        const nodeResult = nodeResponse.data?.result;
+        if (!nodeResult?.nodeId) {
+            return null;
+        }
+        const a11yResponse = await callCDP('Accessibility.getPartialAXTree', {
+            nodeId: nodeResult.nodeId,
+            fetchRelatives: false,
+        });
+        const a11yResult = a11yResponse.data?.result;
+        if (!a11yResult?.nodes) {
+            return null;
+        }
+        const rawNode = a11yResult.nodes.find((n) => !n.ignored);
+        if (!rawNode) {
+            return null;
+        }
+        return parseA11yNode(rawNode);
+    }
+    finally {
+        await callCDP('Accessibility.disable', {});
+    }
+}
+//# sourceMappingURL=a11y.js.map

package/dist/telemetry/a11y.js.map

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

package/dist/telemetry/console.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"console.d.ts","sourceRoot":"","sources":["../../src/telemetry/console.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIzD,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAI/D;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,cAAc,EAAE,EAC1B,UAAU,GAAE,OAAe,EAC3B,sBAAsB,CAAC,EAAE,MAAM,MAAM,GACpC,OAAO,CAAC,eAAe,CAAC,CAuF1B"}
+{"version":3,"file":"console.d.ts","sourceRoot":"","sources":["../../src/telemetry/console.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIzD,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAQ/D;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,cAAc,EAAE,EAC1B,UAAU,GAAE,OAAe,EAC3B,sBAAsB,CAAC,EAAE,MAAM,MAAM,GACpC,OAAO,CAAC,eAAe,CAAC,CAmE1B"}

package/dist/telemetry/console.js

@@ -1,6 +1,10 @@
 import { CDPHandlerRegistry } from '../connection/handlers.js';
+import { TypedCDPConnection } from '../connection/typed-cdp.js';
 import { MAX_CONSOLE_MESSAGES } from '../constants.js';
+import { createLogger } from '../ui/logging/index.js';
 import { shouldExcludeConsoleMessage } from './filters.js';
+import { pushWithLimit } from './utils.js';
+const log = createLogger('console');
 /**
  * Start collecting console messages and exceptions via CDP Runtime domain.
  *
@@ -18,24 +22,18 @@ import { shouldExcludeConsoleMessage } from './filters.js';
  */
 export async function startConsoleCollection(cdp, messages, includeAll = false, getCurrentNavigationId) {
     const registry = new CDPHandlerRegistry();
-    // Enable runtime
+    const typed = new TypedCDPConnection(cdp);
     await cdp.send('Runtime.enable');
-    await cdp.send('Log.enable');
-    // Listen for console API calls
-    registry.register(cdp, 'Runtime.consoleAPICalled', (params) => {
+    registry.registerTyped(typed, 'Runtime.consoleAPICalled', (params) => {
         const text = params.args
             .map((arg) => {
-            // arg type already defined in Protocol.Runtime.ConsoleAPICalledEvent
             if (arg.value !== undefined) {
-                // Handle different value types - primitives only, objects use description
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                 const value = arg.value;
                 if (typeof value === 'string' ||
                     typeof value === 'number' ||
                     typeof value === 'boolean') {
                     return String(value);
                 }
-                // For objects/arrays, use description if available
                 return arg.description ?? '[object]';
             }
             if (arg.description !== undefined) {
@@ -44,47 +42,40 @@ export async function startConsoleCollection(cdp, messages, includeAll = false,
             return '';
         })
             .join(' ');
-        // Apply pattern filtering
         if (shouldExcludeConsoleMessage(text, params.type, includeAll)) {
             return;
         }
+        const navigationId = getCurrentNavigationId?.();
         const message = {
             type: params.type,
             text,
             timestamp: params.timestamp,
             args: params.args,
-            navigationId: getCurrentNavigationId?.(),
+            ...(navigationId !== undefined && { navigationId }),
         };
-        if (messages.length < MAX_CONSOLE_MESSAGES) {
-            messages.push(message);
-        }
-        else if (messages.length === MAX_CONSOLE_MESSAGES) {
-            console.error(`Warning: Console message limit reached (${MAX_CONSOLE_MESSAGES})`);
-        }
+        pushWithLimit(messages, message, MAX_CONSOLE_MESSAGES, () => {
+            log.debug(`Warning: Console message limit reached (${MAX_CONSOLE_MESSAGES})`);
+        });
     });
-    // Listen for exceptions
-    registry.register(cdp, 'Runtime.exceptionThrown', (params) => {
+    registry.registerTyped(typed, 'Runtime.exceptionThrown', (params) => {
         const exception = params.exceptionDetails;
         const text = exception.text ?? exception.exception?.description ?? 'Unknown error';
-        // Apply pattern filtering (but don't filter errors by default)
-        // Errors are usually important, only filter if they match noise patterns
         if (shouldExcludeConsoleMessage(text, 'error', includeAll)) {
             return;
         }
+        const navigationId = getCurrentNavigationId?.();
         const message = {
             type: 'error',
             text,
-            timestamp: params.timestamp, // Use event timestamp, not exceptionDetails.timestamp
-            navigationId: getCurrentNavigationId?.(),
+            timestamp: params.timestamp,
+            ...(navigationId !== undefined && { navigationId }),
         };
-        if (messages.length < MAX_CONSOLE_MESSAGES) {
-            messages.push(message);
-        }
+        pushWithLimit(messages, message, MAX_CONSOLE_MESSAGES, () => {
+            log.debug(`Warning: Console message limit reached (${MAX_CONSOLE_MESSAGES})`);
+        });
     });
-    // Return cleanup function
     return () => {
-        // Remove event handlers
-        registry.cleanup(cdp);
+        registry.cleanup();
     };
 }
 //# sourceMappingURL=console.js.map

package/dist/telemetry/console.js.map

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

package/dist/telemetry/dialogs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dialogs.d.ts","sourceRoot":"","sources":["../../src/telemetry/dialogs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAK/C;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CA+BtF"}
+{"version":3,"file":"dialogs.d.ts","sourceRoot":"","sources":["../../src/telemetry/dialogs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAK/C;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CAsBtF"}

package/dist/telemetry/dialogs.js

@@ -1,4 +1,5 @@
 import { CDPHandlerRegistry } from '../connection/handlers.js';
+import { TypedCDPConnection } from '../connection/typed-cdp.js';
 import { createLogger } from '../ui/logging/index.js';
 const log = createLogger('dialogs');
 /**
@@ -26,14 +27,10 @@ const log = createLogger('dialogs');
  */
 export async function startDialogHandling(cdp) {
     const registry = new CDPHandlerRegistry();
-    // Enable Page domain to receive dialog events
+    const typed = new TypedCDPConnection(cdp);
     await cdp.send('Page.enable');
-    // Listen for JavaScript dialog opening events
-    registry.register(cdp, 'Page.javascriptDialogOpening', (params) => {
+    registry.registerTyped(typed, 'Page.javascriptDialogOpening', (params) => {
         log.debug(`Auto-dismissing ${params.type} dialog: "${params.message}" from ${params.url}`);
-        // Auto-accept all dialogs to prevent blocking
-        // For prompt dialogs, use empty string as input
-        // Fire and forget - we don't await the response but handle errors
         void cdp
             .send('Page.handleJavaScriptDialog', {
             accept: true,
@@ -43,9 +40,8 @@ export async function startDialogHandling(cdp) {
             log.debug(`Failed to dismiss dialog: ${error.message}`);
         });
     });
-    // Return cleanup function
     return () => {
-        registry.cleanup(cdp);
+        registry.cleanup();
     };
 }
 //# sourceMappingURL=dialogs.js.map

package/dist/telemetry/dialogs.js.map

@@ -1 +1 @@
-{"version":3,"file":"dialogs.js","sourceRoot":"","sources":["../../src/telemetry/dialogs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAG9D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,GAAG,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;AAEpC;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,GAAkB;IAC1D,MAAM,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAC;IAE1C,8CAA8C;IAC9C,MAAM,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAE9B,8CAA8C;IAC9C,QAAQ,CAAC,QAAQ,CACf,GAAG,EACH,8BAA8B,EAC9B,CAAC,MAAkD,EAAE,EAAE;QACrD,GAAG,CAAC,KAAK,CAAC,mBAAmB,MAAM,CAAC,IAAI,aAAa,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;QAE3F,8CAA8C;QAC9C,gDAAgD;QAChD,kEAAkE;QAClE,KAAK,GAAG;aACL,IAAI,CAAC,6BAA6B,EAAE;YACnC,MAAM,EAAE,IAAI;YACZ,UAAU,EAAE,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS;SACtD,CAAC;aACD,KAAK,CAAC,CAAC,KAAY,EAAE,EAAE;YACtB,GAAG,CAAC,KAAK,CAAC,6BAA6B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACP,CAAC,CACF,CAAC;IAEF,0BAA0B;IAC1B,OAAO,GAAG,EAAE;QACV,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"dialogs.js","sourceRoot":"","sources":["../../src/telemetry/dialogs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,GAAG,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;AAEpC;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,GAAkB;IAC1D,MAAM,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAC;IAC1C,MAAM,KAAK,GAAG,IAAI,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAE1C,MAAM,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAE9B,QAAQ,CAAC,aAAa,CAAC,KAAK,EAAE,8BAA8B,EAAE,CAAC,MAAM,EAAE,EAAE;QACvE,GAAG,CAAC,KAAK,CAAC,mBAAmB,MAAM,CAAC,IAAI,aAAa,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;QAE3F,KAAK,GAAG;aACL,IAAI,CAAC,6BAA6B,EAAE;YACnC,MAAM,EAAE,IAAI;YACZ,UAAU,EAAE,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS;SACtD,CAAC;aACD,KAAK,CAAC,CAAC,KAAY,EAAE,EAAE;YACtB,GAAG,CAAC,KAAK,CAAC,6BAA6B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,EAAE;QACV,QAAQ,CAAC,OAAO,EAAE,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC"}

package/dist/telemetry/dom.d.ts

@@ -15,7 +15,7 @@ export declare function prepareDOMCollection(cdp: CDPConnection): Promise<Cleanu
  * Called during session shutdown to get the final state of the page.
  *
  * @param cdp - CDP connection instance
- * @returns DOM data including URL, title, and full HTML
+ * @returns DOM data including URL, title, full HTML, and A11y tree
  */
 export declare function collectDOM(cdp: CDPConnection): Promise<DOMData>;
 //# sourceMappingURL=dom.d.ts.map

package/dist/telemetry/dom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dom.d.ts","sourceRoot":"","sources":["../../src/telemetry/dom.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAExD;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CAsBvF;AAED;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAsFrE"}
+{"version":3,"file":"dom.d.ts","sourceRoot":"","sources":["../../src/telemetry/dom.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGzD,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAY,MAAM,SAAS,CAAC;AASlE;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CAcvF;AAmGD;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAkBrE"}

package/dist/telemetry/dom.js

@@ -1,3 +1,9 @@
+import { getErrorMessage } from '../connection/errors.js';
+import { createLogger } from '../ui/logging/index.js';
+import { buildTreeFromRawNodes } from './a11y.js';
+import { withTimeout } from './utils.js';
+const log = createLogger('dom');
+const CDP_TIMEOUT = 5000;
 /**
  * Prepare CDP domains for DOM collection.
  *
@@ -7,94 +13,111 @@
  * @returns Cleanup function that disables Runtime domain
  */
 export async function prepareDOMCollection(cdp) {
-    // Enable Page domain for frame tree
     await cdp.send('Page.enable');
-    // Enable DOM domain for document access
     await cdp.send('DOM.enable');
-    // Enable Runtime domain for document.title evaluation
     await cdp.send('Runtime.enable');
-    // Return cleanup function that disables Runtime domain
     return () => {
-        // Disable Runtime domain to clean up resources
-        // Note: This is best-effort during shutdown; errors are ignored
         try {
             cdp.send('Runtime.disable').catch(() => {
                 // Ignore errors during cleanup (Chrome may be closing)
             });
         }
         catch {
-            // Ignore synchronous errors
+            // Ignore synchronous errors during shutdown
         }
     };
 }
+/**
+ * Get the root node of the DOM tree.
+ */
+async function getDocumentRoot(cdp) {
+    const response = await withTimeout(cdp.send('DOM.getDocument', { depth: -1 }), CDP_TIMEOUT, 'DOM.getDocument');
+    return response.root;
+}
+/**
+ * Get the outer HTML of a node.
+ */
+async function getOuterHTML(cdp, nodeId) {
+    const response = await withTimeout(cdp.send('DOM.getOuterHTML', { nodeId }), CDP_TIMEOUT, 'DOM.getOuterHTML');
+    return response.outerHTML;
+}
+/**
+ * Get the main frame information.
+ */
+async function getMainFrame(cdp) {
+    const response = await withTimeout(cdp.send('Page.getFrameTree'), CDP_TIMEOUT, 'Page.getFrameTree');
+    return response.frameTree.frame;
+}
+/**
+ * Get the document title using Runtime.evaluate.
+ */
+async function getDocumentTitle(cdp) {
+    try {
+        const result = await withTimeout(cdp.send('Runtime.evaluate', {
+            expression: 'document.title',
+            returnByValue: true,
+        }), CDP_TIMEOUT, 'Runtime.evaluate');
+        if (result.result.value !== undefined && typeof result.result.value === 'string') {
+            return result.result.value;
+        }
+    }
+    catch (error) {
+        log.debug(`Failed to get document title: ${getErrorMessage(error)}`);
+    }
+    return 'Untitled';
+}
+/**
+ * Capture accessibility tree from the current page.
+ *
+ * @param cdp - CDP connection instance
+ * @returns A11y tree with nodes serialized as plain object, or undefined on error
+ */
+async function collectA11yTree(cdp) {
+    try {
+        await cdp.send('Accessibility.enable');
+        const response = (await withTimeout(cdp.send('Accessibility.getFullAXTree', {}), CDP_TIMEOUT, 'Accessibility.getFullAXTree'));
+        if (!response.nodes) {
+            return undefined;
+        }
+        const tree = buildTreeFromRawNodes(response.nodes);
+        await cdp.send('Accessibility.disable').catch(() => {
+            /* Ignore errors */
+        });
+        return {
+            root: tree.root,
+            nodes: Object.fromEntries(tree.nodes),
+            count: tree.count,
+        };
+    }
+    catch (error) {
+        log.debug(`A11y tree capture failed: ${getErrorMessage(error)}`);
+        return undefined;
+    }
+}
 /**
  * Capture a complete DOM snapshot of the current page.
  *
  * Called during session shutdown to get the final state of the page.
  *
  * @param cdp - CDP connection instance
- * @returns DOM data including URL, title, and full HTML
+ * @returns DOM data including URL, title, full HTML, and A11y tree
  */
 export async function collectDOM(cdp) {
-    const domCaptureStart = Date.now();
     try {
-        // Add a timeout wrapper to prevent hanging
-        const timeout = 5000; // 5 seconds should be plenty for DOM capture
-        const captureWithTimeout = async (promise, label) => {
-            return Promise.race([
-                promise,
-                new Promise((_, reject) => setTimeout(() => reject(new Error(`${label} timed out after ${timeout}ms`)), timeout)),
-            ]);
-        };
-        // Get document
-        console.error('Getting document...');
-        const docStart = Date.now();
-        const documentResponse = await captureWithTimeout(cdp.send('DOM.getDocument', { depth: -1 }), 'DOM.getDocument');
-        const root = documentResponse.root;
-        console.error(`[PERF] DOM.getDocument: ${Date.now() - docStart}ms (nodeId: ${root.nodeId})`);
-        // Get outer HTML
-        console.error('Getting outer HTML...');
-        const htmlStart = Date.now();
-        const htmlResponse = await captureWithTimeout(cdp.send('DOM.getOuterHTML', {
-            nodeId: root.nodeId,
-        }), 'DOM.getOuterHTML');
-        const outerHTML = htmlResponse.outerHTML;
-        console.error(`[PERF] DOM.getOuterHTML: ${Date.now() - htmlStart}ms (${outerHTML.length} chars)`);
-        // Get page info
-        console.error('Getting page info...');
-        const frameStart = Date.now();
-        const frameTreeResponse = await captureWithTimeout(cdp.send('Page.getFrameTree'), 'Page.getFrameTree');
-        const frame = frameTreeResponse.frameTree.frame;
-        console.error(`[PERF] Page.getFrameTree: ${Date.now() - frameStart}ms (url: ${frame.url})`);
-        // Get real document title using Runtime.evaluate
-        console.error('Getting document title...');
-        let title = 'Untitled';
-        try {
-            const titleStart = Date.now();
-            const titleResult = await captureWithTimeout(cdp.send('Runtime.evaluate', {
-                expression: 'document.title',
-                returnByValue: true,
-            }), 'Runtime.evaluate (document.title)');
-            if (titleResult.result.value !== undefined && typeof titleResult.result.value === 'string') {
-                title = titleResult.result.value;
-            }
-            console.error(`[PERF] Runtime.evaluate (title): ${Date.now() - titleStart}ms`);
-        }
-        catch (titleError) {
-            console.error('Failed to get document title, using fallback:', titleError);
-        }
-        console.error(`Got document title: ${title}`);
-        const url = frame.url;
-        const totalDuration = Date.now() - domCaptureStart;
-        console.error(`[PERF] Total DOM capture: ${totalDuration}ms`);
+        const root = await getDocumentRoot(cdp);
+        const outerHTML = await getOuterHTML(cdp, root.nodeId);
+        const frame = await getMainFrame(cdp);
+        const title = await getDocumentTitle(cdp);
+        const a11yTree = await collectA11yTree(cdp);
         return {
-            url,
+            url: frame.url,
             title,
             outerHTML,
+            ...(a11yTree && { a11yTree }),
         };
     }
     catch (error) {
-        console.error('Error in collectDOM:', error);
+        log.info(`DOM capture failed: ${getErrorMessage(error)}`);
         throw error;
     }
 }