diff --git a/.github/workflows/figma-transformer.yml b/.github/workflows/figma-transformer.yml
new file mode 100644
index 00000000..2ff96655
--- /dev/null
+++ b/.github/workflows/figma-transformer.yml
@@ -0,0 +1,42 @@
+name: Figma Transformer
+
+on:
+  pull_request:
+    paths:
+      - ".github/workflows/figma-transformer.yml"
+      - "figma-transformer/**"
+  push:
+    branches:
+      - trunk
+    paths:
+      - ".github/workflows/figma-transformer.yml"
+      - "figma-transformer/**"
+
+jobs:
+  validate:
+    name: Composer validate and test
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: figma-transformer
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240  # 2.37.2
+        with:
+          php-version: "8.1"
+          coverage: none
+          tools: composer:v2
+
+      - name: Install dependencies
+        run: composer install --no-interaction --prefer-dist --no-progress
+
+      - name: Validate Composer package metadata
+        run: composer validate --strict
+
+      - name: Run package tests
+        run: composer test
diff --git a/.github/workflows/php-transformer.yml b/.github/workflows/php-transformer.yml
index 145b1c4a..6d6573be 100644
--- a/.github/workflows/php-transformer.yml
+++ b/.github/workflows/php-transformer.yml
@@ -5,12 +5,16 @@ on:
     paths:
       - ".github/workflows/php-transformer.yml"
       - "php-transformer/**"
+      - "scripts/production-acceptance-matrix.php"
+      - "tests/contract/production-acceptance-matrix.php"
   push:
     branches:
       - trunk
     paths:
       - ".github/workflows/php-transformer.yml"
       - "php-transformer/**"
+      - "scripts/production-acceptance-matrix.php"
+      - "tests/contract/production-acceptance-matrix.php"
 
 jobs:
   validate:
@@ -41,6 +45,36 @@ jobs:
       - name: Run package tests
         run: composer test
 
+      - name: Run repository acceptance matrix contract
+        working-directory: .
+        run: php tests/contract/production-acceptance-matrix.php
+
+  visual-parity:
+    name: Generic visual parity tools
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: php-transformer/tools/visual-parity
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Install Chromium
+        run: npx playwright install --with-deps chromium
+
+      - name: Run visual parity tests
+        run: npm test
+
   wordpress-site-plan:
     name: WordPress site plan integration
     runs-on: ubuntu-24.04
diff --git a/figma-transformer/scripts/figma-fixture-matrix.php b/figma-transformer/scripts/figma-fixture-matrix.php
index 7908ac5e..007fbcca 100755
--- a/figma-transformer/scripts/figma-fixture-matrix.php
+++ b/figma-transformer/scripts/figma-fixture-matrix.php
@@ -950,7 +950,9 @@ function matrix_dom_box_capture_command(string $homeboyCommand, string $domBoxPr
         return $command;
     }
 
-    $environment = 'HOMEBOY_DOM_BOX_CAPTURE_COMMAND=' . escapeshellarg($domBoxProviderCommand);
+    $environment = 'HOMEBOY_DOM_BOX_CAPTURE_COMMAND=' . escapeshellarg($domBoxProviderCommand)
+        . ' HOMEBOY_DOM_BOX_NODE_ID_ATTR=' . escapeshellarg('data-figma-node-id')
+        . ' HOMEBOY_DOM_BOX_NODE_NAME_ATTR=' . escapeshellarg('data-figma-node-name,data-figma-name');
     if ( ! empty($captureTargets) ) {
         $environment .= ' HOMEBOY_DOM_BOX_CAPTURE_TARGETS_JSON=' . escapeshellarg((string) json_encode($captureTargets, JSON_UNESCAPED_SLASHES));
     }
