@@ -261,83 +261,35 @@ function diffAriaSnapshots(previous, current) {
 // Build: accessibility tree → YAML snapshot
 // ─────────────────────────────────────────────────────────────────
 
-const TRANSPARENT_ROLES = new Set(['RootWebArea', 'WebArea', 'generic', 'none', 'presentation', 'Ignored', 'LabelText', 'Section', 'strong', 'emphasis', 'superscript', 'subscript', 'mark', 'time', 'abbr'])
-const DROPPED_ROLES = new Set(['InlineTextBox', 'LineBreak', 'ListMarker'])
-const NAME_FROM_CONTENT_ROLES = new Set(['button', 'link', 'heading', 'tab', 'menuitem', 'menuitemcheckbox', 'menuitemradio', 'option', 'treeitem', 'cell', 'gridcell', 'columnheader', 'rowheader', 'switch', 'checkbox', 'radio'])
-const VALUE_ROLES = new Set(['textbox', 'searchbox', 'combobox', 'spinbutton', 'slider'])
-const ROLE_ALIASES = { image: 'img', StaticText: 'text' }
-
-function textOf(node) {
-  if (node.role === 'StaticText') return node.name || ''
-  return (node.children || []).map(textOf).join(' ')
+const HIDDEN_ROLES = new Set(['RootWebArea', 'generic', 'none', 'LabelText', 'InlineTextBox', 'LineBreak', 'ListMarker'])
+
+function renderAXTree(node, depth = 0, parentName = '') {
+  if (!node) return []
+  const indent = '  '.repeat(depth)
+  const name = (node.name || '').trim()
+  if (node.role === 'StaticText') return name && name !== parentName ? [`${indent}- text: ${JSON.stringify(name)}`] : []
+  const hidden = HIDDEN_ROLES.has(node.role)
+  const children = (node.children || []).flatMap(child => renderAXTree(child, hidden ? depth : depth + 1, hidden ? parentName : name))
+  if (hidden) return children
+  const line = `${indent}- ${node.role}${name ? ` ${JSON.stringify(name)}` : ''}`
+  return [children.length ? `${line}:` : line, ...children]
 }
 
-function quoteValue(value) {
-  if (/^[\s\-?:,[\]{}#&*!|>'"%@`]|: | #|\s$/.test(value)) return JSON.stringify(value)
-  return value
-}
-
-function toAriaNodes(node) {
-  if (!node || DROPPED_ROLES.has(node.role)) return []
-  if (node.role === 'StaticText') {
-    const text = (node.name || '').trim()
-    if (!text) return []
-    return [{ role: 'text', attributes: {}, text, value: quoteValue(text), children: [] }]
-  }
-
-  let children = (node.children || []).flatMap(toAriaNodes)
-  if (TRANSPARENT_ROLES.has(node.role)) return children
-
-  let name = (node.name || '').trim()
-  if (!name && NAME_FROM_CONTENT_ROLES.has(node.role)) name = textOf(node).replace(/\s+/g, ' ').trim()
-  if (name) children = children.filter(child => child.role !== 'text' || !name.includes(child.text))
-
-  const attributes = {}
-  if (node.level && node.role === 'heading') attributes.level = node.level
-  for (const key of ['checked', 'pressed']) {
-    if (node[key] === true || node[key] === 'true') attributes[key] = true
-    if (node[key] === 'mixed') attributes[key] = 'mixed'
-  }
-  for (const key of ['disabled', 'expanded', 'selected']) {
-    if (node[key] === true || node[key] === 'true') attributes[key] = true
-  }
-
-  const ariaNode = { role: ROLE_ALIASES[node.role] || node.role, name: name.replace(/"/g, '\\"'), attributes, children }
-  if (VALUE_ROLES.has(node.role) && node.value !== undefined && node.value !== null && String(node.value).trim()) {
-    ariaNode.value = quoteValue(String(node.value).trim())
-  }
-  return [ariaNode]
-}
-
-function renderSnapshot(nodes, depth = 0) {
-  return nodes
-    .map(node => {
-      const head = `${'  '.repeat(depth)}- ${formatNode(node)}`
-      if (node.children.length === 0) return head
-      return `${head}:\n${renderSnapshot(node.children, depth + 1)}`
-    })
-    .join('\n')
-}
-
-// Accepts a nested tree shaped like Puppeteer's SerializedAXNode: { role, name, value, level, checked, ..., children }
+// Nested tree shaped like Puppeteer's SerializedAXNode: { role, name, children }
 function ariaSnapshotFromTree(root) {
-  return renderSnapshot(toAriaNodes(root))
+  return renderAXTree(root).join('\n')
 }
 
-// Accepts the flat `nodes` list returned by CDP `Accessibility.getFullAXTree`
-function ariaSnapshotFromAXNodes(axNodes, rootBackendNodeId) {
+// Flat `nodes` list from CDP `Accessibility.getFullAXTree`, rooted at a DOM node
+function ariaSnapshotFromAXNodes(axNodes, backendNodeId) {
   const byId = new Map(axNodes.map(node => [node.nodeId, node]))
-  const build = axNode => {
-    const node = { role: axNode.role?.value, name: axNode.name?.value, value: axNode.value?.value }
-    if (axNode.ignored) node.role = 'Ignored'
-    for (const prop of axNode.properties || []) node[prop.name] = prop.value?.value
-    node.children = (axNode.childIds || []).map(id => byId.get(id)).filter(Boolean).map(build)
-    return node
-  }
-  let root = axNodes.find(node => node.role?.value === 'RootWebArea') || axNodes[0]
-  if (rootBackendNodeId !== undefined) root = axNodes.find(node => node.backendDOMNodeId === rootBackendNodeId)
-  if (!root) return ''
-  return ariaSnapshotFromTree(build(root))
+  const toTree = node => ({
+    role: node.ignored ? 'none' : node.role?.value,
+    name: node.name?.value,
+    children: (node.childIds || []).map(id => byId.get(id)).filter(Boolean).map(toTree),
+  })
+  const root = axNodes.find(node => node.backendDOMNodeId === backendNodeId)
+  return root ? ariaSnapshotFromTree(toTree(root)) : ''
 }
 
 export { diffAriaSnapshots, compactAriaSnapshot, ariaSnapshotFromTree, ariaSnapshotFromAXNodes }
@@ -1,90 +1,38 @@
 import { expect } from 'chai'
 import { ariaSnapshotFromAXNodes, ariaSnapshotFromTree, compactAriaSnapshot, diffAriaSnapshots } from '../../lib/aria.js'
 
-const role = value => ({ type: 'role', value })
-const name = value => ({ type: 'computedString', value })
-const prop = (n, value) => ({ name: n, value: { type: 'token', value } })
-
-const lightpandaNodes = [
-  { nodeId: '1', backendDOMNodeId: 1, role: role('RootWebArea'), name: name('Checkout'), childIds: ['2'] },
-  { nodeId: '2', backendDOMNodeId: 2, role: role('none'), childIds: ['3', '5', '7', '8'] },
-  { nodeId: '3', backendDOMNodeId: 3, role: role('heading'), name: name('Checkout form'), properties: [{ name: 'level', value: { type: 'integer', value: 4 } }], childIds: ['4'] },
-  { nodeId: '4', backendDOMNodeId: 4, role: role('StaticText'), name: name('Checkout form'), childIds: [] },
-  { nodeId: '5', backendDOMNodeId: 5, role: role('form'), name: name(''), childIds: ['6', '9'] },
-  { nodeId: '6', backendDOMNodeId: 6, role: role('textbox'), name: name('Promo code'), value: { type: 'string', value: 'SALE' }, properties: [prop('invalid', 'false')], childIds: [] },
-  { nodeId: '7', backendDOMNodeId: 7, role: role('checkbox'), name: name('Same address'), value: { type: 'string', value: 'on' }, properties: [prop('checked', 'true')], childIds: [] },
-  { nodeId: '8', backendDOMNodeId: 8, role: role('paragraph'), childIds: ['10'] },
-  { nodeId: '9', backendDOMNodeId: 9, role: role('button'), name: name('Redeem'), childIds: ['11'] },
-  { nodeId: '10', backendDOMNodeId: 10, role: role('StaticText'), name: name('Total: $20'), childIds: [] },
-  { nodeId: '11', backendDOMNodeId: 11, role: role('StaticText'), name: name('Redeem'), childIds: [] },
-]
-
-const obscuraNodes = [
-  { nodeId: '1', ignored: false, role: role('RootWebArea'), childIds: ['2'], backendDOMNodeId: 1 },
-  { nodeId: '2', ignored: false, role: role('generic'), childIds: ['3', '5'], backendDOMNodeId: 2 },
-  { nodeId: '3', ignored: false, role: role('button'), properties: [{ name: 'focusable', value: { type: 'boolean', value: true } }], childIds: ['4'], backendDOMNodeId: 3 },
-  { nodeId: '4', ignored: false, role: role('StaticText'), name: { type: 'string', value: 'Redeem' }, backendDOMNodeId: 4 },
-  { nodeId: '5', ignored: false, role: role('heading'), properties: [{ name: 'level', value: { type: 'integer', value: 2 } }], childIds: ['6'], backendDOMNodeId: 5 },
-  { nodeId: '6', ignored: false, role: role('LabelText'), childIds: ['7'], backendDOMNodeId: 6 },
-  { nodeId: '7', ignored: false, role: role('StaticText'), name: { type: 'string', value: 'Billing address' }, backendDOMNodeId: 7 },
+const axNode = (nodeId, role, name, childIds = []) => ({ nodeId, backendDOMNodeId: Number(nodeId), role: { value: role }, name: name === undefined ? undefined : { value: name }, childIds })
+
+const axNodes = [
+  axNode('1', 'generic', undefined, ['2', '4', '6']),
+  axNode('2', 'heading', 'Checkout', ['3']),
+  axNode('3', 'StaticText', 'Checkout'),
+  axNode('4', 'form', '', ['5', '7']),
+  axNode('5', 'textbox', 'Promo code'),
+  axNode('6', 'StaticText', 'Total: $20'),
+  axNode('7', 'button', undefined, ['8']),
+  axNode('8', 'StaticText', 'Redeem'),
 ]
 
 describe('aria', () => {
-  describe('#ariaSnapshotFromAXNodes', () => {
-    it('renders a Lightpanda accessibility tree as an ARIA snapshot', () => {
-      expect(ariaSnapshotFromAXNodes(lightpandaNodes)).to.equal(
-        [
-          '- heading "Checkout form" [level=4]',
-          '- form:',
-          '  - textbox "Promo code": SALE',
-          '  - button "Redeem"',
-          '- checkbox "Same address" [checked]',
-          '- paragraph:',
-          '  - text: "Total: $20"',
-        ].join('\n'),
-      )
-    })
-
-    it('names buttons and headings from their text when the engine leaves names empty', () => {
-      expect(ariaSnapshotFromAXNodes(obscuraNodes)).to.equal(['- button "Redeem"', '- heading "Billing address" [level=2]'].join('\n'))
-    })
-
-    it('scopes the snapshot to an element by its backend node id', () => {
-      expect(ariaSnapshotFromAXNodes(lightpandaNodes, 5)).to.equal(['- form:', '  - textbox "Promo code": SALE', '  - button "Redeem"'].join('\n'))
-    })
-
-    it('returns an empty snapshot when the element is not in the tree', () => {
-      expect(ariaSnapshotFromAXNodes(lightpandaNodes, 999)).to.equal('')
-    })
-
-    it('produces snapshots that compact and diff like Playwright ones', () => {
-      const before = ariaSnapshotFromAXNodes(lightpandaNodes)
-      const after = ariaSnapshotFromAXNodes(lightpandaNodes.filter(node => node.nodeId !== '9'))
-      expect(compactAriaSnapshot(before)).to.include('button "Redeem"')
-      expect(diffAriaSnapshots(before, after)).to.include('removed: 1 interactive elements')
-    })
+  it('renders a CDP accessibility tree from a DOM node', () => {
+    expect(ariaSnapshotFromAXNodes(axNodes, 1)).to.equal(
+      ['- heading "Checkout"', '- form:', '  - textbox "Promo code"', '  - button:', '    - text: "Redeem"', '- text: "Total: $20"'].join('\n'),
+    )
+    expect(ariaSnapshotFromAXNodes(axNodes, 4)).to.equal(['- form:', '  - textbox "Promo code"', '  - button:', '    - text: "Redeem"'].join('\n'))
+    expect(ariaSnapshotFromAXNodes(axNodes, 999)).to.equal('')
   })
 
-  describe('#ariaSnapshotFromTree', () => {
-    it('renders a Puppeteer accessibility snapshot', () => {
-      const tree = {
-        role: 'RootWebArea',
-        name: 'Login',
-        children: [
-          { role: 'heading', name: 'Sign "in"', level: 1, children: [{ role: 'StaticText', name: 'Sign "in"', children: [{ role: 'InlineTextBox', name: 'Sign "in"' }] }] },
-          { role: 'textbox', name: 'Email', value: '' },
-          { role: 'checkbox', name: 'Remember me', checked: 'mixed' },
-          { role: 'button', name: 'Submit', disabled: true },
-          { role: 'image', name: 'Logo' },
-        ],
-      }
-      expect(ariaSnapshotFromTree(tree)).to.equal(
-        ['- heading "Sign \\"in\\"" [level=1]', '- textbox "Email"', '- checkbox "Remember me" [checked=mixed]', '- button "Submit" [disabled]', '- img "Logo"'].join('\n'),
-      )
-    })
+  it('renders a Puppeteer accessibility tree', () => {
+    const tree = { role: 'RootWebArea', children: [{ role: 'button', name: 'Submit', children: [{ role: 'StaticText', name: 'Submit' }] }] }
+    expect(ariaSnapshotFromTree(tree)).to.equal('- button "Submit"')
+    expect(ariaSnapshotFromTree(null)).to.equal('')
+  })
 
-    it('returns an empty snapshot for an empty tree', () => {
-      expect(ariaSnapshotFromTree(null)).to.equal('')
-    })
+  it('produces snapshots that compact and diff', () => {
+    const before = ariaSnapshotFromAXNodes(axNodes, 1)
+    const after = ariaSnapshotFromAXNodes(axNodes.filter(node => node.nodeId !== '5'), 1)
+    expect(compactAriaSnapshot(before)).to.include('textbox "Promo code"')
+    expect(diffAriaSnapshots(before, after)).to.include('removed: 1 interactive elements')
   })
 })