diff --git a/figma-transformer/tests/contract/FixtureMatrixContract.php b/figma-transformer/tests/contract/FixtureMatrixContract.php
index ac05e8ea..eb71aafd 100644
--- a/figma-transformer/tests/contract/FixtureMatrixContract.php
+++ b/figma-transformer/tests/contract/FixtureMatrixContract.php
@@ -862,6 +862,8 @@ function blocks_engine_figma_transformer_run_fixture_matrix_contract(callable $a
     $matrixAliasCaptureCommand = (string) ($matrixAliasSummary['fixtures'][0]['dom_box_capture']['command'] ?? '');
     $assert(str_contains($matrixAliasCaptureCommand, escapeshellarg('/opt/homeboy-alias')), 'fixture-matrix-alias-capture-uses-homeboy-bin');
     $assert(str_contains($matrixAliasCaptureCommand, 'HOMEBOY_DOM_BOX_CAPTURE_COMMAND=' . escapeshellarg('node dom-box-alias')), 'fixture-matrix-alias-capture-uses-dom-box-command');
+    $assert(str_contains($matrixAliasCaptureCommand, 'HOMEBOY_DOM_BOX_NODE_ID_ATTR=' . escapeshellarg('data-figma-node-id')), 'fixture-matrix-supplies-figma-node-id-contract');
+    $assert(str_contains($matrixAliasCaptureCommand, 'HOMEBOY_DOM_BOX_NODE_NAME_ATTR=' . escapeshellarg('data-figma-node-name,data-figma-name')), 'fixture-matrix-supplies-figma-node-name-contract');
 
     $assert(is_array($matrixCanonicalSummary), 'fixture-matrix-canonical-json-summary');
     $assert('/opt/homeboy-canonical' === ($matrixCanonicalSummary['homeboy_command'] ?? null), 'fixture-matrix-homeboy-command-canonical');
diff --git a/figma-transformer/tests/contract/KiwiParserContract.php b/figma-transformer/tests/contract/KiwiParserContract.php
index b9e54217..fd114c06 100644
--- a/figma-transformer/tests/contract/KiwiParserContract.php
+++ b/figma-transformer/tests/contract/KiwiParserContract.php
@@ -80,7 +80,7 @@ function blocks_engine_figma_transformer_run_kiwi_parser_contract(callable $asse
         . pack('V', 106)
         . blocks_engine_figma_transformer_kiwi_chunk("\x28\xb5\x2f\xfd" . 'adapter-frame')
     );
-    $failingAdapterResult = ( new ZstdCapability(static fn (): false => false) )->uncompress("\x28\xb5\x2f\xfd" . 'adapter-frame', 'ContractTest', 3);
+    $failingAdapterResult = ( new ZstdCapability(static fn (): bool => false) )->uncompress("\x28\xb5\x2f\xfd" . 'adapter-frame', 'ContractTest', 3);
     $commandAdapter = new ZstdCapability(new ZstdCommandDecoder(array(PHP_BINARY, '-r', '$payload = stream_get_contents(STDIN); fwrite(STDOUT, $payload);')));
     $commandAdapterResult = $commandAdapter->uncompress('command adapter bytes', 'ContractTest', 4);
     $limitedCommandAdapterResult = $commandAdapter->uncompress('command adapter bytes', 'ContractTest', 5, array('max_decoded_bytes' => 1));
diff --git a/php-transformer/composer.json b/php-transformer/composer.json
index 245fdb28..85396c08 100644
--- a/php-transformer/composer.json
+++ b/php-transformer/composer.json
@@ -52,7 +52,6 @@
       "php tests/contract/run.php",
       "php tests/contract/finding-contract.php",
       "php tests/contract/wordpress-site-plan.php",
-      "php tests/contract/production-acceptance-matrix.php",
       "@test:unit"
     ],
     "test:unit": [
diff --git a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php
index 04aa91bc..8cdadebc 100644
--- a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php
+++ b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php
@@ -5894,7 +5894,7 @@ private function searchBlockFromForm(DOMElement $form): ?array
      */
     private function searchBlockFromStandaloneControl(DOMElement $element): ?array
     {
-        if ( 0 < $element->getElementsByTagName('form')->length || 0 < $element->getElementsByTagName('script')->length || array() !== $this->eventMetadata($element) ) {
+        if ( 0 < $element->getElementsByTagName('form')->length || 0 < $element->getElementsByTagName('script')->length || array() !== $this->eventMetadata($element) || $this->isRuntimeDomTarget($element) ) {
             return null;
         }
 
@@ -5904,10 +5904,9 @@ private function searchBlockFromStandaloneControl(DOMElement $element): ?array
                 $inputs[] = $input;
             }
         }
-        if ( 1 !== count($inputs) || array() !== $this->eventMetadata($inputs[0]) ) {
+        if ( 1 !== count($inputs) || array() !== $this->eventMetadata($inputs[0]) || $this->isRuntimeDomTarget($inputs[0]) ) {
             return null;
         }
-
         $controls = $this->formControlElements($element);
         if ( 1 !== count($controls) ) {
             return null;
@@ -5925,7 +5924,21 @@ private function searchBlockFromStandaloneControl(DOMElement $element): ?array
         if ( '' === $label ) {
             $label = $this->attr($searchInput, 'placeholder');
         }
-        return $this->htmlPreservationBlock($element);
+
+        if ( '' !== $this->attr($searchInput, 'id') || 's' !== $this->attr($searchInput, 'name') ) {
+            return $this->htmlPreservationBlock($element);
+        }
+        if ( 1 !== $this->childElementCount($element) ) {
+            return null;
+        }
+
+        $placeholder = $this->attr($searchInput, 'placeholder');
+        return $this->createBlock('core/search', array_merge($this->presentationAttributes($element), array(
+            'label'          => '' !== $label ? $label : 'Search',
+            'showLabel'      => false,
+            'placeholder'    => $placeholder,
+            'buttonPosition' => 'no-button',
+        )), array(), $element);
     }
 
     /**
diff --git a/php-transformer/tests/contract/run.php b/php-transformer/tests/contract/run.php
index a8ffeac7..9350dff2 100644
--- a/php-transformer/tests/contract/run.php
+++ b/php-transformer/tests/contract/run.php
@@ -755,6 +755,23 @@ public function match(DOMElement $element, PatternContext $context): ?array
 $assert('select' === ($standaloneControls['source_reports']['runtime_islands'][0]['control']['tag'] ?? ''), 'runtime-targeted standalone control reports control metadata');
 $assert(str_contains((string) ($standaloneControls['source_reports']['runtime_islands'][0]['source_snippet'] ?? ''), '<select class="js-sort-select"'), 'runtime-targeted standalone control preserves source snippet metadata');
 
+$standaloneSearch = ( new HtmlTransformer() )->transform(
+    '<div class="site-search"><input type="search" name="s" placeholder="Search articles" aria-label="Search articles"></div>'
+)->toArray();
+$standaloneSearchBlock = $standaloneSearch['blocks'][0] ?? array();
+$assert('core/search' === ($standaloneSearchBlock['blockName'] ?? ''), 'script-free standalone search input converts to core/search');
+$assert('Search articles' === ($standaloneSearchBlock['attrs']['placeholder'] ?? ''), 'standalone core/search preserves the source placeholder');
+$assert('no-button' === ($standaloneSearchBlock['attrs']['buttonPosition'] ?? ''), 'standalone input-only search keeps the no-button presentation');
+$assert(! str_contains((string) ($standaloneSearch['serialized_blocks'] ?? ''), '<!-- wp:html'), 'standalone search input avoids core/html');
+
+$runtimeDescendantSearch = ( new HtmlTransformer() )->transform(
+    '<div class="site-search"><input type="search" name="s" placeholder="Search"><span id="search-status" aria-live="polite"></span></div>',
+    array('runtime_dom_selectors' => array('#search-status'))
+)->toArray();
+$assert(! str_contains((string) ($runtimeDescendantSearch['serialized_blocks'] ?? ''), '<!-- wp:search'), 'synthetic search with an additional runtime descendant is not collapsed to core/search');
+$assert(str_contains((string) ($runtimeDescendantSearch['serialized_blocks'] ?? ''), 'search-status'), 'synthetic search preserves an additional runtime descendant');
+$assert(1 === count($runtimeDescendantSearch['source_reports']['runtime_islands'] ?? array()), 'synthetic search reports its preserved runtime descendant');
+
 $labelWrappedRuntimeControls = ( new HtmlTransformer() )->transform(
     '<main><label class="tool"><span>Theme</span><select id="scheme-select"><option>Harbor</option></select></label><label class="tool"><input type="checkbox" id="crt-toggle"><span>CRT</span></label></main>',
     array('runtime_dom_selectors' => array('#scheme-select', '#crt-toggle'))
diff --git a/php-transformer/tools/visual-parity/README.md b/php-transformer/tools/visual-parity/README.md
index b93409e8..723d21ff 100644
--- a/php-transformer/tools/visual-parity/README.md
+++ b/php-transformer/tools/visual-parity/README.md
@@ -68,29 +68,7 @@ homeboy tunnel artifact-origin dom-boxes \
   --report=<report.json>
 ```
 
-Use the generated `.fig -> HTML` artifact directory as `<artifact-root>`. The directory must contain `index.html` and any referenced CSS/assets. Keep committed docs and PR descriptions on placeholders such as `<fisiostetic-html-artifact-root>`, `<fse-html-artifact-root>`, and `<tt5-html-artifact-root>`; put machine-local paths only in local operator notes.
-
-Example artifact captures:
-
-```sh
-HOMEBOY_DOM_BOX_CAPTURE_COMMAND='node php-transformer/tools/visual-parity/bin/dom-box-provider.mjs' \
-homeboy tunnel artifact-origin dom-boxes \
-  --root=<fisiostetic-html-artifact-root> \
-  --entrypoint=index.html \
-  --report=<fisiostetic-dom-box-report.json>
-
-HOMEBOY_DOM_BOX_CAPTURE_COMMAND='node php-transformer/tools/visual-parity/bin/dom-box-provider.mjs' \
-homeboy tunnel artifact-origin dom-boxes \
-  --root=<fse-html-artifact-root> \
-  --entrypoint=index.html \
-  --report=<fse-dom-box-report.json>
-
-HOMEBOY_DOM_BOX_CAPTURE_COMMAND='node php-transformer/tools/visual-parity/bin/dom-box-provider.mjs' \
-homeboy tunnel artifact-origin dom-boxes \
-  --root=<tt5-html-artifact-root> \
-  --entrypoint=index.html \
-  --report=<tt5-dom-box-report.json>
-```
+The artifact directory must contain `index.html` and any referenced CSS/assets. Keep committed docs and PR descriptions on placeholders such as `<artifact-root>`; put machine-local paths only in local operator notes.
 
 The report is repeatable when the artifact root, entrypoint, browser version, viewport defaults, and node identity attributes stay fixed. Attach the JSON report to the Homeboy run, issue, or PR evidence surface so the next operator can compare generated HTML structure and positions without re-running the full transform.
 
@@ -104,10 +82,10 @@ node bin/dom-box-provider.mjs --node-id-attr=data-node-id --node-name-attr=data-
 
 | Setting | Env var | Flag | Default |
 | --- | --- | --- | --- |
-| Node id attribute | `HOMEBOY_DOM_BOX_NODE_ID_ATTR` | `--node-id-attr` | `data-figma-node-id` |
-| Node name attributes | `HOMEBOY_DOM_BOX_NODE_NAME_ATTR` | `--node-name-attr` | `data-figma-node-name,data-figma-name` |
+| Node id attribute | `HOMEBOY_DOM_BOX_NODE_ID_ATTR` | `--node-id-attr` | `data-node-id` |
+| Node name attributes | `HOMEBOY_DOM_BOX_NODE_NAME_ATTR` | `--node-name-attr` | `data-node-name` |
 
-The node id attribute drives element enumeration, selector generation, and id reads. Node name attributes are tried in order; `aria-label` is always appended as a final generic fallback. The defaults stay backward-compatible with the figma-transformer's `data-figma-*` output, so existing figma callers work with no changes; non-figma consumers override the attributes to match their own emitter.
+The node id attribute drives element enumeration, selector generation, and id reads. Node name attributes are tried in order; `aria-label` is always appended as a final generic fallback. Callers with different emitter contracts supply their own attributes explicitly.
 
 ## Screenshot provider
 
diff --git a/php-transformer/tools/visual-parity/bin/dom-box-provider.mjs b/php-transformer/tools/visual-parity/bin/dom-box-provider.mjs
index 15d9b2d9..fb3d64a7 100755
--- a/php-transformer/tools/visual-parity/bin/dom-box-provider.mjs
+++ b/php-transformer/tools/visual-parity/bin/dom-box-provider.mjs
@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 const DEFAULT_VIEWPORT = { width: 1440, height: 900, device_scale_factor: 1 };
-const DEFAULT_NODE_ID_ATTR = 'data-figma-node-id';
-const DEFAULT_NODE_NAME_ATTRS = ['data-figma-node-name', 'data-figma-name'];
+const DEFAULT_NODE_ID_ATTR = 'data-node-id';
+const DEFAULT_NODE_NAME_ATTRS = ['data-node-name'];
 const STATIC_ARTIFACT_CAPTURE_IGNORE_ATTR = 'data-static-artifact-capture';
 const SOURCE_NODE_TYPE_ATTR = 'data-source-node-type';
 const SOURCE_VISUAL_WIDTH_ATTR = 'data-source-visual-width';
@@ -265,7 +265,7 @@ function targetsForPage(targets, pagePath) {
 }
 
 function printHelp() {
-  process.stdout.write(`Capture DOM boxes for Homeboy artifact-origin dom-boxes.\n\nNode identity is keyed off a configurable attribute so the tool is product-neutral.\nThe figma-transformer's data-figma-* attributes remain the backward-compatible default.\n\nEnvironment:\n  HOMEBOY_DOM_BOX_BASE_URL             Static artifact origin base URL.\n  HOMEBOY_DOM_BOX_PAGE_PATHS_JSON      JSON array of page paths to capture.\n  HOMEBOY_DOM_BOX_TEXT_SAMPLE_LIMIT    Optional positive integer, default 160.\n  HOMEBOY_DOM_BOX_NODE_ID_ATTR         Node identity attribute, default ${DEFAULT_NODE_ID_ATTR}.\n  HOMEBOY_DOM_BOX_NODE_NAME_ATTR       Comma-separated node name attributes, default ${DEFAULT_NODE_NAME_ATTRS.join(',')} (aria-label is always a final fallback).\n  HOMEBOY_DOM_BOX_CAPTURE_TARGETS_JSON Optional page/source-frame viewport capture targets.\n\nFlags (override the matching environment variable):\n  --node-id-attr=<attr>                Node identity attribute used for enumeration, selectors, and id reads.\n  --node-name-attr=<attr>[,<attr>...]  Node name attributes, tried in order before aria-label.\n  --preflight                          Verify Playwright and Chromium are installed, then exit.\n\nOutput:\n  JSON browser payload on stdout for Homeboy to shape as homeboy/static-artifact-dom-boxes/v1.\n`);
+  process.stdout.write(`Capture DOM boxes for Homeboy artifact-origin dom-boxes.\n\nNode identity is keyed off configurable, format-neutral attributes.\n\nEnvironment:\n  HOMEBOY_DOM_BOX_BASE_URL             Static artifact origin base URL.\n  HOMEBOY_DOM_BOX_PAGE_PATHS_JSON      JSON array of page paths to capture.\n  HOMEBOY_DOM_BOX_TEXT_SAMPLE_LIMIT    Optional positive integer, default 160.\n  HOMEBOY_DOM_BOX_NODE_ID_ATTR         Node identity attribute, default ${DEFAULT_NODE_ID_ATTR}.\n  HOMEBOY_DOM_BOX_NODE_NAME_ATTR       Comma-separated node name attributes, default ${DEFAULT_NODE_NAME_ATTRS.join(',')} (aria-label is always a final fallback).\n  HOMEBOY_DOM_BOX_CAPTURE_TARGETS_JSON Optional page/source-frame viewport capture targets.\n\nFlags (override the matching environment variable):\n  --node-id-attr=<attr>                Node identity attribute used for enumeration, selectors, and id reads.\n  --node-name-attr=<attr>[,<attr>...]  Node name attributes, tried in order before aria-label.\n  --preflight                          Verify Playwright and Chromium are installed, then exit.\n\nOutput:\n  JSON browser payload on stdout for Homeboy to shape as homeboy/static-artifact-dom-boxes/v1.\n`);
 }
 
 async function extractElements(page, pagePath, textSampleLimit, nodeIdAttr, nodeNameAttrs) {
diff --git a/php-transformer/tools/visual-parity/tests/blockquote-margin-reset.mjs b/php-transformer/tools/visual-parity/tests/blockquote-margin-reset.mjs
index 3414f325..12f22da3 100644
--- a/php-transformer/tools/visual-parity/tests/blockquote-margin-reset.mjs
+++ b/php-transformer/tools/visual-parity/tests/blockquote-margin-reset.mjs
@@ -1,40 +1,23 @@
 import { createServer } from 'node:http';
 import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
-import { spawnSync } from 'node:child_process';
 import { tmpdir } from 'node:os';
 import path from 'node:path';
-import { fileURLToPath } from 'node:url';
 import { chromium } from 'playwright';
 
-const toolRoot = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
-const repositoryRoot = path.resolve(toolRoot, '../../..');
-const fixturePath = path.join(toolRoot, 'tests/fixtures/blockquote-margin-reset.scenegraph.json');
 const outputDir = await mkdtemp(path.join(tmpdir(), 'blocks-engine-blockquote-margin-'));
-const transformScript = `
-require $argv[1];
-$scenegraph = json_decode(file_get_contents($argv[2]), true, 512, JSON_THROW_ON_ERROR);
-$result = blocks_engine_figma_transformer_transform_scenegraph($scenegraph);
-foreach ($result['files'] as $file) {
-    $path = $argv[3] . '/' . $file['path'];
-    $directory = dirname($path);
-    if (!is_dir($directory)) {
-        mkdir($directory, 0777, true);
-    }
-    file_put_contents($path, $file['content']);
-}
-`;
-
-const transform = spawnSync('php', [
-  '-r',
-  transformScript,
-  path.join(repositoryRoot, 'figma-transformer/figma-transformer.php'),
-  fixturePath,
-  outputDir,
-], { encoding: 'utf8' });
-
-if (transform.status !== 0) {
-  throw new Error(`Figma fixture transform failed:\n${transform.stderr}`);
-}
+await writeFile(path.join(outputDir, 'index.html'), `<!doctype html>
+<html><head><style>
+body { margin: 0; }
+.stack { display: flex; flex-direction: column; gap: 16px; }
+.quote { margin: 8px 0 0; }
+p { margin: 0; }
+</style></head><body>
+<div class="stack">
+  <p data-node-id="preceding">Before</p>
+  <blockquote class="quote" data-node-id="quote">Quote</blockquote>
+  <p data-node-id="following">After</p>
+</div>
+</body></html>`);
 
 const server = createServer(async (request, response) => {
   const pathname = new URL(request.url, 'http://127.0.0.1').pathname;
@@ -65,9 +48,9 @@ try {
     const page = await browser.newPage({ viewport: { width: 800, height: 600 } });
     await page.goto(`http://127.0.0.1:${address.port}/`, { waitUntil: 'load' });
     const geometry = await page.evaluate(() => {
-      const preceding = document.querySelector('[data-figma-node-id="blockquote-margin:preceding"]');
-      const quote = document.querySelector('[data-figma-node-id="blockquote-margin:quote"]');
-      const following = document.querySelector('[data-figma-node-id="blockquote-margin:following"]');
+      const preceding = document.querySelector('[data-node-id="preceding"]');
+      const quote = document.querySelector('[data-node-id="quote"]');
+      const following = document.querySelector('[data-node-id="following"]');
       if (!preceding || !quote || !following) {
         throw new Error('Generated stack nodes are missing.');
       }
@@ -88,12 +71,12 @@ try {
       };
     });
 
-    assert(geometry.tag === 'BLOCKQUOTE', 'the generated quote uses a blockquote element');
-    assert(geometry.margins.top === '8px', 'the generated blockquote class keeps its explicit 8px source margin over the reset');
-    assert(geometry.margins.right === '0px' && geometry.margins.bottom === '0px' && geometry.margins.left === '0px', 'the reset removes Chromium blockquote UA 40px horizontal and 16px vertical margins');
-    assert(closeTo(geometry.quote.left, geometry.preceding.left), 'the blockquote has no UA horizontal offset');
-    assert(closeTo(geometry.quote.top - geometry.preceding.bottom, 24), 'the quote position combines the 16px stack gap and generated 8px margin');
-    assert(closeTo(geometry.following.top - geometry.quote.bottom, 16), 'the following sibling remains at the generated 16px stack gap');
+    assert(geometry.tag === 'BLOCKQUOTE', 'the quote uses a blockquote element');
+    assert(geometry.margins.top === '8px', 'the blockquote keeps its explicit 8px margin');
+    assert(geometry.margins.right === '0px' && geometry.margins.bottom === '0px' && geometry.margins.left === '0px', 'the reset removes browser blockquote margins');
+    assert(closeTo(geometry.quote.left, geometry.preceding.left), 'the blockquote has no browser horizontal offset');
+    assert(closeTo(geometry.quote.top - geometry.preceding.bottom, 24), 'the quote position combines the 16px stack gap and explicit 8px margin');
+    assert(closeTo(geometry.following.top - geometry.quote.bottom, 16), 'the following sibling remains at the 16px stack gap');
   } finally {
     await browser.close();
   }
diff --git a/php-transformer/tools/visual-parity/tests/fixtures/blockquote-margin-reset.scenegraph.json b/php-transformer/tools/visual-parity/tests/fixtures/blockquote-margin-reset.scenegraph.json
deleted file mode 100644
index 50819e96..00000000
--- a/php-transformer/tools/visual-parity/tests/fixtures/blockquote-margin-reset.scenegraph.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "name": "Blockquote Margin Reset Geometry Fixture",
-  "nodes": [
-    {
-      "id": "blockquote-margin:root",
-      "type": "FRAME",
-      "name": "Quote Stack",
-      "width": 480,
-      "height": 168,
-      "absoluteBoundingBox": { "x": 0, "y": 0, "width": 480, "height": 168 },
-      "layoutMode": "VERTICAL",
-      "itemSpacing": 16,
-      "children": [
-        {
-          "id": "blockquote-margin:preceding",
-          "type": "TEXT",
-          "name": "Body",
-          "characters": "Preceding sibling",
-          "x": 0,
-          "y": 0,
-          "width": 480,
-          "height": 24,
-          "absoluteBoundingBox": { "x": 0, "y": 0, "width": 480, "height": 24 },
-          "fontSize": 16
-        },
-        {
-          "id": "blockquote-margin:quote",
-          "type": "FRAME",
-          "name": "Blockquote",
-          "x": 0,
-          "y": 48,
-          "width": 480,
-          "height": 64,
-          "absoluteBoundingBox": { "x": 0, "y": 48, "width": 480, "height": 64 },
-          "children": [
-            {
-              "id": "blockquote-margin:quote-text",
-              "type": "TEXT",
-              "name": "Quote",
-              "characters": "The source adds an explicit eight pixel offset after the stack gap.",
-              "width": 480,
-              "height": 24,
-              "absoluteBoundingBox": { "x": 0, "y": 48, "width": 480, "height": 24 },
-              "fontSize": 16
-            }
-          ]
-        },
-        {
-          "id": "blockquote-margin:following",
-          "type": "TEXT",
-          "name": "Body",
-          "characters": "Following sibling",
-          "x": 0,
-          "y": 128,
-          "width": 480,
-          "height": 24,
-          "absoluteBoundingBox": { "x": 0, "y": 128, "width": 480, "height": 24 },
-          "fontSize": 16
-        }
-      ]
-    }
-  ]
-}
diff --git a/php-transformer/tools/visual-parity/tests/fixtures/fluid-layout-2095.html b/php-transformer/tools/visual-parity/tests/fixtures/fluid-layout-2095.html
index 009038ae..638c62af 100644
--- a/php-transformer/tools/visual-parity/tests/fixtures/fluid-layout-2095.html
+++ b/php-transformer/tools/visual-parity/tests/fixtures/fluid-layout-2095.html
@@ -14,10 +14,10 @@
   </style>
 </head>
 <body>
-  <main class="band" data-figma-node-id="fluid:band" data-figma-node-name="Fluid band">
-    <div class="columns" data-figma-node-id="fluid:columns" data-figma-node-name="Two columns">
-      <section class="column" data-figma-node-id="fluid:primary" data-figma-node-name="Primary column"></section>
-      <aside class="column" data-figma-node-id="fluid:secondary" data-figma-node-name="Secondary column"></aside>
+  <main class="band" data-node-id="fluid:band" data-node-name="Fluid band">
+    <div class="columns" data-node-id="fluid:columns" data-node-name="Two columns">
+      <section class="column" data-node-id="fluid:primary" data-node-name="Primary column"></section>
+      <aside class="column" data-node-id="fluid:secondary" data-node-name="Secondary column"></aside>
     </div>
   </main>
 </body>
diff --git a/php-transformer/tools/visual-parity/tests/smoke.mjs b/php-transformer/tools/visual-parity/tests/smoke.mjs
index 0810a3e2..55e46b42 100644
--- a/php-transformer/tools/visual-parity/tests/smoke.mjs
+++ b/php-transformer/tools/visual-parity/tests/smoke.mjs
@@ -66,11 +66,11 @@ await writeFile(domFixture, `<!doctype html><html><head><style>
     height: 24px;
   }
   .asset-bounds { width: 1px; height: 1px; background-image: url("https://example.test/${longAssetValue}"); }
-</style></head><body><main class="hero" data-figma-node-id="12:34" data-figma-node-name="Hero" data-source-node-type="FRAME" data-source-visual-width="120" data-source-visual-height="24">Hello world <img alt="" src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='2' height='3'%3E%3C/svg%3E"></main><section class="asset-bounds" data-figma-node-id="56:78" data-figma-node-name="Asset bounds"><img alt="" src="/loaded-image.svg">${assetDescendants}</section></body></html>`);
+</style></head><body><main class="hero" data-node-id="12:34" data-node-name="Hero" data-source-node-type="FRAME" data-source-visual-width="120" data-source-visual-height="24">Hello world <img alt="" src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='2' height='3'%3E%3C/svg%3E"></main><section class="asset-bounds" data-node-id="56:78" data-node-name="Asset bounds"><img alt="" src="/loaded-image.svg">${assetDescendants}</section></body></html>`);
 await writeFile(domFixtureGeneric, `<!doctype html><html><head><style>
   body { margin: 0; }
   .hero { color: rgb(12, 34, 56); font-size: 20px; width: 120px; height: 24px; }
-</style></head><body><main class="hero" data-node-id="n-1" data-node-name="Generic Hero">Hello generic</main></body></html>`);
+</style></head><body><main class="hero" data-custom-id="n-1" data-custom-name="Generic Hero">Hello generic</main></body></html>`);
 const server = createServer(async (request, response) => {
   if (request.url === '/dom-box.html') {
     response.writeHead(200, { 'content-type': 'text/html' });
@@ -116,7 +116,7 @@ try {
   assert(domReport.entrypoints[0].elements[0].source.node_type === 'FRAME', 'DOM provider preserves source node type');
   assert(domReport.entrypoints[0].elements[0].source.visual_dimensions.width === 120, 'DOM provider preserves source visual width');
   assert(domReport.entrypoints[0].elements[0].source.visual_dimensions.height === 24, 'DOM provider preserves source visual height');
-  assert(domReport.entrypoints[0].elements[0].selector === 'main[data-figma-node-id="12:34"]', 'DOM provider keys selector off default figma attribute');
+  assert(domReport.entrypoints[0].elements[0].selector === 'main[data-node-id="12:34"]', 'DOM provider keys selector off the format-neutral default attribute');
   assert(domReport.entrypoints[0].elements[0].text_sample === 'Hello world', 'DOM provider captures text sample');
   assert(domReport.entrypoints[0].elements[0].page_path === '/dom-box.html', 'DOM provider adds page path to elements');
   assert(domReport.entrypoints[0].elements[0].computed_style['font-size'] === '20px', 'DOM provider captures computed font size');
@@ -152,18 +152,18 @@ try {
     ...process.env,
     HOMEBOY_DOM_BOX_BASE_URL: `http://127.0.0.1:${address.port}`,
     HOMEBOY_DOM_BOX_PAGE_PATHS_JSON: JSON.stringify(['/dom-box-generic.html']),
-    HOMEBOY_DOM_BOX_NODE_ID_ATTR: 'data-node-id',
-    HOMEBOY_DOM_BOX_NODE_NAME_ATTR: 'data-node-name',
+    HOMEBOY_DOM_BOX_NODE_ID_ATTR: 'data-custom-id',
+    HOMEBOY_DOM_BOX_NODE_NAME_ATTR: 'data-custom-name',
   });
   assert(genericEnvReport.entrypoints[0].elements.length === 1, 'DOM provider enumerates by configured generic attribute (env)');
   assert(genericEnvReport.entrypoints[0].elements[0].node_id === 'n-1', 'DOM provider reads node id from configured generic attribute (env)');
   assert(genericEnvReport.entrypoints[0].elements[0].node_name === 'Generic Hero', 'DOM provider reads node name from configured generic attribute (env)');
-  assert(genericEnvReport.entrypoints[0].elements[0].selector === 'main[data-node-id="n-1"]', 'DOM provider keys selector off configured generic attribute (env)');
+  assert(genericEnvReport.entrypoints[0].elements[0].selector === 'main[data-custom-id="n-1"]', 'DOM provider keys selector off configured generic attribute (env)');
 
   const genericFlagReport = await runJson(process.execPath, [
     path.join(root, 'bin/dom-box-provider.mjs'),
-    '--node-id-attr=data-node-id',
-    '--node-name-attr=data-node-name',
+    '--node-id-attr=data-custom-id',
+    '--node-name-attr=data-custom-name',
   ], root, {
     ...process.env,
     HOMEBOY_DOM_BOX_BASE_URL: `http://127.0.0.1:${address.port}`,
@@ -171,7 +171,7 @@ try {
   });
   assert(genericFlagReport.entrypoints[0].elements[0].node_id === 'n-1', 'DOM provider reads node id from configured generic attribute (flag)');
   assert(genericFlagReport.entrypoints[0].elements[0].node_name === 'Generic Hero', 'DOM provider reads node name from configured generic attribute (flag)');
-  assert(genericFlagReport.entrypoints[0].elements[0].selector === 'main[data-node-id="n-1"]', 'DOM provider keys selector off configured generic attribute (flag)');
+  assert(genericFlagReport.entrypoints[0].elements[0].selector === 'main[data-custom-id="n-1"]', 'DOM provider keys selector off configured generic attribute (flag)');
 
   const fluidReport = await runJson(process.execPath, [path.join(root, 'bin/dom-box-provider.mjs')], root, {
     ...process.env,
diff --git a/php-transformer/tests/contract/production-acceptance-matrix.php b/tests/contract/production-acceptance-matrix.php
similarity index 99%
rename from php-transformer/tests/contract/production-acceptance-matrix.php
rename to tests/contract/production-acceptance-matrix.php
index f15dc156..0ebf27d9 100644
--- a/php-transformer/tests/contract/production-acceptance-matrix.php
+++ b/tests/contract/production-acceptance-matrix.php
@@ -1,11 +1,11 @@
 <?php
 declare(strict_types=1);
 
-require dirname(__DIR__, 2) . '/vendor/autoload.php';
+$root = dirname(__DIR__, 2);
+require $root . '/php-transformer/vendor/autoload.php';
 
 use Automattic\BlocksEngine\PhpTransformer\ArtifactCompiler\ArtifactCompiler;
 
-$root = dirname(__DIR__, 3);
 $temporary = sys_get_temp_dir() . '/blocks-engine-acceptance-' . bin2hex(random_bytes(4));
 mkdir($temporary . '/evidence', 0777, true);