diff --git a/CHANGELOG.md b/CHANGELOG.md
index 850854b..acec6d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,3 +25,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - fix(ui): add keyboard-resizable drawers with Escape handling and focus restoration.
 - fix: harden packaging, privacy, lifecycle, snapshot recovery, dump and toolbar security, and accelerate value hydration.
 - refactor: simplify strict value hydration, collector cleanup reporting, sensitive-key lookup, and toolbar message validation without changing public contracts.
+- test: enforce complete PHP line, method, and mutation coverage with exact HTML rendering assertions.
diff --git a/src/Capture/CapturePolicy.php b/src/Capture/CapturePolicy.php
index 8d51a01..06f76b2 100644
--- a/src/Capture/CapturePolicy.php
+++ b/src/Capture/CapturePolicy.php
@@ -60,7 +60,10 @@ public function isSensitiveKey(string $key): bool
      */
     public function redact(#[SensitiveParameter] array $value): array
     {
-        return SensitiveDataRedactor::redact($value, $this->sensitiveKeys);
+        return SensitiveDataRedactor::redact(
+            $value,
+            $this->sensitiveKeys,
+        );
     }
 
     /**
diff --git a/src/Collector/CollectorCoordinator.php b/src/Collector/CollectorCoordinator.php
index d68be60..9d430ff 100644
--- a/src/Collector/CollectorCoordinator.php
+++ b/src/Collector/CollectorCoordinator.php
@@ -51,12 +51,6 @@ public function __construct(iterable $collectors)
     /**
      * Captures every collector into one versioned request snapshot.
      *
-     * Usage example:
-     *
-     * ```php
-     * $snapshot = $coordinator->capture($summary);
-     * ```
-     *
      * @param RequestSummary $summary Captured request metadata.
      *
      * @return DebugSnapshot Captured request envelope.
@@ -78,18 +72,16 @@ public function capture(RequestSummary $summary): DebugSnapshot
             }
         }
 
-        return new DebugSnapshot($summary, $panels, $failures);
+        return new DebugSnapshot(
+            $summary,
+            $panels,
+            $failures,
+        );
     }
 
     /**
      * Returns the collector registered under the given stable ID.
      *
-     * Usage example:
-     *
-     * ```php
-     * $collector = $coordinator->collector('app.orders');
-     * ```
-     *
      * @param string $id Collector ID.
      *
      * @return CollectorInterface|null Registered collector, or `null` when the ID is unknown.
@@ -102,12 +94,6 @@ public function collector(string $id): CollectorInterface|null
     /**
      * Returns whether a collector is registered under the given stable ID.
      *
-     * Usage example:
-     *
-     * ```php
-     * $registered = $coordinator->hasCollector('app.orders');
-     * ```
-     *
      * @param string $id Collector ID.
      *
      * @return bool Whether the collector is registered.
@@ -157,20 +143,10 @@ public function run(callable $operation, callable|null $cleanupFailureHandler =
     /**
      * Stops every collector once and propagates the first shutdown error after cleanup completes.
      *
-     * Usage example:
-     *
-     * ```php
-     * $coordinator->shutdown();
-     * ```
-     *
      * @throws Throwable When a collector cannot shut down.
      */
     public function shutdown(): void
     {
-        if (!$this->started && $this->startedCollectors === []) {
-            return;
-        }
-
         $this->started = false;
 
         $failure = null;
@@ -193,12 +169,6 @@ public function shutdown(): void
     /**
      * Starts every registered collector once and rolls back affected collectors when startup fails.
      *
-     * Usage example:
-     *
-     * ```php
-     * $coordinator->startup();
-     * ```
-     *
      * @throws Throwable When a collector cannot start.
      */
     public function startup(): void
diff --git a/src/Collector/CollectorInterface.php b/src/Collector/CollectorInterface.php
index 868d2c3..5d66e9e 100644
--- a/src/Collector/CollectorInterface.php
+++ b/src/Collector/CollectorInterface.php
@@ -14,12 +14,6 @@ interface CollectorInterface
     /**
      * Captures the current request data as a typed snapshot.
      *
-     * Usage example:
-     *
-     * ```php
-     * $snapshot = $collector->capture();
-     * ```
-     *
      * @return PanelSnapshot|null Captured payload or `null` when the collector has no data.
      */
     public function capture(): PanelSnapshot|null;
@@ -27,35 +21,17 @@ public function capture(): PanelSnapshot|null;
     /**
      * Returns the stable ID used as the persisted panel key.
      *
-     * Usage example:
-     *
-     * ```php
-     * $id = $collector->id();
-     * ```
-     *
      * @return string Stable collector ID.
      */
     public function id(): string;
 
     /**
      * Stops collection and clears request-scoped state idempotently.
-     *
-     * Usage example:
-     *
-     * ```php
-     * $collector->shutdown();
-     * ```
      */
     public function shutdown(): void;
 
     /**
      * Starts collection for the current request.
-     *
-     * Usage example:
-     *
-     * ```php
-     * $collector->startup();
-     * ```
      */
     public function startup(): void;
 }
diff --git a/src/Data/FilterEngine.php b/src/Data/FilterEngine.php
index 5101b58..fda28ea 100644
--- a/src/Data/FilterEngine.php
+++ b/src/Data/FilterEngine.php
@@ -52,7 +52,7 @@ public function addCondition(string $attribute, mixed $rawValue, bool $partial =
             return;
         }
 
-        if (preg_match('/^\s*([<>])\s*(-?(?:\d+(?:\.\d+)?|\.\d+))\s*$/D', $value, $matches) === 1) {
+        if (preg_match('/^\s*([<>])\s*(-?(?:\d+(?:\.\d+)?|\.\d+))\s*$/', $value, $matches) === 1) {
             $this->conditions[] = [
                 'attribute' => $attribute,
                 'operator' => $matches[1],
@@ -126,8 +126,6 @@ private function matches(array|object $row): bool
                     return false;
                 }
 
-                $candidate = (float) $candidate;
-
                 $matched = match ($operator) {
                     '>' => $candidate > $expected,
                     '<' => $candidate < $expected,
diff --git a/src/Data/PageSize.php b/src/Data/PageSize.php
index ae5565c..952fd69 100644
--- a/src/Data/PageSize.php
+++ b/src/Data/PageSize.php
@@ -29,7 +29,13 @@ final class PageSize
     /**
      * Selector options in display order; the literal `all` disables pagination.
      */
-    public const array OPTIONS = ['10', '25', '50', '100', 'all'];
+    public const array OPTIONS = [
+        '10',
+        '25',
+        '50',
+        '100',
+        'all',
+    ];
 
     /**
      * Returns the `per-page` selector state, canonicalizing `all` and falling back to the default.
@@ -72,11 +78,6 @@ public static function resolve(string|null $raw, int $default = self::DEFAULT):
     /**
      * Renders the inline page-size selector shown in the grid summary header.
      *
-     * Usage example:
-     * ```php
-     * $html = \PHPForge\Debug\Data\PageSize::selectorHtml('50');
-     * ```
-     *
      * @param string $current Currently selected raw value (one of {@see OPTIONS} for a highlighted option).
      */
     public static function selectorHtml(string $current): string
diff --git a/src/Helper/Avatar.php b/src/Helper/Avatar.php
index 45592f9..5f19ec6 100644
--- a/src/Helper/Avatar.php
+++ b/src/Helper/Avatar.php
@@ -10,10 +10,6 @@
 
 /**
  * Derives stable, deterministic avatar colours from arbitrary identifying strings.
- *
- * Two debug-panel renderers (mail and queue) display a colored circle next to each item; both used to compute the hue
- * with the same `abs(crc32(strtolower(...))) % 360` formula. This helper centralises that derivation so the colour
- * stays consistent across renderers.
  */
 final class Avatar
 {
@@ -25,11 +21,6 @@ final class Avatar
     /**
      * Returns a stable hue (`0..359`) for the given seed, or {@see self::DEFAULT_HUE} when the seed is empty.
      *
-     * Usage example:
-     * ```php
-     * $hue = \PHPForge\Debug\Helper\Avatar::hueFor('Alice');
-     * ```
-     *
      * @param string $seed Identifying value used to derive the hue.
      *
      * @return int Hue in the `0..359` range.
diff --git a/src/Helper/CellMore.php b/src/Helper/CellMore.php
index 9a37e24..a21835a 100644
--- a/src/Helper/CellMore.php
+++ b/src/Helper/CellMore.php
@@ -12,10 +12,6 @@
 
 /**
  * Wraps long grid-cell content in a collapsible clamp with an expand/collapse pill toggle.
- *
- * The body collapses to a few lines through a CSS max-height clamp — the markup is never truncated server side, so
- * any cell payload (plain text, highlighted SQL, trace lists) stays intact. The `debug.min.js` `cell-more` delegation
- * flips the `is-open` state and swaps the toggle label.
  */
 final class CellMore
 {
@@ -37,11 +33,6 @@ final class CellMore
      * The decision reads the raw source rather than the rendered markup, so highlighting or trace lists never tip a
      * short value over the threshold.
      *
-     * Usage example:
-     * ```php
-     * \PHPForge\Debug\Helper\CellMore::clamp($highlightedSql, $row->query);
-     * ```
-     *
      * @param string $content Rendered cell HTML.
      * @param string $source Raw payload the content was rendered from.
      *
@@ -55,11 +46,6 @@ public static function clamp(string $content, string $source): string
     /**
      * Wraps the rendered cell content in the collapsible clamp container.
      *
-     * Usage example:
-     * ```php
-     * \PHPForge\Debug\Helper\CellMore::wrap($renderedCellHtml);
-     * ```
-     *
      * @param string $content Rendered cell HTML to clamp; emitted verbatim inside the body container.
      *
      * @return string Collapsible cell markup.
diff --git a/src/Helper/Coerce.php b/src/Helper/Coerce.php
index e00d284..5561cea 100644
--- a/src/Helper/Coerce.php
+++ b/src/Helper/Coerce.php
@@ -13,21 +13,12 @@
 
 /**
  * Narrows arbitrary mixed payloads into the typed scalars debug-panel renderers expect.
- *
- * Framework callbacks, logger entries, request parameters, and renderer rows remain mixed even though persisted
- * snapshots use strict JSON DTOs. This helper is limited to those external runtime boundaries; snapshot hydration is
- * handled by {@see \PHPForge\Debug\Storage\Payload} without scalar coercion.
  */
 final class Coerce
 {
     /**
      * Returns a numeric value as a float or the supplied default.
      *
-     * Usage example:
-     * ```php
-     * $duration = \PHPForge\Debug\Helper\Coerce::float($payload['duration'] ?? null, 0.0);
-     * ```
-     *
      * @param mixed $value Value to narrow.
      * @param float $default Value returned for non-numeric input.
      *
@@ -41,11 +32,6 @@ public static function float(mixed $value, float $default = 0.0): float
     /**
      * Returns the value as a float when it is numeric, `null` otherwise.
      *
-     * Usage example:
-     * ```php
-     * $duration = \PHPForge\Debug\Helper\Coerce::floatOrNull($payload['duration'] ?? null);
-     * ```
-     *
      * @param mixed $value Value to narrow.
      *
      * @return float|null Numeric value or `null`.
@@ -58,11 +44,6 @@ public static function floatOrNull(mixed $value): float|null
     /**
      * Returns a numeric value as an int or the supplied default.
      *
-     * Usage example:
-     * ```php
-     * $count = \PHPForge\Debug\Helper\Coerce::int($payload['count'] ?? null);
-     * ```
-     *
      * @param mixed $value Value to narrow.
      * @param int $default Value returned for non-numeric input.
      *
@@ -76,11 +57,6 @@ public static function int(mixed $value, int $default = 0): int
     /**
      * Returns the value as an int when it is an integer or numeric, `null` otherwise.
      *
-     * Usage example:
-     * ```php
-     * $statusCode = \PHPForge\Debug\Helper\Coerce::intOrNull($payload['statusCode'] ?? null);
-     * ```
-     *
      * @param mixed $value Value to narrow.
      *
      * @return int|null Numeric value or `null`.
@@ -93,11 +69,6 @@ public static function intOrNull(mixed $value): int|null
     /**
      * Returns a string value or the supplied default.
      *
-     * Usage example:
-     * ```php
-     * $category = \PHPForge\Debug\Helper\Coerce::string($payload['category'] ?? null, 'application');
-     * ```
-     *
      * @param mixed $value Value to narrow.
      * @param string $default Value returned for non-string input.
      *
@@ -114,11 +85,6 @@ public static function string(mixed $value, string $default = ''): string
      * Narrows a mixed/`array<array-key, mixed>` snapshot down to the `array<string, mixed>` shape downstream view-model
      * normalizers expect.
      *
-     * Usage example:
-     * ```php
-     * $data = \PHPForge\Debug\Helper\Coerce::stringKeyedArray(['name' => 'debug', 0 => 'ignored']);
-     * ```
-     *
      * @param array<array-key, mixed> $data Source array with arbitrary keys.
      *
      * @return array<string, mixed> Entries whose key was already a string, in original order.
@@ -139,11 +105,6 @@ public static function stringKeyedArray(array $data): array
     /**
      * Returns only the string entries of a raw list, preserving order.
      *
-     * Usage example:
-     * ```php
-     * $categories = \PHPForge\Debug\Helper\Coerce::stringList(['application', 42, 'database']);
-     * ```
-     *
      * @param mixed $values Raw list, typically a user-configured category list.
      *
      * @return list<string> String entries in original order, possibly empty.
@@ -168,11 +129,6 @@ public static function stringList(mixed $values): array
     /**
      * Returns the value as a string when it is scalar or {@see Stringable}, `null` otherwise.
      *
-     * Usage example:
-     * ```php
-     * $label = \PHPForge\Debug\Helper\Coerce::stringOrNull($payload['label'] ?? null);
-     * ```
-     *
      * @param mixed $value Value to narrow.
      *
      * @return string|null String representation or `null`.
@@ -190,13 +146,6 @@ public static function stringOrNull(mixed $value): string|null
      * Narrows a raw trace value (as captured by Yii's logger) into the `list<array<string, mixed>>` shape every panel
      * renderer consumes.
      *
-     * Each frame keeps only its string-keyed entries; non-array frames are dropped.
-     *
-     * Usage example:
-     * ```php
-     * $frames = \PHPForge\Debug\Helper\Coerce::traceFrames($payload['trace'] ?? null);
-     * ```
-     *
      * @param mixed $value Raw trace payload.
      *
      * @return list<array<string, mixed>> Trace frames normalized to string-keyed maps.
diff --git a/src/Helper/Disclosure.php b/src/Helper/Disclosure.php
index b43105f..eac20d1 100644
--- a/src/Helper/Disclosure.php
+++ b/src/Helper/Disclosure.php
@@ -10,10 +10,6 @@
 
 /**
  * Renders the shared collapsible section: a titled `<summary>` with an expand/collapse hint over a `<details>` body.
- *
- * Both wordings ship in the markup and CSS reveals the one matching the `open` state, so the affordance never invites
- * a click it cannot honour and no script is involved. The `<summary>` element already announces the state through
- * `aria-expanded`, so the hint stays out of the accessibility tree.
  */
 final class Disclosure
 {
@@ -23,11 +19,6 @@ final class Disclosure
      * Exposed on its own so sections that build their own `<summary>` (the phpinfo Overview blocks) still share one
      * wording and one behaviour.
      *
-     * Usage example:
-     * ```php
-     * $hint = \PHPForge\Debug\Helper\Disclosure::hint();
-     * ```
-     *
      * @return Span Expand/collapse hint element.
      */
     public static function hint(): Span
@@ -48,11 +39,6 @@ public static function hint(): Span
     /**
      * Renders a titled collapsible section.
      *
-     * Usage example:
-     * ```php
-     * $section = \PHPForge\Debug\Helper\Disclosure::render('Raw payload', $preBlock);
-     * ```
-     *
      * @param string $title Section heading shown in the summary.
      * @param string $body Rendered HTML revealed when the section expands.
      *
diff --git a/src/Helper/Dump.php b/src/Helper/Dump.php
index 30454a8..1f4d5d7 100644
--- a/src/Helper/Dump.php
+++ b/src/Helper/Dump.php
@@ -24,12 +24,6 @@ final class Dump
      * Renders a value as a display string: quoted strings, bare scalars, and 4-space-indented arrays without
      * trailing commas.
      *
-     * Usage example:
-     *
-     * ```php
-     * $text = \PHPForge\Debug\Helper\Dump::asString(['a' => 1]);
-     * ```
-     *
      * @param mixed $value JSON-safe value to render.
      * @param int $depth Maximum nesting level rendered before collapsing to `[...]`.
      *
@@ -44,12 +38,6 @@ public static function asString(mixed $value, int $depth = 10): string
      * Renders a value as a parsable PHP expression: `var_export()` scalars and short-syntax arrays with trailing
      * commas, omitting sequential integer keys.
      *
-     * Usage example:
-     *
-     * ```php
-     * $code = \PHPForge\Debug\Helper\Dump::export(['a', 'b']);
-     * ```
-     *
      * @param mixed $value JSON-safe value to render.
      *
      * @return string Parsable PHP expression.
diff --git a/src/Helper/EmptyState.php b/src/Helper/EmptyState.php
index 54f8fc5..c83d033 100644
--- a/src/Helper/EmptyState.php
+++ b/src/Helper/EmptyState.php
@@ -10,9 +10,6 @@
 
 /**
  * Renders the contextual empty-state card shown when a panel captured no data for the request.
- *
- * Every panel shares the same `Div.yii-debug-empty-state` container and `<h2>` headline; the caller supplies the
- * explanatory body elements (paragraphs, code snippets), keeping the copy local to each view.
  */
 final class EmptyState
 {
@@ -21,16 +18,6 @@ final class EmptyState
      *
      * Body values are trusted markup assembled by debug adapters; callers must encode untrusted data before passing it.
      *
-     * Usage example:
-     * ```php
-     * use UIAwesome\Html\Flow\P;
-     *
-     * \PHPForge\Debug\Helper\EmptyState::card(
-     *     'No variables dumped in this request',
-     *     P::tag()->content('To populate this view, dump values with Yii::debug().'),
-     * );
-     * ```
-     *
      * @param string $headline Card headline describing the empty capture.
      * @param string|Stringable ...$body Trusted explanatory body markup rendered after the headline.
      *
@@ -40,7 +27,10 @@ public static function card(string $headline, string|Stringable ...$body): strin
     {
         return Div::tag()
             ->class('yii-debug-empty-state')
-            ->html(H2::tag()->content($headline), ...$body)
+            ->html(
+                H2::tag()->content($headline),
+                ...$body,
+            )
             ->render();
     }
 }
diff --git a/src/Helper/Format.php b/src/Helper/Format.php
index 124444d..e9da7e8 100644
--- a/src/Helper/Format.php
+++ b/src/Helper/Format.php
@@ -17,11 +17,6 @@ final class Format
     /**
      * Returns a `N.NN MB` string for the given byte count, rounded to the requested precision.
      *
-     * Usage example:
-     * ```php
-     * $memory = \PHPForge\Debug\Helper\Format::bytesToMb(2_097_152);
-     * ```
-     *
      * @param float|int $bytes Byte count to format.
      * @param int $precision Number of decimal places.
      *
@@ -35,11 +30,6 @@ public static function bytesToMb(float|int $bytes, int $precision = 2): string
     /**
      * Returns a CSS percentage (`42%`, `33.333%`) with at most three decimals and trailing zeros trimmed.
      *
-     * Usage example:
-     * ```php
-     * $width = \PHPForge\Debug\Helper\Format::cssPercent(33.3333);
-     * ```
-     *
      * @param float $value Percentage value to format.
      *
      * @return string CSS percentage.
diff --git a/src/Helper/Fqcn.php b/src/Helper/Fqcn.php
index a24c0f5..3799bcb 100644
--- a/src/Helper/Fqcn.php
+++ b/src/Helper/Fqcn.php
@@ -11,9 +11,6 @@
 
 /**
  * Splits a fully-qualified class name into its short name and namespace prefix.
- *
- * Multiple renderers (asset, event, log, profile, queue) display the short class name next to a muted namespace prefix;
- * this helper keeps every view aligned on the same splitting rules and on the shared two-tone label markup.
  */
 final class Fqcn
 {
@@ -21,11 +18,6 @@ final class Fqcn
      * Returns the namespace prefix (everything before the last `\`, without trailing separator), or `''` when none is
      * present.
      *
-     * Usage example:
-     * ```php
-     * $namespace = \PHPForge\Debug\Helper\Fqcn::namespacePart('App\\Service\\Mailer');
-     * ```
-     *
      * @param string $fqcn Fully-qualified class name.
      *
      * @return string Namespace prefix or `''`.
@@ -47,14 +39,6 @@ public static function namespacePart(string $fqcn): string
      * values without a namespace render the bold segment only, and `''` collapses to an em dash. A `<wbr>` between
      * the two segments marks the namespace boundary as the preferred line-break opportunity.
      *
-     * Usage example:
-     * ```php
-     * \PHPForge\Debug\Helper\Fqcn::renderLabel('yii\db\Command::query');
-     * // <span title="yii\db\Command::query">
-     * //     <span class="yii-debug-muted">yii\db\</span><wbr><strong>Command::query</strong>
-     * // </span>
-     * ```
-     *
      * @param string $value Fully-qualified class name, `FQCN::method` pair, or plain category string.
      *
      * @return string Two-tone label markup or an em dash for an empty value.
@@ -84,11 +68,6 @@ public static function renderLabel(string $value): string
     /**
      * Returns the segment after the last `\` separator, or the full `$fqcn` when no separator is present.
      *
-     * Usage example:
-     * ```php
-     * $name = \PHPForge\Debug\Helper\Fqcn::shortName('App\\Service\\Mailer');
-     * ```
-     *
      * @param string $fqcn Fully-qualified class name.
      *
      * @return string Short class name.
diff --git a/src/Helper/Gauge.php b/src/Helper/Gauge.php
index 7bf0e99..a6268f4 100644
--- a/src/Helper/Gauge.php
+++ b/src/Helper/Gauge.php
@@ -11,22 +11,12 @@
 
 /**
  * Renders the inline micro-gauge rail behind numeric readouts (History Duration/Memory, Profiling Duration).
- *
- * The rail length is a percentage of the capture maximum, published as the `--yii-debug-gauge` custom property and
- * drawn entirely in CSS — no JavaScript involved.
  */
 final class Gauge
 {
     /**
      * Wraps a formatted readout in a micro-gauge scaled to `current / max`, clamped to `0%`..`100%`.
      *
-     * Returns the readout untouched when `max` is not positive (no scale to draw against).
-     *
-     * Usage example:
-     * ```php
-     * $gauge = \PHPForge\Debug\Helper\Gauge::render('125 ms', 0.5, 1.0);
-     * ```
-     *
      * @param string $value Pre-formatted readout text (for example `125 ms`).
      * @param float $current Row value in the same unit as `$max`.
      * @param float $max Capture maximum the rail is scaled against.
@@ -45,8 +35,12 @@ public static function render(string $value, float $current, float $max): string
             ->class('yii-debug-gauge')
             ->style(['--yii-debug-gauge' => Format::cssPercent($percent)])
             ->html(
-                Span::tag()->class('yii-debug-gauge-value')->content($value),
-                Span::tag()->class('yii-debug-gauge-bar')->addAttribute('aria-hidden', 'true'),
+                Span::tag()
+                    ->class('yii-debug-gauge-value')
+                    ->content($value),
+                Span::tag()
+                    ->class('yii-debug-gauge-bar')
+                    ->addAttribute('aria-hidden', 'true'),
             )
             ->render();
     }
diff --git a/src/Helper/Icon.php b/src/Helper/Icon.php
index 2f896d9..03fa777 100644
--- a/src/Helper/Icon.php
+++ b/src/Helper/Icon.php
@@ -12,9 +12,6 @@
 
 /**
  * Renders SVG icons bundled with the debug extension via {@see Svg::tag()}.
- *
- * Icons live in the framework-neutral core asset library and are looked up by name (without extension). Results are
- * cached in-memory for the request, so repeated lookups do not re-read the file or re-run sanitization.
  */
 final class Icon
 {
@@ -26,11 +23,6 @@ final class Icon
     /**
      * Returns the rendered SVG markup for the given icon name, or an empty string when the file does not exist.
      *
-     * Usage example:
-     * ```php
-     * $icon = \PHPForge\Debug\Helper\Icon::render('request');
-     * ```
-     *
      * @param string $name Icon basename without the `.svg` extension (for example, `chevron-down`).
      *
      * @return string Sanitized SVG markup, or `''` when the source file is missing.
@@ -51,6 +43,8 @@ public static function render(string $name): string
             return self::$cache[$name] = '';
         }
 
-        return self::$cache[$name] = Svg::tag()->filePath($path)->render();
+        return self::$cache[$name] = Svg::tag()
+            ->filePath($path)
+            ->render();
     }
 }
diff --git a/src/Helper/LogLevel.php b/src/Helper/LogLevel.php
index aced0dd..bed7ca8 100644
--- a/src/Helper/LogLevel.php
+++ b/src/Helper/LogLevel.php
@@ -41,12 +41,6 @@ final class LogLevel
     /**
      * Returns the lowercase display name of a level, matching the Yii logger naming.
      *
-     * Usage example:
-     *
-     * ```php
-     * $name = \PHPForge\Debug\Helper\LogLevel::name(\PHPForge\Debug\Helper\LogLevel::ERROR);
-     * ```
-     *
      * @param int $level Log-level wire value.
      *
      * @return string Display name; `unknown` for unrecognized values.
diff --git a/src/Helper/Text.php b/src/Helper/Text.php
index c7a533a..d65072e 100644
--- a/src/Helper/Text.php
+++ b/src/Helper/Text.php
@@ -17,22 +17,12 @@ final class Text
     /**
      * Converts a CamelCase name into a lowercase id with `-` word separators, matching the Yii inflector semantics.
      *
-     * Usage example:
-     *
-     * ```php
-     * $id = \PHPForge\Debug\Helper\Text::camel2id('AppAssetBundle');
-     * ```
-     *
      * @param string $name CamelCase name to convert.
      *
      * @return string Lowercase kebab-case id.
      */
     public static function camel2id(string $name): string
     {
-        if ($name === '') {
-            return '';
-        }
-
         $replaced = preg_replace('/(?<!\p{Lu})\p{Lu}/u', '-\0', $name) ?? $name;
 
         return mb_strtolower(trim(str_replace('_', '-', $replaced), '-'), 'UTF-8');
diff --git a/src/Helper/Vocabulary.php b/src/Helper/Vocabulary.php
index be148bc..a6af022 100644
--- a/src/Helper/Vocabulary.php
+++ b/src/Helper/Vocabulary.php
@@ -12,14 +12,8 @@
 final class Vocabulary
 {
     /**
-     * Returns the level suffix (`error`, `warning`, `info`, `trace`, `profile`, or `other`) for a
-     * {@see LogLevel} wire value. Profile begin/end markers share the `profile` hue.
-     *
-     * Usage example:
-     *
-     * ```php
-     * $level = \PHPForge\Debug\Helper\Vocabulary::logLevel(\PHPForge\Debug\Helper\LogLevel::WARNING);
-     * ```
+     * Returns the level suffix (`error`, `warning`, `info`, `trace`, `profile`, or `other`) for a {@see LogLevel} wire
+     * value. Profile begin/end markers share the `profile` hue.
      *
      * @param int $level Log-level wire value.
      *
@@ -39,11 +33,6 @@ public static function logLevel(int $level): string
     /**
      * Returns the verb suffix for an SQL statement type.
      *
-     * Usage example:
-     * ```php
-     * $verb = \PHPForge\Debug\Helper\Vocabulary::sqlVerb('SELECT');
-     * ```
-     *
      * @param string $type SQL statement type.
      *
      * @return string Semantic verb suffix.
@@ -62,11 +51,6 @@ public static function sqlVerb(string $type): string
     /**
      * Returns the status-class suffix for an HTTP status code.
      *
-     * Usage example:
-     * ```php
-     * $class = \PHPForge\Debug\Helper\Vocabulary::statusClass(404);
-     * ```
-     *
      * @param int $code HTTP status code.
      *
      * @return string Status-class suffix.
@@ -85,11 +69,6 @@ public static function statusClass(int $code): string
     /**
      * Returns the semantic verb suffix for an HTTP method.
      *
-     * Usage example:
-     * ```php
-     * $verb = \PHPForge\Debug\Helper\Vocabulary::verb('PATCH');
-     * ```
-     *
      * @param string $method HTTP method.
      *
      * @return string Semantic verb suffix.
diff --git a/src/Panel/Asset/AssetBundleView.php b/src/Panel/Asset/AssetBundleView.php
index 5475d07..7311859 100644
--- a/src/Panel/Asset/AssetBundleView.php
+++ b/src/Panel/Asset/AssetBundleView.php
@@ -6,9 +6,6 @@
 
 /**
  * Typed view-model for a single asset bundle rendered in the Asset Bundles detail view.
- *
- * Carries every value already normalized from the panel's mixed payload, so the consuming view iterates and reads
- * properties without further type narrowing.
  */
 final readonly class AssetBundleView
 {
diff --git a/src/Panel/Asset/AssetCardRenderer.php b/src/Panel/Asset/AssetCardRenderer.php
index c5efd2f..3be23ab 100644
--- a/src/Panel/Asset/AssetCardRenderer.php
+++ b/src/Panel/Asset/AssetCardRenderer.php
@@ -176,7 +176,9 @@ private static function renderFilesSection(AssetBundleView $bundle): Section
         return Section::tag()
             ->class('yii-debug-asset-section')
             ->html(
-                H3::tag()->class('yii-debug-asset-section-title')->content('Files'),
+                H3::tag()
+                    ->class('yii-debug-asset-section-title')
+                    ->content('Files'),
                 ...$fileLists,
             );
     }
diff --git a/src/Panel/Config/ApplicationConfig.php b/src/Panel/Config/ApplicationConfig.php
index ac1f421..ffd5669 100644
--- a/src/Panel/Config/ApplicationConfig.php
+++ b/src/Panel/Config/ApplicationConfig.php
@@ -6,9 +6,6 @@
 
 /**
  * Typed view-model for the application section of the Configuration panel.
- *
- * Mirrors the `application` slice of the configuration snapshot payload after every value has been narrowed
- * to its declared scalar type; the consuming view reads properties without further type checks.
  */
 final readonly class ApplicationConfig
 {
diff --git a/src/Panel/Config/ConfigCardRenderer.php b/src/Panel/Config/ConfigCardRenderer.php
index 466e5d7..3baf264 100644
--- a/src/Panel/Config/ConfigCardRenderer.php
+++ b/src/Panel/Config/ConfigCardRenderer.php
@@ -19,10 +19,6 @@
 
 /**
  * Renders the typed sections of the Configuration panel detail view.
- *
- * Stateless static helpers: every method takes the data it needs as arguments and returns the rendered HTML tree.
- * Concentrates the render logic (readout cards, extension pills, package list, php-info CTA) in one testable place,
- * keeping the detail view focused on page-level scaffolding.
  */
 final class ConfigCardRenderer
 {
@@ -230,10 +226,8 @@ private static function renderDlRow(string $term, string $value): Div
         return Div::tag()
             ->class('yii-debug-dl-row')
             ->html(
-                Dt::tag()
-                    ->content($term),
-                Dd::tag()
-                    ->content($value),
+                Dt::tag()->content($term),
+                Dd::tag()->content($value),
             );
     }
 
@@ -303,7 +297,8 @@ private static function renderReadoutCard(string $label, string $value, Span|str
             $metaWrap,
         ];
 
-        return Article::tag()->class('yii-debug-readout-card')
+        return Article::tag()
+            ->class('yii-debug-readout-card')
             ->html(...$children);
     }
 }
diff --git a/src/Panel/Db/DbExplainRenderer.php b/src/Panel/Db/DbExplainRenderer.php
index 5559ed6..5bf18a1 100644
--- a/src/Panel/Db/DbExplainRenderer.php
+++ b/src/Panel/Db/DbExplainRenderer.php
@@ -71,7 +71,9 @@ private static function renderPlan(string $query, array $results, string|null $e
             $headerCells = [];
 
             foreach ($columns as $column) {
-                $headerCells[] = Th::tag()->scope('col')->content((string) $column);
+                $headerCells[] = Th::tag()
+                    ->scope('col')
+                    ->content((string) $column);
             }
 
             $bodyRows = [];
@@ -82,8 +84,10 @@ private static function renderPlan(string $query, array $results, string|null $e
                 foreach ($columns as $column) {
                     $value = $row[$column] ?? null;
                     $cells[] = $value === null
-                        ? Td::tag()->html(Em::tag()->content('NULL'))
-                        : Td::tag()->content(is_scalar($value) ? (string) $value : Dump::export($value));
+                        ? Td::tag()
+                            ->html(Em::tag()->content('NULL'))
+                        : Td::tag()
+                            ->content(is_scalar($value) ? (string) $value : Dump::export($value));
                 }
 
                 $bodyRows[] = Tr::tag()->html(...$cells);
diff --git a/src/Panel/Db/DbQueryRenderer.php b/src/Panel/Db/DbQueryRenderer.php
index 7288190..ef2dd4c 100644
--- a/src/Panel/Db/DbQueryRenderer.php
+++ b/src/Panel/Db/DbQueryRenderer.php
@@ -30,12 +30,6 @@ final class DbQueryRenderer
      * accepted; metadata, session-control, and transaction-control statements either error or return noise, so they
      * are filtered out.
      *
-     * Usage example:
-     *
-     * ```php
-     * $supported = \PHPForge\Debug\Panel\Db\DbQueryRenderer::canBeExplained('SELECT');
-     * ```
-     *
      * @param string $type SQL command verb (case-insensitive).
      */
     public static function canBeExplained(string $type): bool
@@ -108,8 +102,7 @@ public static function renderQueryCell(
                                 ->content('Explain'),
                         )
                         ->role('button'),
-                    Div::tag()
-                        ->class('yii-debug-db-explain-text'),
+                    Div::tag()->class('yii-debug-db-explain-text'),
                 );
         }
 
diff --git a/src/Panel/Db/QueryRow.php b/src/Panel/Db/QueryRow.php
index 67bc587..854ce43 100644
--- a/src/Panel/Db/QueryRow.php
+++ b/src/Panel/Db/QueryRow.php
@@ -11,9 +11,6 @@
 
 /**
  * Typed view-model for a single database query row consumed by the queries grid.
- *
- * Resolved once at capture time from the logger timings, then persisted in that form: the SQL verb, the statement,
- * its duration, the backtrace and its hash, the duplicate count, and the reported row count.
  */
 final readonly class QueryRow implements PanelRow
 {
diff --git a/src/Panel/Dump/DumpCardRenderer.php b/src/Panel/Dump/DumpCardRenderer.php
index e38256e..3616388 100644
--- a/src/Panel/Dump/DumpCardRenderer.php
+++ b/src/Panel/Dump/DumpCardRenderer.php
@@ -25,16 +25,17 @@
 use function ltrim;
 use function preg_match;
 use function preg_replace;
+use function preg_split;
 use function sprintf;
 use function str_replace;
 use function strip_tags;
-use function strpos;
 use function strtolower;
-use function substr;
 
 use const ENT_HTML5;
 use const ENT_NOQUOTES;
 use const ENT_SUBSTITUTE;
+use const PREG_SPLIT_DELIM_CAPTURE;
+use const PREG_SPLIT_NO_EMPTY;
 
 /**
  * Renders the typed dump cells of the dumps grid for the Dump debug panel.
@@ -197,25 +198,13 @@ private static function sanitizeMessage(string $message): string
     {
         $escaped = htmlspecialchars($message, ENT_NOQUOTES | ENT_SUBSTITUTE | ENT_HTML5, 'UTF-8');
 
-        $parts = [];
-        $offset = 0;
-
-        while (($start = strpos($escaped, '&lt;', $offset)) !== false) {
-            $end = strpos($escaped, '&gt;', $start + 4);
-
-            if ($end === false) {
-                break;
-            }
-
-            if ($start > $offset) {
-                $parts[] = substr($escaped, $offset, $start - $offset);
-            }
-
-            $parts[] = substr($escaped, $start, $end + 4 - $start);
-            $offset = $end + 4;
-        }
-
-        $parts[] = substr($escaped, $offset);
+        $parts = preg_split(
+            '/(&lt;.*?&gt;)/s',
+            $escaped,
+            -1,
+            PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY,
+        );
+        $parts = $parts === false ? [] : $parts;
 
         /** @var list<array{tag: string, index: int, html: string}> $openTags */
         $openTags = [];
@@ -223,7 +212,7 @@ private static function sanitizeMessage(string $message): string
         foreach ($parts as $index => $part) {
             $opening = match (true) {
                 $part === '&lt;pre&gt;' => ['tag' => 'pre', 'html' => '<pre>'],
-                preg_match('/^&lt;(code|span) style="color: (#[0-9A-Fa-f]{6})"&gt;$/', $part, $match) === 1 => [
+                preg_match('/^&lt;(code|span) style="color: (#[0-9A-Fa-f]{6})"&gt;/', $part, $match) === 1 => [
                     'tag' => $match[1],
                     'html' => '<' . $match[1] . ' style="color: ' . $match[2] . '">',
                 ],
@@ -236,7 +225,7 @@ private static function sanitizeMessage(string $message): string
                 continue;
             }
 
-            if (preg_match('/^&lt;\/(pre|code|span)&gt;$/', $part, $match) !== 1 || $openTags === []) {
+            if (preg_match('/^&lt;\/(pre|code|span)&gt;/', $part, $match) !== 1 || $openTags === []) {
                 continue;
             }
 
diff --git a/src/Panel/Dump/DumpRow.php b/src/Panel/Dump/DumpRow.php
index bb013a0..1d47024 100644
--- a/src/Panel/Dump/DumpRow.php
+++ b/src/Panel/Dump/DumpRow.php
@@ -4,14 +4,12 @@
 
 namespace PHPForge\Debug\Panel\Dump;
 
-use PHPForge\Debug\Helper\Coerce;
 use PHPForge\Debug\Storage\{PanelRow, Payload};
 
 /**
  * Typed dump row narrowed once from the Yii logger tuple and persisted in that form.
  *
- * The payload is already rendered by the Dump collector `varDump()` pipeline at capture time, so the detail view
- * renders it without re-serializing.
+ * @phpstan-import-type LogMessage from \PHPForge\Debug\Panel\Log\LogSnapshot
  */
 final readonly class DumpRow implements PanelRow
 {
@@ -61,18 +59,18 @@ public static function fromArray(mixed $data, string $path): self
     }
 
     /**
-     * Narrows one raw Yii logger tuple into a typed row.
+     * Converts one canonical logger tuple into a typed row.
      *
-     * @param array<int|string, mixed> $message Logger tuple `[message, level, category, timestamp, traces]`.
+     * @param LogMessage $message Logger tuple `[message, level, category, timestamp, traces]`.
      */
     public static function fromLoggerTuple(array $message): self
     {
         return new self(
-            message: Coerce::stringOrNull($message[0] ?? null) ?? '',
-            level: Coerce::intOrNull($message[1] ?? null) ?? 0,
-            category: Coerce::stringOrNull($message[2] ?? null) ?? '',
-            time: (Coerce::floatOrNull($message[3] ?? null) ?? 0.0) * 1000,
-            trace: Coerce::traceFrames($message[4] ?? []),
+            message: $message[0],
+            level: $message[1],
+            category: $message[2],
+            time: $message[3] * 1000,
+            trace: $message[4],
         );
     }
 
diff --git a/src/Panel/Dump/DumpSnapshot.php b/src/Panel/Dump/DumpSnapshot.php
index 0dabffc..6aacd54 100644
--- a/src/Panel/Dump/DumpSnapshot.php
+++ b/src/Panel/Dump/DumpSnapshot.php
@@ -7,10 +7,11 @@
 use PHPForge\Debug\Storage\{PanelSnapshot, Payload};
 
 use function array_map;
-use function is_array;
 
 /**
  * Canonical Dump panel snapshot holding the captured rows in their typed form.
+ *
+ * @phpstan-import-type LogMessage from \PHPForge\Debug\Panel\Log\LogSnapshot
  */
 final readonly class DumpSnapshot implements PanelSnapshot
 {
@@ -20,18 +21,16 @@
     public function __construct(private array $entries) {}
 
     /**
-     * Narrows the raw logger tuples into typed rows.
+     * Converts canonical logger tuples into typed rows.
      *
-     * @param array<int|string, mixed> $messages Logger tuples in capture order; non-array entries are dropped.
+     * @param list<LogMessage> $messages Logger tuples in capture order.
      */
     public static function capture(array $messages): self
     {
         $entries = [];
 
         foreach ($messages as $message) {
-            if (is_array($message)) {
-                $entries[] = DumpRow::fromLoggerTuple($message);
-            }
+            $entries[] = DumpRow::fromLoggerTuple($message);
         }
 
         return new self($entries);
diff --git a/src/Panel/Log/LogCellRenderer.php b/src/Panel/Log/LogCellRenderer.php
index 8e8fc67..547d5f4 100644
--- a/src/Panel/Log/LogCellRenderer.php
+++ b/src/Panel/Log/LogCellRenderer.php
@@ -135,9 +135,11 @@ public static function renderTimeCell(LogRow $row): string
     public static function renderTimeSincePreviousCell(LogRow $row): string
     {
         $diffMsTotal = (int) ($row->time - $row->timeOfPrevious);
+
         $diffSecondsTotal = intdiv($diffMsTotal, 1000);
         $diffMinutesTotal = intdiv($diffSecondsTotal, 60);
         $diffHours = intdiv($diffMinutesTotal, 60);
+
         $diffMs = $diffMsTotal % 1000;
         $diffSeconds = $diffSecondsTotal % 60;
         $diffMinutes = $diffMinutesTotal % 60;
@@ -145,18 +147,18 @@ public static function renderTimeSincePreviousCell(LogRow $row): string
         $parts = [];
 
         if ($diffHours > 0) {
-            $parts[] = $diffHours . 'h';
+            $parts[] = "{$diffHours}h";
         }
 
         if ($diffMinutes > 0) {
-            $parts[] = $diffMinutes . 'm';
+            $parts[] = "{$diffMinutes}m";
         }
 
         if ($diffSeconds > 0) {
-            $parts[] = $diffSeconds . 's';
+            $parts[] = "{$diffSeconds}s";
         }
 
-        $parts[] = $diffMs . 'ms';
+        $parts[] = "{$diffMs}ms";
 
         return Div::tag()
             ->class('yii-debug-since-previous')
diff --git a/src/Panel/Log/LogRow.php b/src/Panel/Log/LogRow.php
index 7e7c149..d8ae98b 100644
--- a/src/Panel/Log/LogRow.php
+++ b/src/Panel/Log/LogRow.php
@@ -4,13 +4,12 @@
 
 namespace PHPForge\Debug\Panel\Log;
 
-use PHPForge\Debug\Helper\{Coerce, Dump};
 use PHPForge\Debug\Storage\{PanelRow, Payload};
 
-use function is_string;
-
 /**
  * Typed log row narrowed once from the Yii logger tuple and persisted in that form.
+ *
+ * @phpstan-import-type LogMessage from LogSnapshot
  */
 final readonly class LogRow implements PanelRow
 {
@@ -20,7 +19,7 @@ public function __construct(
          */
         public int $id,
         /**
-         * Display string for the log payload, exported via {@see Dump::export()} when the source was not a string.
+         * Display string for the log payload.
          */
         public string $message,
         /**
@@ -96,9 +95,9 @@ public static function fromArray(mixed $data, string $path): self
     }
 
     /**
-     * Narrows one raw Yii logger tuple into a typed row.
+     * Converts one canonical logger tuple into a typed row.
      *
-     * @param array<int|string, mixed> $message Logger tuple `[message, level, category, timestamp, traces, memory]`.
+     * @param LogMessage $message Logger tuple `[message, level, category, timestamp, traces, memory]`.
      * @param int $id One-based row id assigned in capture order.
      * @param float $timeOfPrevious Timestamp of the previous row in seconds; this row's own timestamp for the first.
      * @param int|null $idOfPrevious Row id preceding this one, or `null` for the first row.
@@ -111,22 +110,20 @@ public static function fromLoggerTuple(
         int|null $idOfPrevious,
         int|null $idOfNext,
     ): self {
-        $payload = $message[0] ?? null;
-
-        $timestamp = Coerce::floatOrNull($message[3] ?? null) ?? 0.0;
+        $timestamp = $message[3];
 
         return new self(
             id: $id,
-            message: is_string($payload) ? $payload : Dump::export($payload),
-            level: Coerce::intOrNull($message[1] ?? null) ?? 0,
-            category: Coerce::stringOrNull($message[2] ?? null) ?? '',
+            message: $message[0],
+            level: $message[1],
+            category: $message[2],
             time: $timestamp * 1000,
             timeOfPrevious: $timeOfPrevious * 1000,
             timeSincePrevious: $timestamp - $timeOfPrevious,
             idOfPrevious: $idOfPrevious,
             idOfNext: $idOfNext,
-            memory: Coerce::intOrNull($message[5] ?? null) ?? 0,
-            trace: Coerce::traceFrames($message[4] ?? []),
+            memory: $message[5] ?? 0,
+            trace: $message[4],
         );
     }
 
diff --git a/src/Panel/Log/LogSnapshot.php b/src/Panel/Log/LogSnapshot.php
index 502c420..d2aa77b 100644
--- a/src/Panel/Log/LogSnapshot.php
+++ b/src/Panel/Log/LogSnapshot.php
@@ -4,15 +4,23 @@
 
 namespace PHPForge\Debug\Panel\Log;
 
-use PHPForge\Debug\Helper\Coerce;
 use PHPForge\Debug\Storage\{PanelSnapshot, Payload};
 
 use function array_map;
 use function count;
-use function is_array;
 
 /**
  * Canonical Log panel snapshot holding the captured rows in their typed form.
+ *
+ * @phpstan-type TraceFrame array<string, mixed>
+ * @phpstan-type LogMessage array{
+ *   0: string,
+ *   1: int,
+ *   2: string,
+ *   3: float,
+ *   4: list<TraceFrame>,
+ *   5?: int
+ * }
  */
 final readonly class LogSnapshot implements PanelSnapshot
 {
@@ -22,31 +30,23 @@
     public function __construct(private array $entries) {}
 
     /**
-     * Narrows the raw logger tuples into typed rows, deriving the previous/next links and the inter-row deltas.
+     * Converts canonical logger tuples into typed rows, deriving the previous/next links and the inter-row deltas.
      *
-     * @param array<int|string, mixed> $messages Logger tuples in capture order; non-array entries are dropped.
+     * @param list<LogMessage> $messages Logger tuples in capture order.
      */
     public static function capture(array $messages): self
     {
-        $tuples = [];
-
-        foreach ($messages as $message) {
-            if (is_array($message)) {
-                $tuples[] = $message;
-            }
-        }
-
         $entries = [];
 
-        $count = count($tuples);
+        $count = count($messages);
 
         $previousId = null;
         $previousTime = null;
 
-        foreach ($tuples as $index => $message) {
+        foreach ($messages as $index => $message) {
             $id = $index + 1;
 
-            $timestamp = Coerce::floatOrNull($message[3] ?? null) ?? 0.0;
+            $timestamp = $message[3];
 
             $previousTime ??= $timestamp;
 
diff --git a/src/Panel/Mail/MailSnapshot.php b/src/Panel/Mail/MailSnapshot.php
index 99aef7d..f09dc64 100644
--- a/src/Panel/Mail/MailSnapshot.php
+++ b/src/Panel/Mail/MailSnapshot.php
@@ -56,7 +56,9 @@ public static function fromArray(mixed $data, string $path): self
             $entries[] = MailMessage::fromArray($entry, "{$path}.entries[{$index}]");
         }
 
-        return new self($entries);
+        return new self(
+            $entries,
+        );
     }
 
     /**
diff --git a/src/Panel/Profile/ProfileRow.php b/src/Panel/Profile/ProfileRow.php
index 067a5ae..71b9394 100644
--- a/src/Panel/Profile/ProfileRow.php
+++ b/src/Panel/Profile/ProfileRow.php
@@ -4,14 +4,14 @@
 
 namespace PHPForge\Debug\Panel\Profile;
 
-use PHPForge\Debug\Helper\Coerce;
 use PHPForge\Debug\Storage\{PanelRow, Payload};
 
-use function is_array;
 use function max;
 
 /**
  * Typed profile block derived once from the Yii logger timings and persisted in that form.
+ *
+ * @phpstan-import-type ProfileTiming from ProfileTimings
  */
 final readonly class ProfileRow implements PanelRow
 {
@@ -85,38 +85,23 @@ public static function fromArray(mixed $data, string $path): self
     }
 
     /**
-     * Narrows one timing returned by {@see ProfileTimings::calculate()} into a typed row.
+     * Converts one timing returned by {@see ProfileTimings::calculate()} into a typed row.
      *
-     * @param mixed $timing Raw timing entry.
+     * @param ProfileTiming $timing Profile timing entry.
      * @param int $seq Zero-based sequence index to assign.
-     *
-     * @return self|null Typed row, or `null` when the timing carries no usable timestamp or duration.
      */
-    public static function fromTiming(mixed $timing, int $seq): self|null
+    public static function fromTiming(array $timing, int $seq): self
     {
-        if (!is_array($timing)) {
-            return null;
-        }
-
-        $timestamp = Coerce::floatOrNull($timing['timestamp'] ?? null);
-        $duration = Coerce::floatOrNull($timing['duration'] ?? null);
-
-        if ($timestamp === null || $duration === null) {
-            return null;
-        }
-
-        $level = Coerce::intOrNull($timing['level'] ?? null);
-
         return new self(
-            timestamp: $timestamp * 1000,
-            duration: $duration * 1000,
-            category: Coerce::stringOrNull($timing['category'] ?? null) ?? '',
-            info: Coerce::stringOrNull($timing['info'] ?? null) ?? '',
-            level: $level === null ? 0 : max(0, $level),
+            timestamp: $timing['timestamp'] * 1000,
+            duration: $timing['duration'] * 1000,
+            category: $timing['category'],
+            info: $timing['info'],
+            level: $timing['level'],
             seq: $seq,
-            memory: Coerce::intOrNull($timing['memory'] ?? null) ?? 0,
-            memoryDiff: Coerce::intOrNull($timing['memoryDiff'] ?? null) ?? 0,
-            trace: Coerce::traceFrames($timing['trace'] ?? []),
+            memory: $timing['memory'],
+            memoryDiff: $timing['memoryDiff'],
+            trace: $timing['trace'],
         );
     }
 
diff --git a/src/Panel/Profile/ProfileTimings.php b/src/Panel/Profile/ProfileTimings.php
index bfdaf40..f337a95 100644
--- a/src/Panel/Profile/ProfileTimings.php
+++ b/src/Panel/Profile/ProfileTimings.php
@@ -4,16 +4,26 @@
 
 namespace PHPForge\Debug\Panel\Profile;
 
-use PHPForge\Debug\Helper\{Coerce, LogLevel};
+use PHPForge\Debug\Helper\LogLevel;
 
 use function array_pop;
 use function array_values;
-use function json_encode;
 use function ksort;
-use function md5;
 
 /**
  * Pairs profile begin/end log tuples into per-block timings.
+ *
+ * @phpstan-import-type LogMessage from \PHPForge\Debug\Panel\Log\LogSnapshot
+ * @phpstan-type ProfileTiming array{
+ *   info: string,
+ *   category: string,
+ *   timestamp: float,
+ *   trace: list<array<string, mixed>>,
+ *   level: int,
+ *   duration: float,
+ *   memory: int,
+ *   memoryDiff: int
+ * }
  */
 final class ProfileTimings
 {
@@ -23,68 +33,56 @@ final class ProfileTimings
      * Each tuple is `[token, level, category, timestamp, traces, memory]`; a begin marker is matched with the next end
      * marker carrying the same token, producing one timing entry ordered by the begin position.
      *
-     * Usage example:
+     * @param list<LogMessage> $messages Profile log tuples in capture order.
      *
-     * ```php
-     * $timings = \PHPForge\Debug\Panel\Profile\ProfileTimings::calculate($tuples);
-     * ```
-     *
-     * @param array<int, array<int|string, mixed>> $messages Profile log tuples in capture order.
-     *
-     * @return list<array{
-     *   info: mixed,
-     *   category: mixed,
-     *   timestamp: float,
-     *   trace: mixed,
-     *   level: int,
-     *   duration: float,
-     *   memory: int,
-     *   memoryDiff: int
-     * }> Timings ordered by their begin marker.
+     * @return list<ProfileTiming> Timings ordered by their begin marker.
      */
     public static function calculate(array $messages): array
     {
         $timings = [];
+        /** @var array<array-key, list<array{message: LogMessage, index: int, level: int}>> $stack */
         $stack = [];
         $nestedLevel = 0;
 
         foreach ($messages as $index => $log) {
-            $level = Coerce::intOrNull($log[1] ?? null);
-
-            $hash = md5(Coerce::string(json_encode($log[0] ?? null)));
+            $level = $log[1];
+            $tokenKey = $log[0];
 
             if ($level === LogLevel::PROFILE_BEGIN) {
-                $log['index'] = $index;
-                $log['level'] = $nestedLevel++;
-                $stack[$hash][] = $log;
+                $stack[$tokenKey][] = [
+                    'message' => $log,
+                    'index' => $index,
+                    'level' => $nestedLevel++,
+                ];
 
                 continue;
             }
 
-            if ($level !== LogLevel::PROFILE_END || ($stack[$hash] ?? []) === []) {
+            if ($level !== LogLevel::PROFILE_END || ($stack[$tokenKey] ?? []) === []) {
                 continue;
             }
 
-            $begin = array_pop($stack[$hash]);
+            $begin = array_pop($stack[$tokenKey]);
             --$nestedLevel;
 
-            if ($stack[$hash] === []) {
-                unset($stack[$hash]);
+            if ($stack[$tokenKey] === []) {
+                unset($stack[$tokenKey]);
             }
 
-            $beginIndex = Coerce::intOrNull($begin['index']) ?? 0;
-            $beginTimestamp = Coerce::floatOrNull($begin[3] ?? null) ?? 0.0;
-            $memory = Coerce::intOrNull($log[5] ?? null) ?? 0;
+            $beginMessage = $begin['message'];
+            $beginIndex = $begin['index'];
+            $beginTimestamp = $beginMessage[3];
+            $memory = $log[5] ?? 0;
 
             $timings[$beginIndex] = [
-                'info' => $begin[0] ?? null,
-                'category' => $begin[2] ?? null,
+                'info' => $beginMessage[0],
+                'category' => $beginMessage[2],
                 'timestamp' => $beginTimestamp,
-                'trace' => $begin[4] ?? [],
-                'level' => Coerce::intOrNull($begin['level']) ?? 0,
-                'duration' => (Coerce::floatOrNull($log[3] ?? null) ?? 0.0) - $beginTimestamp,
+                'trace' => $beginMessage[4],
+                'level' => $begin['level'],
+                'duration' => $log[3] - $beginTimestamp,
                 'memory' => $memory,
-                'memoryDiff' => $memory - (Coerce::intOrNull($begin[5] ?? null) ?? 0),
+                'memoryDiff' => $memory - ($beginMessage[5] ?? 0),
             ];
         }
 
diff --git a/src/Panel/Profile/ProfilingSnapshot.php b/src/Panel/Profile/ProfilingSnapshot.php
index a8e99ac..bdbe639 100644
--- a/src/Panel/Profile/ProfilingSnapshot.php
+++ b/src/Panel/Profile/ProfilingSnapshot.php
@@ -11,11 +11,14 @@
 use function array_map;
 use function count;
 use function is_array;
+use function max;
 use function usort;
 
 /**
  * Canonical profiling snapshot holding the request metrics, the resolved profile blocks, and the memory samples that
  * feed the timeline chart.
+ *
+ * @phpstan-import-type LogMessage from \PHPForge\Debug\Panel\Log\LogSnapshot
  */
 final readonly class ProfilingSnapshot implements PanelSnapshot
 {
@@ -33,39 +36,32 @@ public function __construct(
     /**
      * Resolves the logger's begin/end pairs into typed blocks and collects the per-message memory samples.
      *
-     * @param array<int|string, mixed> $messages Raw profile tuples in capture order.
+     * @param list<LogMessage> $messages Profile tuples in capture order.
      */
     public static function capture(int $memory, float $time, array $messages): self
     {
-        $tuples = [];
         $samples = [];
 
         foreach ($messages as $message) {
-            if (!is_array($message)) {
-                continue;
-            }
+            $sampleMemory = $message[5] ?? null;
 
-            $tuples[] = $message;
-
-            $sampleTime = Coerce::floatOrNull($message[3] ?? null);
-            $sampleMemory = Coerce::intOrNull($message[5] ?? null);
-
-            if ($sampleTime !== null && $sampleMemory !== null) {
-                $samples[] = new MemorySample($sampleTime * 1000, $sampleMemory);
+            if ($sampleMemory !== null) {
+                $samples[] = new MemorySample($message[3] * 1000, $sampleMemory);
             }
         }
 
         $entries = [];
 
-        foreach (ProfileTimings::calculate($tuples) as $timing) {
-            $row = ProfileRow::fromTiming($timing, count($entries));
-
-            if ($row !== null) {
-                $entries[] = $row;
-            }
+        foreach (ProfileTimings::calculate($messages) as $timing) {
+            $entries[] = ProfileRow::fromTiming($timing, count($entries));
         }
 
-        return new self($memory, $time, $entries, $samples);
+        return new self(
+            $memory,
+            $time,
+            $entries,
+            $samples,
+        );
     }
 
     /**
@@ -101,24 +97,22 @@ public static function captureCompleted(int $memory, float $time, array $message
             $endMemory = Coerce::intOrNull($context['endMemory'] ?? $context['memory'] ?? null);
             $memoryDiff = Coerce::intOrNull($context['memoryDiff'] ?? null)
                 ?? (($beginMemory !== null && $endMemory !== null) ? $endMemory - $beginMemory : 0);
-            $row = ProfileRow::fromTiming(
+            $level = Coerce::intOrNull($context['nestedLevel'] ?? null);
+
+            $entries[] = ProfileRow::fromTiming(
                 [
                     'timestamp' => $beginTime,
                     'duration' => $duration,
-                    'category' => $context['category'] ?? $message['category'] ?? '',
-                    'info' => $message['token'] ?? '',
-                    'level' => $context['nestedLevel'] ?? 0,
+                    'category' => Coerce::stringOrNull($context['category'] ?? $message['category'] ?? null) ?? '',
+                    'info' => Coerce::stringOrNull($message['token'] ?? null) ?? '',
+                    'level' => $level === null ? 0 : max(0, $level),
                     'memory' => $endMemory ?? 0,
                     'memoryDiff' => $memoryDiff,
-                    'trace' => $context['trace'] ?? [],
+                    'trace' => Coerce::traceFrames($context['trace'] ?? []),
                 ],
                 count($entries),
             );
 
-            if ($row !== null) {
-                $entries[] = $row;
-            }
-
             if ($beginMemory !== null) {
                 $samples[] = new MemorySample($beginTime * 1000, $beginMemory);
             }
diff --git a/src/Panel/Queue/QueueCardRenderer.php b/src/Panel/Queue/QueueCardRenderer.php
index fa493b0..a9e3774 100644
--- a/src/Panel/Queue/QueueCardRenderer.php
+++ b/src/Panel/Queue/QueueCardRenderer.php
@@ -128,8 +128,12 @@ private static function metaItem(string $label, string $value): Span
             ->class('yii-debug-queue-meta-item')
             ->addDataAttribute('field', $label)
             ->html(
-                Span::tag()->class('yii-debug-queue-meta-label')->content($label),
-                Span::tag()->class('yii-debug-queue-meta-value')->content($value),
+                Span::tag()
+                    ->class('yii-debug-queue-meta-label')
+                    ->content($label),
+                Span::tag()
+                    ->class('yii-debug-queue-meta-value')
+                    ->content($value),
             );
     }
 
@@ -206,8 +210,12 @@ private static function renderArrayOrObjectRow(string $key, array $value): Detai
         return Details::tag()
             ->class('yii-debug-queue-tree-collapse')
             ->html(
-                Summary::tag()->class('yii-debug-queue-tree-summary')->html($summaryHtml),
-                Div::tag()->class('yii-debug-queue-tree-children')->html(...$children),
+                Summary::tag()
+                    ->class('yii-debug-queue-tree-summary')
+                    ->html($summaryHtml),
+                Div::tag()
+                    ->class('yii-debug-queue-tree-children')
+                    ->html(...$children),
             );
     }
 
@@ -306,8 +314,12 @@ private static function renderHead(JobRecord $record): Header
             ->class('yii-debug-queue-card-head')
             ->html(
                 self::renderAvatar($record),
-                Div::tag()->class('yii-debug-queue-headline')->html(...$title),
-                Div::tag()->class('yii-debug-queue-meta-pills')->html(...$pills),
+                Div::tag()
+                    ->class('yii-debug-queue-headline')
+                    ->html(...$title),
+                Div::tag()
+                    ->class('yii-debug-queue-meta-pills')
+                    ->html(...$pills),
             );
     }
 
@@ -384,9 +396,15 @@ private static function renderScalarRow(string $key, string $type, string $value
         return Div::tag()
             ->class('yii-debug-queue-tree-row')
             ->html(
-                Span::tag()->class('yii-debug-queue-tree-key')->content($key),
-                Span::tag()->class('yii-debug-queue-tree-type')->content($type),
-                Span::tag()->class("yii-debug-queue-tree-value yii-debug-queue-tree-value-{$variant}")->content($value),
+                Span::tag()
+                    ->class('yii-debug-queue-tree-key')
+                    ->content($key),
+                Span::tag()
+                    ->class('yii-debug-queue-tree-type')
+                    ->content($type),
+                Span::tag()
+                    ->class("yii-debug-queue-tree-value yii-debug-queue-tree-value-{$variant}")
+                    ->content($value),
             );
     }
 
diff --git a/src/Panel/Request/RequestDataNormalizer.php b/src/Panel/Request/RequestDataNormalizer.php
index 219f8dd..e6ab2b8 100644
--- a/src/Panel/Request/RequestDataNormalizer.php
+++ b/src/Panel/Request/RequestDataNormalizer.php
@@ -64,9 +64,9 @@ private static function buildHero(array $data, RequestSummary|null $summary): Re
 
         $method = Coerce::stringOrNull($general['method'] ?? null)
             ?? ($summary === null ? '' : $summary->method);
+
         $url = $summary === null ? '' : $summary->url;
         $ip = $summary === null ? '' : $summary->ip;
-
         $capturedAt = $summary === null ? 0.0 : $summary->time;
 
         $time = $capturedAt > 0 ? date('H:i:s', (int) $capturedAt) : '';
@@ -241,6 +241,8 @@ private static function sessionSections(array $data): array
      */
     private static function statusVariant(int $statusCode): string
     {
-        return Vocabulary::statusClass($statusCode);
+        return Vocabulary::statusClass(
+            $statusCode,
+        );
     }
 }
diff --git a/src/Panel/Request/RequestSectionRenderer.php b/src/Panel/Request/RequestSectionRenderer.php
index b93c9db..c9effe4 100644
--- a/src/Panel/Request/RequestSectionRenderer.php
+++ b/src/Panel/Request/RequestSectionRenderer.php
@@ -128,7 +128,9 @@ private static function renderRow(int|string $name, mixed $value): Tr
 
         return Tr::tag()
             ->html(
-                Th::tag()->scope('row')->content((string) $name),
+                Th::tag()
+                    ->scope('row')
+                    ->content((string) $name),
                 Td::tag()->html($escaped),
             );
     }
@@ -178,12 +180,18 @@ private static function renderSectionTable(RequestSection $section): string
                     ->class('yii-debug-table yii-debug-table-mono')
                     ->style(['table-layout' => 'fixed'])
                     ->html(
-                        Thead::tag()->html(
-                            Tr::tag()->html(
-                                Th::tag()->scope('col')->content('Name'),
-                                Th::tag()->scope('col')->content('Value'),
+                        Thead::tag()
+                            ->html(
+                                Tr::tag()
+                                    ->html(
+                                        Th::tag()
+                                            ->scope('col')
+                                            ->content('Name'),
+                                        Th::tag()
+                                            ->scope('col')
+                                            ->content('Value'),
+                                    ),
                             ),
-                        ),
                         Tbody::tag()->html(...$rows),
                     ),
             )
diff --git a/src/Panel/Request/RequestSnapshot.php b/src/Panel/Request/RequestSnapshot.php
index 7344b10..1146737 100644
--- a/src/Panel/Request/RequestSnapshot.php
+++ b/src/Panel/Request/RequestSnapshot.php
@@ -47,7 +47,10 @@ public static function fromArray(mixed $data, string $path): self
         $values = $snapshotData->values();
 
         if (($values['statusCode'] ?? null) !== $statusCode) {
-            throw HydrationException::at("{$path}.statusCode", 'the status code stored in data');
+            throw HydrationException::at(
+                "{$path}.statusCode",
+                'the status code stored in data',
+            );
         }
 
         return new self($snapshotData, $statusCode);
diff --git a/src/Panel/Router/CurrentRouteLogRow.php b/src/Panel/Router/CurrentRouteLogRow.php
index e14be77..396d872 100644
--- a/src/Panel/Router/CurrentRouteLogRow.php
+++ b/src/Panel/Router/CurrentRouteLogRow.php
@@ -41,7 +41,11 @@ public static function fromArray(mixed $data, string $path): self
                 ],
             );
 
-        return new self($payload->string('rule'), $payload->string('parent'), $payload->bool('match'));
+        return new self(
+            $payload->string('rule'),
+            $payload->string('parent'),
+            $payload->bool('match'),
+        );
     }
 
     /**
@@ -62,7 +66,11 @@ public static function fromLogMessage(mixed $message): self|null
 
         $parent = $message['parent'] ?? null;
 
-        return new self($message['rule'], is_string($parent) ? $parent : '', $message['match']);
+        return new self(
+            $message['rule'],
+            is_string($parent) ? $parent : '',
+            $message['match'],
+        );
     }
 
     /**
diff --git a/src/Panel/Router/RouterSectionRenderer.php b/src/Panel/Router/RouterSectionRenderer.php
index 37f5414..aaf64dc 100644
--- a/src/Panel/Router/RouterSectionRenderer.php
+++ b/src/Panel/Router/RouterSectionRenderer.php
@@ -17,10 +17,6 @@
 
 /**
  * Renders the Router panel detail view from framework-neutral row models.
- *
- * Stateless static helpers: the public entry point takes the typed Current Route view plus pre-built rule and
- * action rows, and returns a fully-rendered HTML string. Concentrates tab-strip wiring, badge tinting, the three
- * section tables (Current Route logs / Router Rules / Action Routes), and the callout block in one testable place.
  */
 final class RouterSectionRenderer
 {
@@ -28,11 +24,6 @@ final class RouterSectionRenderer
      * Renders the entire Router panel detail: the router-wide flags strip, the tab strip (Current Route / Router
      * Rules / Action Routes), and the per-tab content panels.
      *
-     * Usage example:
-     * ```php
-     * $html = \PHPForge\Debug\Panel\Router\RouterSectionRenderer::renderTabs($current, $rules, $actions, $badges);
-     * ```
-     *
      * @param RouterCurrentView $current Current-route resolver view.
      * @param list<RouterRuleRow> $ruleRows Router rules in display order.
      * @param list<ActionRouteRow> $actionRows Discovered action routes in display order.
@@ -91,13 +82,24 @@ private static function renderActionRoutesPanel(array $actionRows): string
                     ->html(
                         Thead::tag()
                             ->html(
-                                Tr::tag()->html(
-                                    Th::tag()->scope('col')->content('#'),
-                                    Th::tag()->scope('col')->content('Action'),
-                                    Th::tag()->scope('col')->content('Route'),
-                                    Th::tag()->scope('col')->content('First Matching Rule'),
-                                    Th::tag()->scope('col')->content('Rules Tested'),
-                                ),
+                                Tr::tag()
+                                    ->html(
+                                        Th::tag()
+                                            ->scope('col')
+                                            ->content('#'),
+                                        Th::tag()
+                                            ->scope('col')
+                                            ->content('Action'),
+                                        Th::tag()
+                                            ->scope('col')
+                                            ->content('Route'),
+                                        Th::tag()
+                                            ->scope('col')
+                                            ->content('First Matching Rule'),
+                                        Th::tag()
+                                            ->scope('col')
+                                            ->content('Rules Tested'),
+                                    ),
                             ),
                         Tbody::tag()->html(...$rows),
                     ),
@@ -226,11 +228,18 @@ private static function renderLogsTable(RouterCurrentView $current): string
                     ->html(
                         Thead::tag()
                             ->html(
-                                Tr::tag()->html(
-                                    Th::tag()->scope('col')->content('#'),
-                                    Th::tag()->scope('col')->content('Rule'),
-                                    Th::tag()->scope('col')->content('Parent'),
-                                ),
+                                Tr::tag()
+                                    ->html(
+                                        Th::tag()
+                                            ->scope('col')
+                                            ->content('#'),
+                                        Th::tag()
+                                            ->scope('col')
+                                            ->content('Rule'),
+                                        Th::tag()
+                                            ->scope('col')
+                                            ->content('Parent'),
+                                    ),
                             ),
                         Tbody::tag()->html(...$rows),
                     ),
@@ -274,15 +283,30 @@ private static function renderRouterRulesPanel(array $ruleRows): string
                     ->html(
                         Thead::tag()
                             ->html(
-                                Tr::tag()->html(
-                                    Th::tag()->scope('col')->content('#'),
-                                    Th::tag()->scope('col')->content('Rule'),
-                                    Th::tag()->scope('col')->content('Target'),
-                                    Th::tag()->scope('col')->content('Verb'),
-                                    Th::tag()->scope('col')->content('Suffix'),
-                                    Th::tag()->scope('col')->content('Mode'),
-                                    Th::tag()->scope('col')->content('Type'),
-                                ),
+                                Tr::tag()
+                                    ->html(
+                                        Th::tag()
+                                            ->scope('col')
+                                            ->content('#'),
+                                        Th::tag()
+                                            ->scope('col')
+                                            ->content('Rule'),
+                                        Th::tag()
+                                            ->scope('col')
+                                            ->content('Target'),
+                                        Th::tag()
+                                            ->scope('col')
+                                            ->content('Verb'),
+                                        Th::tag()
+                                            ->scope('col')
+                                            ->content('Suffix'),
+                                        Th::tag()
+                                            ->scope('col')
+                                            ->content('Mode'),
+                                        Th::tag()
+                                            ->scope('col')
+                                            ->content('Type'),
+                                    ),
                             ),
                         Tbody::tag()->html(...$rows),
                     ),
@@ -305,17 +329,13 @@ private static function renderRouteSummary(RouterCurrentView $current): string
         $items = [];
 
         if ($current->route !== '') {
-            $items[] = Dt::tag()
-                ->content('Resolved route');
-            $items[] = Dd::tag()
-                ->html(Code::tag()->content($current->route));
+            $items[] = Dt::tag()->content('Resolved route');
+            $items[] = Dd::tag()->html(Code::tag()->content($current->route));
         }
 
         if ($current->action !== '') {
-            $items[] = Dt::tag()
-                ->content('Dispatched action');
-            $items[] = Dd::tag()
-                ->html(Code::tag()->content($current->action));
+            $items[] = Dt::tag()->content('Dispatched action');
+            $items[] = Dd::tag()->html(Code::tag()->content($current->action));
         }
 
         return Dl::tag()
diff --git a/src/Panel/Router/RouterSnapshot.php b/src/Panel/Router/RouterSnapshot.php
index 403546e..e858711 100644
--- a/src/Panel/Router/RouterSnapshot.php
+++ b/src/Panel/Router/RouterSnapshot.php
@@ -57,7 +57,12 @@ public static function capture(string|null $action, array $messages, string $rou
             $last = $row;
         }
 
-        return new self($action, $route, $message, $entries);
+        return new self(
+            $action,
+            $route,
+            $message,
+            $entries,
+        );
     }
 
     /**
diff --git a/src/Panel/Timeline/TimelineGeometry.php b/src/Panel/Timeline/TimelineGeometry.php
index 467eaa2..61146c8 100644
--- a/src/Panel/Timeline/TimelineGeometry.php
+++ b/src/Panel/Timeline/TimelineGeometry.php
@@ -43,12 +43,11 @@ public static function rulers(float $duration, int $line = 6): array
         $ticks = [0 => 0.0];
         $limit = $duration - $step / 4;
 
-        if ($step > $limit) {
-            return $ticks;
-        }
+        $tickCount = (int) floor($limit / $step);
+        $millisecondsList = $tickCount > 0 ? range($step, $tickCount * $step, $step) : [];
 
-        foreach (range($step, $limit, $step) as $milliseconds) {
-            $ticks[(int) $milliseconds] = $milliseconds / $duration * 100;
+        foreach ($millisecondsList as $milliseconds) {
+            $ticks[$milliseconds] = $milliseconds / $duration * 100;
         }
 
         return $ticks;
diff --git a/src/Panel/Timeline/TimelineMemoryRenderer.php b/src/Panel/Timeline/TimelineMemoryRenderer.php
index ab86cfa..856df5c 100644
--- a/src/Panel/Timeline/TimelineMemoryRenderer.php
+++ b/src/Panel/Timeline/TimelineMemoryRenderer.php
@@ -55,16 +55,17 @@ public static function render(
             ->height($height)
             ->html(
                 Defs::tag()->html(self::gradient()),
-                G::tag()->html(
-                    Polygon::tag()
-                        ->points(self::polygonPoints($points, $width, $height))
-                        ->fill('url(#yii-debug-tl-memory-gradient)'),
-                    Polyline::tag()
-                        ->points(self::polylinePoints($points, $width, $height))
-                        ->fill('none')
-                        ->stroke('currentColor')
-                        ->strokeWidth('1.5'),
-                ),
+                G::tag()
+                    ->html(
+                        Polygon::tag()
+                            ->points(self::polygonPoints($points, $width, $height))
+                            ->fill('url(#yii-debug-tl-memory-gradient)'),
+                        Polyline::tag()
+                            ->points(self::polylinePoints($points, $width, $height))
+                            ->fill('none')
+                            ->stroke('currentColor')
+                            ->strokeWidth('1.5'),
+                    ),
             )
             ->preserveAspectRatio('none')
             ->viewBox("0 0 {$width} {$height}")
@@ -107,7 +108,7 @@ private static function polygonPoints(array $points, int $width, int $height): s
     {
         $rendered = "0 {$height}";
 
-        $lastY = (float) $height;
+        $lastY = $height;
 
         foreach ($points as [$x, $y]) {
             $rendered .= ' ' . self::number($x) . ' ' . self::number($y);
@@ -126,11 +127,10 @@ private static function polylinePoints(array $points, int $width, int $height):
     {
         $rendered = "0 {$height}";
 
-        $lastY = (float) $height;
+        $lastY = $height;
 
         foreach ($points as [$x, $y]) {
             $rendered .= ' ' . self::number($x) . ' ' . self::number($y);
-
             $lastY = $y;
         }
 
diff --git a/src/Panel/Timeline/TimelineRenderer.php b/src/Panel/Timeline/TimelineRenderer.php
index cd75eb0..2950797 100644
--- a/src/Panel/Timeline/TimelineRenderer.php
+++ b/src/Panel/Timeline/TimelineRenderer.php
@@ -13,6 +13,7 @@
 use UIAwesome\Html\Sectioning\Section;
 
 use function count;
+use function in_array;
 use function number_format;
 use function rtrim;
 use function sprintf;
@@ -84,8 +85,7 @@ public static function renderEmptyHint(bool $hasRows, string $profilingUrl): str
                     ->class('yii-debug-tl-hint-body')
                     ->html(
                         'The timeline is most useful for requests that take hundreds of milliseconds, where you can ',
-                        Em::tag()
-                            ->content('see'),
+                        Em::tag()->content('see'),
                         ' which operations dominate. For quick requests the ',
                         A::tag()
                             ->href($profilingUrl)
@@ -162,8 +162,7 @@ public static function renderSummary(float $duration, int $memory, int $spanCoun
             ->html(
                 Span::tag()
                     ->html(
-                        Strong::tag()
-                            ->content(number_format($duration)),
+                        Strong::tag()->content(number_format($duration)),
                         ' ms total',
                     ),
                 Span::tag()
@@ -171,10 +170,7 @@ public static function renderSummary(float $duration, int $memory, int $spanCoun
                     ->content('·'),
                 Span::tag()
                     ->html(
-                        Strong::tag()
-                            ->content(
-                                Format::bytesToMb($memory)
-                            ),
+                        Strong::tag()->content(Format::bytesToMb($memory)),
                         ' peak memory',
                     ),
                 Span::tag()
@@ -182,10 +178,7 @@ public static function renderSummary(float $duration, int $memory, int $spanCoun
                     ->content('·'),
                 Span::tag()
                     ->html(
-                        Strong::tag()
-                    ->content(
-                        (string) $spanCount
-                    ),
+                        Strong::tag()->content((string) $spanCount),
                         ' spans',
                     ),
             )
@@ -230,7 +223,9 @@ private static function renderLegend(array $rows): array
         $present = [];
 
         foreach ($rows as $row) {
-            $present[$row->variant] = true;
+            if (!in_array($row->variant, $present, true)) {
+                $present[] = $row->variant;
+            }
         }
 
         if (count($present) < 2) {
@@ -240,7 +235,7 @@ private static function renderLegend(array $rows): array
         $items = [];
 
         foreach (self::LEGEND_LABELS as $variant => $label) {
-            if (!isset($present[$variant])) {
+            if (!in_array($variant, $present, true)) {
                 continue;
             }
 
@@ -299,10 +294,12 @@ private static function renderRow(TimelineSpanRow $row): Div
                     ->html(
                         Div::tag()
                             ->class('yii-debug-tl-bar')
-                            ->style([
-                                'left' => $row->cssLeft . '%',
-                                'width' => $row->cssWidth . '%',
-                            ])
+                            ->style(
+                                [
+                                    'left' => $row->cssLeft . '%',
+                                    'width' => $row->cssWidth . '%',
+                                ],
+                            )
                             ->html(
                                 Span::tag()
                                     ->class('yii-debug-tl-bar-duration')
diff --git a/src/Panel/User/UserIdentityRenderer.php b/src/Panel/User/UserIdentityRenderer.php
index b45653e..d5e3c06 100644
--- a/src/Panel/User/UserIdentityRenderer.php
+++ b/src/Panel/User/UserIdentityRenderer.php
@@ -116,8 +116,7 @@ private static function renderSection(UserIdentitySection $section): Article
                             ->addAttribute('aria-hidden', 'true')
                             ->class('yii-debug-user-section-icon')
                             ->html($section->icon),
-                        Span::tag()
-                            ->content($section->label),
+                        Span::tag()->content($section->label),
                     ),
                 Dl::tag()->html(...$rows),
             );
@@ -140,9 +139,15 @@ private static function renderValue(UserAttribute $attribute): Span|Button
                 ->addDataAttribute('yii-debug-reveal', true)
                 ->class('yii-debug-user-reveal')
                 ->html(
-                    Span::tag()->class('yii-debug-user-mask')->content('••••••••••••'),
-                    Span::tag()->class('yii-debug-user-real')->content($attribute->displayValue),
-                    Span::tag()->class('yii-debug-user-reveal-cta')->addAttribute('aria-hidden', 'true'),
+                    Span::tag()
+                        ->class('yii-debug-user-mask')
+                        ->content('••••••••••••'),
+                    Span::tag()
+                        ->class('yii-debug-user-real')
+                        ->content($attribute->displayValue),
+                    Span::tag()
+                        ->class('yii-debug-user-reveal-cta')
+                        ->addAttribute('aria-hidden', 'true'),
                 )
                 ->type('button');
         }
@@ -152,8 +157,12 @@ private static function renderValue(UserAttribute $attribute): Span|Button
                 ->class('yii-debug-user-time')
                 ->title($attribute->displayValue)
                 ->html(
-                    Span::tag()->class('yii-debug-user-time-rel')->content($attribute->timestampRel),
-                    Span::tag()->class('yii-debug-user-time-abs')->content($attribute->timestampAbs),
+                    Span::tag()
+                        ->class('yii-debug-user-time-rel')
+                        ->content($attribute->timestampRel),
+                    Span::tag()
+                        ->class('yii-debug-user-time-abs')
+                        ->content($attribute->timestampAbs),
                 );
         }
 
diff --git a/src/Panel/User/UserRbacRenderer.php b/src/Panel/User/UserRbacRenderer.php
index 81430dc..4b96945 100644
--- a/src/Panel/User/UserRbacRenderer.php
+++ b/src/Panel/User/UserRbacRenderer.php
@@ -6,6 +6,8 @@
 
 use UIAwesome\Html\Heading\H2;
 
+use function implode;
+
 /**
  * Composes the shared Roles and Permissions section around adapter-owned grid markup.
  */
@@ -22,20 +24,20 @@ final class UserRbacRenderer
      */
     public static function render(string|null $rolesGrid, string|null $permissionsGrid): string
     {
-        $html = '';
+        $sections = [];
 
         if ($rolesGrid !== null) {
-            $html .= H2::tag()
+            $sections[] = H2::tag()
                 ->content('Roles')
                 ->render() . $rolesGrid;
         }
 
         if ($permissionsGrid !== null) {
-            $html .= H2::tag()
+            $sections[] = H2::tag()
                 ->content('Permissions')
                 ->render() . $permissionsGrid;
         }
 
-        return $html;
+        return implode('', $sections);
     }
 }
diff --git a/src/Panel/User/UserRbacRow.php b/src/Panel/User/UserRbacRow.php
index fcb2961..07bc009 100644
--- a/src/Panel/User/UserRbacRow.php
+++ b/src/Panel/User/UserRbacRow.php
@@ -9,13 +9,6 @@
 
 /**
  * Represents one RBAC item row (role or permission) in the User panel detail view.
- *
- * Usage example:
- *
- * ```php
- * $row = \PHPForge\Debug\Panel\User\UserRbacRow::fromArray($rawItem);
- * echo $row->name;
- * ```
  */
 final readonly class UserRbacRow
 {
@@ -39,19 +32,6 @@ public function __construct(
     /**
      * Builds a row from the normalized array shape produced by RBAC adapters.
      *
-     * Usage example:
-     *
-     * ```php
-     * $row = \PHPForge\Debug\Panel\User\UserRbacRow::fromArray([
-     *     'name' => 'admin',
-     *     'description' => 'Administrator',
-     *     'ruleName' => '',
-     *     'data' => '',
-     *     'createdAt' => 1700000000,
-     *     'updatedAt' => 1700000001,
-     * ]);
-     * ```
-     *
      * @param array<array-key, mixed> $row Associative array with keys `name`, `description`, `ruleName`, `data`,
      * `createdAt`, and `updatedAt`.
      */
diff --git a/src/PhpInfo/PhpInfoDataNormalizer.php b/src/PhpInfo/PhpInfoDataNormalizer.php
index 851fc18..b5e3508 100644
--- a/src/PhpInfo/PhpInfoDataNormalizer.php
+++ b/src/PhpInfo/PhpInfoDataNormalizer.php
@@ -113,12 +113,6 @@ final class PhpInfoDataNormalizer
     /**
      * Captures the {@see phpinfo()} report of the current process and narrows it into the typed {@see PhpInfoView}.
      *
-     * Usage example:
-     *
-     * ```php
-     * $view = \PHPForge\Debug\PhpInfo\PhpInfoDataNormalizer::capture();
-     * ```
-     *
      * @return PhpInfoView Typed view-model for the running PHP process.
      */
     public static function capture(): PhpInfoView
@@ -420,7 +414,12 @@ private static function buildTile(string $label, string $value, string $home): P
             );
         }
 
-        return new PhpInfoTile(label: $label, displayValue: $value, rawValue: $value, kind: PhpInfoTile::KIND_TEXT);
+        return new PhpInfoTile(
+            label: $label,
+            displayValue: $value,
+            rawValue: $value,
+            kind: PhpInfoTile::KIND_TEXT,
+        );
     }
 
     /**
@@ -584,7 +583,11 @@ private static function extractCompactModule(
             return null;
         }
 
-        return new PhpInfoCompactModule(title: $title, slug: $slug, tiles: $tiles);
+        return new PhpInfoCompactModule(
+            title: $title,
+            slug: $slug,
+            tiles: $tiles,
+        );
     }
 
     /**
diff --git a/src/PhpInfo/PhpInfoModuleGroup.php b/src/PhpInfo/PhpInfoModuleGroup.php
index dc5d073..32d28a3 100644
--- a/src/PhpInfo/PhpInfoModuleGroup.php
+++ b/src/PhpInfo/PhpInfoModuleGroup.php
@@ -11,15 +11,6 @@
 
 /**
  * Groups {@see phpinfo()} modules by the job they perform.
- *
- * Drives the TOC sidebar layout, the "Loaded extensions" buckets, and the extension/non-extension split that keeps
- * PHP Variables, PHP Credits, and the other reporting blocks out of the extension list.
- *
- * Usage example:
- * ```php
- * \PHPForge\Debug\PhpInfo\PhpInfoModuleGroup::resolve('pdo_mysql');    // 'Database'
- * \PHPForge\Debug\PhpInfo\PhpInfoModuleGroup::isExtension('PHP License'); // false
- * ```
  */
 final class PhpInfoModuleGroup
 {
diff --git a/src/PhpInfo/PhpInfoRenderer.php b/src/PhpInfo/PhpInfoRenderer.php
index f957db4..c10509d 100644
--- a/src/PhpInfo/PhpInfoRenderer.php
+++ b/src/PhpInfo/PhpInfoRenderer.php
@@ -21,11 +21,6 @@
 
 /**
  * Renders the phpinfo page.
- *
- * Stateless static helpers: the public entry point takes a typed {@see PhpInfoView} and emits the shell (TOC sidebar
- * + main column with the search input, the Overview hero, the Configure Command details disclosure, and the modules
- * HTML). Per-section / per-tile rendering branches live in private helpers, so the view template collapses to a single
- * `render()` call.
  */
 final class PhpInfoRenderer
 {
diff --git a/src/Storage/ArrayPayloadSnapshot.php b/src/Storage/ArrayPayloadSnapshot.php
index 6d5f972..a5ace4e 100644
--- a/src/Storage/ArrayPayloadSnapshot.php
+++ b/src/Storage/ArrayPayloadSnapshot.php
@@ -7,9 +7,6 @@
 /**
  * Provides the capture/hydrate/serialize cycle for panels whose payload stays genuinely dynamic (application
  * configuration, dumped values, and user-configured request globals).
- *
- * The using class returns the JSON key its payload is persisted under from {@see payloadKey()}, and exposes the payload
- * through a domain-named accessor delegating to {@see values()}.
  */
 trait ArrayPayloadSnapshot
 {
@@ -23,20 +20,6 @@ final public function __construct(private readonly DebugArray $payload) {}
     /**
      * Captures arbitrary array values in a JSON-safe snapshot.
      *
-     * Usage example:
-     *
-     * ```php
-     * $prototype = new class(\PHPForge\Debug\Storage\DebugArray::capture([])) {
-     *     use \PHPForge\Debug\Storage\ArrayPayloadSnapshot;
-     *
-     *     protected static function payloadKey(): string
-     *     {
-     *         return 'data';
-     *     }
-     * };
-     * $snapshot = $prototype::capture(['enabled' => true]);
-     * ```
-     *
      * @param array<array-key, mixed> $values Raw payload captured for the request.
      *
      * @return self Snapshot containing tagged debug values.
@@ -51,21 +34,6 @@ public static function capture(array $values): self
     /**
      * Hydrates a dynamic payload from decoded JSON data.
      *
-     * Usage example:
-     *
-     * ```php
-     * $prototype = new class(\PHPForge\Debug\Storage\DebugArray::capture([])) {
-     *     use \PHPForge\Debug\Storage\ArrayPayloadSnapshot;
-     *
-     *     protected static function payloadKey(): string
-     *     {
-     *         return 'data';
-     *     }
-     * };
-     * $data = $prototype::capture(['enabled' => true])->jsonSerialize();
-     * $snapshot = $prototype::fromArray($data, '$.panel');
-     * ```
-     *
      * @param mixed $data Decoded JSON payload.
      * @param string $path Payload path used in hydration errors.
      *
@@ -85,20 +53,6 @@ public static function fromArray(mixed $data, string $path): self
     /**
      * Returns the tagged payload for JSON serialization.
      *
-     * Usage example:
-     *
-     * ```php
-     * $prototype = new class(\PHPForge\Debug\Storage\DebugArray::capture([])) {
-     *     use \PHPForge\Debug\Storage\ArrayPayloadSnapshot;
-     *
-     *     protected static function payloadKey(): string
-     *     {
-     *         return 'data';
-     *     }
-     * };
-     * $data = $prototype::capture(['enabled' => true])->jsonSerialize();
-     * ```
-     *
      * @return array<string, mixed> Tagged payload indexed by its persistence key.
      */
     public function jsonSerialize(): array
diff --git a/src/Storage/DebugArray.php b/src/Storage/DebugArray.php
index e9f3752..508e8e7 100644
--- a/src/Storage/DebugArray.php
+++ b/src/Storage/DebugArray.php
@@ -22,31 +22,20 @@ private function __construct(private DebugValue $value) {}
     /**
      * Captures an array as tagged debug data.
      *
-     * Usage example:
-     *
-     * ```php
-     * $array = \PHPForge\Debug\Storage\DebugArray::capture(['enabled' => true]);
-     * ```
-     *
      * @param array<array-key, mixed> $value PHP values to capture.
      *
      * @return self Tagged array facade.
      */
     public static function capture(#[SensitiveParameter] array $value): self
     {
-        return new self(DebugValue::capture($value));
+        return new self(
+            DebugValue::capture($value),
+        );
     }
 
     /**
      * Hydrates a tagged debug array from decoded JSON data.
      *
-     * Usage example:
-     *
-     * ```php
-     * $data = \PHPForge\Debug\Storage\DebugArray::capture(['enabled' => true])->jsonSerialize();
-     * $array = \PHPForge\Debug\Storage\DebugArray::fromArray($data, '$.panel.data');
-     * ```
-     *
      * @param mixed $value Decoded tagged value.
      * @param string $path Payload path used in hydration errors.
      *
@@ -63,18 +52,14 @@ public static function fromArray(mixed $value, string $path): self
             );
         }
 
-        return new self($debugValue);
+        return new self(
+            $debugValue,
+        );
     }
 
     /**
      * Returns the tagged array for JSON serialization.
      *
-     * Usage example:
-     *
-     * ```php
-     * $data = \PHPForge\Debug\Storage\DebugArray::capture(['enabled' => true])->jsonSerialize();
-     * ```
-     *
      * @return array<string, mixed> Tagged array payload.
      */
     public function jsonSerialize(): array
diff --git a/src/Storage/DebugSnapshot.php b/src/Storage/DebugSnapshot.php
index e46b291..88f53ee 100644
--- a/src/Storage/DebugSnapshot.php
+++ b/src/Storage/DebugSnapshot.php
@@ -27,12 +27,6 @@ public function __construct(public RequestSummary $summary, public array $panels
     /**
      * Hydrates a versioned request envelope from decoded JSON data.
      *
-     * Usage example:
-     *
-     * ```php
-     * $snapshot = \PHPForge\Debug\Storage\DebugSnapshot::fromArray($data);
-     * ```
-     *
      * @param mixed $data Decoded snapshot envelope.
      *
      * @return self Hydrated request snapshot.
@@ -79,12 +73,6 @@ public static function fromArray(mixed $data): self
     /**
      * Returns the request envelope for JSON serialization.
      *
-     * Usage example:
-     *
-     * ```php
-     * $data = $snapshot->jsonSerialize();
-     * ```
-     *
      * @return array<string, mixed> Versioned request envelope.
      */
     public function jsonSerialize(): array
diff --git a/src/Storage/DebugValue.php b/src/Storage/DebugValue.php
index 2a934be..2e947cd 100644
--- a/src/Storage/DebugValue.php
+++ b/src/Storage/DebugValue.php
@@ -17,7 +17,6 @@
 use function array_key_first;
 use function base64_decode;
 use function base64_encode;
-use function count;
 use function get_object_vars;
 use function get_resource_type;
 use function in_array;
@@ -92,12 +91,6 @@ private function __construct(
     /**
      * Captures an arbitrary PHP value as JSON-safe tagged data.
      *
-     * Usage example:
-     *
-     * ```php
-     * $value = \PHPForge\Debug\Storage\DebugValue::capture(['enabled' => true]);
-     * ```
-     *
      * @param mixed $value PHP value to capture.
      *
      * @return self Tagged debug value.
@@ -114,12 +107,6 @@ public static function capture(#[SensitiveParameter] mixed $value): self
     /**
      * Hydrates a tagged debug value from decoded JSON data.
      *
-     * Usage example:
-     *
-     * ```php
-     * $value = \PHPForge\Debug\Storage\DebugValue::fromArray(['type' => 'int', 'value' => 42]);
-     * ```
-     *
      * @param mixed $data Decoded tagged value.
      * @param string $path Payload path used in hydration errors.
      *
@@ -135,12 +122,6 @@ public static function fromArray(mixed $data, string $path = '$'): self
     /**
      * Returns the tagged value for JSON serialization.
      *
-     * Usage example:
-     *
-     * ```php
-     * $data = \PHPForge\Debug\Storage\DebugValue::capture(['enabled' => true])->jsonSerialize();
-     * ```
-     *
      * @return array<string, mixed> Tagged debug value payload.
      */
     public function jsonSerialize(): array
@@ -786,10 +767,6 @@ private static function validateShape(array $payload, array $shape, string $path
             }
         }
 
-        if (count($payload) === count($shape)) {
-            return;
-        }
-
         $unknown = array_diff_key($payload, $shape);
 
         if ($unknown !== []) {
diff --git a/src/Storage/ExceptionSnapshot.php b/src/Storage/ExceptionSnapshot.php
index 07e25e4..af172b3 100644
--- a/src/Storage/ExceptionSnapshot.php
+++ b/src/Storage/ExceptionSnapshot.php
@@ -67,13 +67,6 @@ public function __toString(): string
     /**
      * Hydrates a throwable snapshot from decoded JSON data.
      *
-     * Usage example:
-     *
-     * ```php
-     * $captured = \PHPForge\Debug\Storage\ExceptionSnapshot::fromThrowable(new \RuntimeException('Failed.'));
-     * $snapshot = \PHPForge\Debug\Storage\ExceptionSnapshot::fromArray($captured->jsonSerialize());
-     * ```
-     *
      * @param mixed $data Decoded throwable payload.
      * @param string $path Payload path used in hydration errors.
      *
@@ -152,14 +145,6 @@ class: $payload->string('class'),
     /**
      * Captures a throwable and its previous-exception chain without executable state.
      *
-     * Usage example:
-     *
-     * ```php
-     * $snapshot = \PHPForge\Debug\Storage\ExceptionSnapshot::fromThrowable(
-     *     new \RuntimeException('Capture failed.'),
-     * );
-     * ```
-     *
      * @param Throwable $throwable Throwable to capture.
      *
      * @return self Captured throwable snapshot.
@@ -207,12 +192,6 @@ class: Json::safeString($throwable::class),
     /**
      * Returns the captured throwable class.
      *
-     * Usage example:
-     *
-     * ```php
-     * $class = \PHPForge\Debug\Storage\ExceptionSnapshot::fromThrowable(new \RuntimeException())->getClass();
-     * ```
-     *
      * @return string Captured throwable class.
      */
     public function getClass(): string
@@ -223,12 +202,6 @@ public function getClass(): string
     /**
      * Returns the captured throwable code.
      *
-     * Usage example:
-     *
-     * ```php
-     * $code = \PHPForge\Debug\Storage\ExceptionSnapshot::fromThrowable(new \RuntimeException('', 42))->getCode();
-     * ```
-     *
      * @return int|string Captured throwable code.
      */
     public function getCode(): int|string
@@ -239,12 +212,6 @@ public function getCode(): int|string
     /**
      * Returns the file where the throwable originated.
      *
-     * Usage example:
-     *
-     * ```php
-     * $file = \PHPForge\Debug\Storage\ExceptionSnapshot::fromThrowable(new \RuntimeException())->getFile();
-     * ```
-     *
      * @return string Origin file path.
      */
     public function getFile(): string
@@ -255,12 +222,6 @@ public function getFile(): string
     /**
      * Returns the line where the throwable originated.
      *
-     * Usage example:
-     *
-     * ```php
-     * $line = \PHPForge\Debug\Storage\ExceptionSnapshot::fromThrowable(new \RuntimeException())->getLine();
-     * ```
-     *
      * @return int Origin line number.
      */
     public function getLine(): int
@@ -271,14 +232,6 @@ public function getLine(): int
     /**
      * Returns the captured throwable message.
      *
-     * Usage example:
-     *
-     * ```php
-     * $message = \PHPForge\Debug\Storage\ExceptionSnapshot::fromThrowable(
-     *     new \RuntimeException('Capture failed.'),
-     * )->getMessage();
-     * ```
-     *
      * @return string Captured throwable message.
      */
     public function getMessage(): string
@@ -289,15 +242,6 @@ public function getMessage(): string
     /**
      * Returns the previous throwable snapshot or `null`.
      *
-     * Usage example:
-     *
-     * ```php
-     * $snapshot = \PHPForge\Debug\Storage\ExceptionSnapshot::fromThrowable(
-     *     new \RuntimeException('Outer.', 0, new \LogicException('Inner.')),
-     * );
-     * $previous = $snapshot->getPrevious();
-     * ```
-     *
      * @return self|null Previous throwable snapshot or `null`.
      */
     public function getPrevious(): self|null
@@ -308,12 +252,6 @@ public function getPrevious(): self|null
     /**
      * Returns the trace frames with their arguments projected to plain display values.
      *
-     * Usage example:
-     *
-     * ```php
-     * $trace = \PHPForge\Debug\Storage\ExceptionSnapshot::fromThrowable(new \RuntimeException())->getTrace();
-     * ```
-     *
      * @return list<array<string, mixed>> Display-safe trace frames.
      */
     public function getTrace(): array
@@ -327,14 +265,6 @@ public function getTrace(): array
     /**
      * Returns the throwable snapshot for JSON serialization.
      *
-     * Usage example:
-     *
-     * ```php
-     * $data = \PHPForge\Debug\Storage\ExceptionSnapshot::fromThrowable(
-     *     new \RuntimeException('Capture failed.'),
-     * )->jsonSerialize();
-     * ```
-     *
      * @return array<string, mixed> Serialized throwable snapshot.
      */
     public function jsonSerialize(): array
diff --git a/src/Storage/HydrationException.php b/src/Storage/HydrationException.php
index 427dde7..afab278 100644
--- a/src/Storage/HydrationException.php
+++ b/src/Storage/HydrationException.php
@@ -14,12 +14,6 @@ final class HydrationException extends RuntimeException
     /**
      * Creates an exception that identifies an invalid payload path and its expected value.
      *
-     * Usage example:
-     *
-     * ```php
-     * throw \PHPForge\Debug\Storage\HydrationException::at('$.summary.statusCode', 'an integer');
-     * ```
-     *
      * @param string $path Path of the invalid payload value.
      * @param string $expected Description of the expected value.
      *
diff --git a/src/Storage/Json.php b/src/Storage/Json.php
index 44d8047..77dfef1 100644
--- a/src/Storage/Json.php
+++ b/src/Storage/Json.php
@@ -21,12 +21,6 @@ private function __construct() {}
     /**
      * Returns valid UTF-8, representing binary text as base64.
      *
-     * Usage example:
-     *
-     * ```php
-     * $label = \PHPForge\Debug\Storage\Json::safeString("\xB1\x31");
-     * ```
-     *
      * @param string $value String to normalize.
      *
      * @return string JSON-safe string.
diff --git a/src/Storage/Manifest.php b/src/Storage/Manifest.php
index a24871e..c8c0fd7 100644
--- a/src/Storage/Manifest.php
+++ b/src/Storage/Manifest.php
@@ -23,12 +23,6 @@ public function __construct(public array $entries) {}
     /**
      * Hydrates a versioned manifest from decoded JSON data.
      *
-     * Usage example:
-     *
-     * ```php
-     * $manifest = \PHPForge\Debug\Storage\Manifest::fromArray($data);
-     * ```
-     *
      * @param mixed $data Decoded manifest payload.
      *
      * @return self Hydrated request-summary index.
@@ -73,12 +67,6 @@ public static function fromArray(mixed $data): self
     /**
      * Returns the versioned manifest for JSON serialization.
      *
-     * Usage example:
-     *
-     * ```php
-     * $data = (new \PHPForge\Debug\Storage\Manifest([]))->jsonSerialize();
-     * ```
-     *
      * @return array<string, mixed> Versioned manifest payload.
      */
     public function jsonSerialize(): array
diff --git a/src/Storage/ManifestReadResult.php b/src/Storage/ManifestReadResult.php
index 0f3cd2d..daa6c5f 100644
--- a/src/Storage/ManifestReadResult.php
+++ b/src/Storage/ManifestReadResult.php
@@ -6,9 +6,6 @@
 
 /**
  * Exposes a manifest read together with an optional storage diagnostic.
- *
- * An empty {@see $entries} list with no {@see $error} represents a valid empty store. Consumers that only need the
- * legacy fail-closed behavior can continue to use {@see SnapshotStore::loadManifest()}.
  */
 final readonly class ManifestReadResult
 {
diff --git a/src/Storage/PanelFailure.php b/src/Storage/PanelFailure.php
index 46b6d61..36c3c50 100644
--- a/src/Storage/PanelFailure.php
+++ b/src/Storage/PanelFailure.php
@@ -26,12 +26,6 @@ public function __construct(public string $stage, public ExceptionSnapshot $exce
     /**
      * Hydrates a panel failure from decoded JSON data.
      *
-     * Usage example:
-     *
-     * ```php
-     * $failure = \PHPForge\Debug\Storage\PanelFailure::fromArray($data, '$.failures.log');
-     * ```
-     *
      * @param mixed $data Decoded panel failure payload.
      * @param string $path Payload path used in hydration errors.
      *
@@ -65,15 +59,6 @@ public static function fromArray(mixed $data, string $path): self
     /**
      * Captures a throwable raised during a panel lifecycle stage.
      *
-     * Usage example:
-     *
-     * ```php
-     * $failure = \PHPForge\Debug\Storage\PanelFailure::fromThrowable(
-     *     \PHPForge\Debug\Storage\PanelFailure::CAPTURE,
-     *     new \RuntimeException('Capture failed.'),
-     * );
-     * ```
-     *
      * @param 'capture'|'hydrate' $stage Lifecycle stage the panel failed in.
      * @param Throwable $throwable Panel exception to capture.
      *
@@ -90,15 +75,6 @@ public static function fromThrowable(string $stage, Throwable $throwable): self
     /**
      * Returns the failure record for JSON serialization.
      *
-     * Usage example:
-     *
-     * ```php
-     * $data = \PHPForge\Debug\Storage\PanelFailure::fromThrowable(
-     *     \PHPForge\Debug\Storage\PanelFailure::CAPTURE,
-     *     new \RuntimeException('Capture failed.'),
-     * )->jsonSerialize();
-     * ```
-     *
      * @return array<string, mixed> Serialized failure stage and exception.
      */
     public function jsonSerialize(): array
diff --git a/src/Storage/PanelRow.php b/src/Storage/PanelRow.php
index aea5367..39a2ca4 100644
--- a/src/Storage/PanelRow.php
+++ b/src/Storage/PanelRow.php
@@ -8,21 +8,12 @@
 
 /**
  * Defines a typed row held by a panel snapshot.
- *
- * Rows are narrowed once, at capture time, and persisted in that typed form; hydration restores them through
- * {@see Payload} without coercion.
  */
 interface PanelRow extends JsonSerializable
 {
     /**
      * Returns the typed row for JSON serialization.
      *
-     * Usage example:
-     *
-     * ```php
-     * $data = $row->jsonSerialize();
-     * ```
-     *
      * @return array<string, mixed> Serialized row fields.
      */
     public function jsonSerialize(): array;
diff --git a/src/Storage/PanelSnapshot.php b/src/Storage/PanelSnapshot.php
index 7bcaeb2..d15d7d6 100644
--- a/src/Storage/PanelSnapshot.php
+++ b/src/Storage/PanelSnapshot.php
@@ -14,12 +14,6 @@ interface PanelSnapshot extends JsonSerializable
     /**
      * Returns the panel snapshot for JSON serialization.
      *
-     * Usage example:
-     *
-     * ```php
-     * $data = $snapshot->jsonSerialize();
-     * ```
-     *
      * @return array<string, mixed> Serialized panel fields.
      */
     public function jsonSerialize(): array;
diff --git a/src/Storage/Payload.php b/src/Storage/Payload.php
index e1f6728..16b516b 100644
--- a/src/Storage/Payload.php
+++ b/src/Storage/Payload.php
@@ -34,12 +34,6 @@ private function __construct(private array $data, private string $path) {}
     /**
      * Returns every decoded field without conversion.
      *
-     * Usage example:
-     *
-     * ```php
-     * $data = \PHPForge\Debug\Storage\Payload::object(['name' => 'debug'])->all();
-     * ```
-     *
      * @return array<string, mixed> Decoded object fields.
      */
     public function all(): array
@@ -50,12 +44,6 @@ public function all(): array
     /**
      * Returns a required boolean field.
      *
-     * Usage example:
-     *
-     * ```php
-     * $enabled = \PHPForge\Debug\Storage\Payload::object(['enabled' => true])->bool('enabled');
-     * ```
-     *
      * @param string $key Required field name.
      *
      * @return bool Boolean field value.
@@ -77,13 +65,6 @@ public function bool(string $key): bool
     /**
      * Reads a tagged array value, keeping the path of the enclosing payload for error reporting.
      *
-     * Usage example:
-     *
-     * ```php
-     * $data = \PHPForge\Debug\Storage\DebugArray::capture(['enabled' => true])->jsonSerialize();
-     * $array = \PHPForge\Debug\Storage\Payload::object(['data' => $data])->debugArray('data');
-     * ```
-     *
      * @param string $key Required field name.
      *
      * @return DebugArray Hydrated tagged array.
@@ -96,12 +77,6 @@ public function debugArray(string $key): DebugArray
     /**
      * Returns a required integer field.
      *
-     * Usage example:
-     *
-     * ```php
-     * $count = \PHPForge\Debug\Storage\Payload::object(['count' => 3])->int('count');
-     * ```
-     *
      * @param string $key Required field name.
      *
      * @return int Integer field value.
@@ -123,12 +98,6 @@ public function int(string $key): int
     /**
      * Returns a required list field.
      *
-     * Usage example:
-     *
-     * ```php
-     * $items = \PHPForge\Debug\Storage\Payload::object(['items' => ['one', 'two']])->list('items');
-     * ```
-     *
      * @param string $key Required field name.
      *
      * @return list<mixed> List field value.
@@ -150,12 +119,6 @@ public function list(string $key): array
     /**
      * Returns a required JSON object as a `string`-keyed array.
      *
-     * Usage example:
-     *
-     * ```php
-     * $options = \PHPForge\Debug\Storage\Payload::object(['options' => ['enabled' => true]])->map('options');
-     * ```
-     *
      * @param string $key Required field name.
      *
      * @return array<string, mixed> Object field value.
@@ -168,12 +131,6 @@ public function map(string $key): array
     /**
      * Returns an integer field or `null`.
      *
-     * Usage example:
-     *
-     * ```php
-     * $line = \PHPForge\Debug\Storage\Payload::object(['line' => null])->nullableInt('line');
-     * ```
-     *
      * @param string $key Required field name.
      *
      * @return int|null Integer field value or `null`.
@@ -199,12 +156,6 @@ public function nullableInt(string $key): int|null
     /**
      * Returns a numeric field as a float or `null`.
      *
-     * Usage example:
-     *
-     * ```php
-     * $duration = \PHPForge\Debug\Storage\Payload::object(['duration' => 1.5])->nullableNumber('duration');
-     * ```
-     *
      * @param string $key Required field name.
      *
      * @return float|null Numeric field value or `null`.
@@ -230,12 +181,6 @@ public function nullableNumber(string $key): float|null
     /**
      * Returns a string field or `null`.
      *
-     * Usage example:
-     *
-     * ```php
-     * $action = \PHPForge\Debug\Storage\Payload::object(['action' => null])->nullableString('action');
-     * ```
-     *
      * @param string $key Required field name.
      *
      * @return string|null String field value or `null`.
@@ -261,12 +206,6 @@ public function nullableString(string $key): string|null
     /**
      * Returns a required numeric field as a float.
      *
-     * Usage example:
-     *
-     * ```php
-     * $duration = \PHPForge\Debug\Storage\Payload::object(['duration' => 1.5])->number('duration');
-     * ```
-     *
      * @param string $key Required field name.
      *
      * @return float Numeric field value.
@@ -288,12 +227,6 @@ public function number(string $key): float
     /**
      * Creates a strict reader for a decoded JSON object.
      *
-     * Usage example:
-     *
-     * ```php
-     * $payload = \PHPForge\Debug\Storage\Payload::object(['name' => 'debug'], '$.panel');
-     * ```
-     *
      * @param mixed $value Decoded JSON value.
      * @param string $path Object path used in hydration errors.
      *
@@ -327,12 +260,6 @@ public static function object(mixed $value, string $path = '$'): self
     /**
      * Returns a required field without conversion.
      *
-     * Usage example:
-     *
-     * ```php
-     * $value = \PHPForge\Debug\Storage\Payload::object(['value' => ['nested']])->raw('value');
-     * ```
-     *
      * @param string $key Required field name.
      *
      * @return mixed Unconverted field value.
@@ -345,12 +272,6 @@ public function raw(string $key): mixed
     /**
      * Reads a list of JSON objects, validating each element's shape but leaving its values untouched.
      *
-     * Usage example:
-     *
-     * ```php
-     * $rows = \PHPForge\Debug\Storage\Payload::object(['rows' => [['name' => 'debug']]])->rows('rows');
-     * ```
-     *
      * @param string $key Required field name.
      *
      * @return list<array<string, mixed>> Validated object rows.
@@ -371,12 +292,6 @@ public function rows(string $key): array
     /**
      * Validates required, optional, and undeclared fields.
      *
-     * Usage example:
-     *
-     * ```php
-     * $payload = \PHPForge\Debug\Storage\Payload::object(['name' => 'debug'])->shape(['name'], ['description']);
-     * ```
-     *
      * @param list<string> $required Required field names.
      * @param list<string> $optional Optional field names.
      *
@@ -410,12 +325,6 @@ public function shape(array $required, array $optional = []): self
     /**
      * Returns a required `string` field.
      *
-     * Usage example:
-     *
-     * ```php
-     * $name = \PHPForge\Debug\Storage\Payload::object(['name' => 'debug'])->string('name');
-     * ```
-     *
      * @param string $key Required field name.
      *
      * @return string String field value.
diff --git a/src/Storage/RequestSummary.php b/src/Storage/RequestSummary.php
index 7d25ce3..8caf961 100644
--- a/src/Storage/RequestSummary.php
+++ b/src/Storage/RequestSummary.php
@@ -49,12 +49,6 @@ public function __construct(
     /**
      * Hydrates request metadata from decoded JSON data.
      *
-     * Usage example:
-     *
-     * ```php
-     * $summary = \PHPForge\Debug\Storage\RequestSummary::fromArray($data);
-     * ```
-     *
      * @param mixed $data Decoded request metadata.
      * @param string $path Payload path used in hydration errors.
      *
@@ -114,12 +108,6 @@ public static function fromArray(mixed $data, string $path = '$.summary'): self
     /**
      * Returns the request metadata for JSON serialization.
      *
-     * Usage example:
-     *
-     * ```php
-     * $data = $summary->jsonSerialize();
-     * ```
-     *
      * @return array<string, mixed> Serialized request metadata.
      */
     public function jsonSerialize(): array
@@ -144,12 +132,6 @@ public function jsonSerialize(): array
     /**
      * Returns a copy enriched with processing time and peak memory usage.
      *
-     * Usage example:
-     *
-     * ```php
-     * $profiledSummary = $summary->withProfiling(0.015, 2_097_152);
-     * ```
-     *
      * @param float $processingTime Processing duration in seconds.
      * @param int $peakMemory Peak memory in bytes.
      *
diff --git a/src/Storage/SnapshotReadResult.php b/src/Storage/SnapshotReadResult.php
index 7a78f6c..c7cf505 100644
--- a/src/Storage/SnapshotReadResult.php
+++ b/src/Storage/SnapshotReadResult.php
@@ -6,9 +6,6 @@
 
 /**
  * Exposes a snapshot read together with an optional storage diagnostic.
- *
- * A `null` {@see $snapshot} with no {@see $error} means the requested snapshot does not exist. Consumers that only
- * need the legacy fail-closed behavior can continue to use {@see SnapshotStore::readSnapshot()}.
  */
 final readonly class SnapshotReadResult
 {
diff --git a/src/Storage/SnapshotStore.php b/src/Storage/SnapshotStore.php
index fc6551e..58e2882 100644
--- a/src/Storage/SnapshotStore.php
+++ b/src/Storage/SnapshotStore.php
@@ -54,13 +54,6 @@ public function __construct(
 
     /**
      * Removes stored manifests, snapshots, and temporary files.
-     *
-     * Usage example:
-     *
-     * ```php
-     * $store = new \PHPForge\Debug\Storage\SnapshotStore(sys_get_temp_dir() . '/debug', 0o775, null);
-     * $store->clear();
-     * ```
      */
     public function clear(): void
     {
@@ -93,13 +86,6 @@ public function clear(): void
     /**
      * Returns manifest entries ordered from newest to oldest.
      *
-     * Usage example:
-     *
-     * ```php
-     * $store = new \PHPForge\Debug\Storage\SnapshotStore(sys_get_temp_dir() . '/debug', 0o775, null);
-     * $entries = $store->loadManifest();
-     * ```
-     *
      * @return array<string, RequestSummary> Newest entries first.
      */
     public function loadManifest(): array
@@ -172,13 +158,6 @@ public function loadManifestResult(): ManifestReadResult
     /**
      * Returns a stored snapshot or `null` when the tag or persisted payload is invalid.
      *
-     * Usage example:
-     *
-     * ```php
-     * $store = new \PHPForge\Debug\Storage\SnapshotStore(sys_get_temp_dir() . '/debug', 0o775, null);
-     * $snapshot = $store->readSnapshot('request-1');
-     * ```
-     *
      * @param string $tag Snapshot tag.
      *
      * @return DebugSnapshot|null Hydrated snapshot or `null` when the stored value is unavailable or invalid.
@@ -267,12 +246,6 @@ public function readSnapshotResult(string $tag): SnapshotReadResult
     /**
      * Writes a snapshot, updates the manifest, and runs garbage collection under one exclusive lock.
      *
-     * Usage example:
-     *
-     * ```php
-     * $removed = $store->writeSnapshot($snapshot, 50);
-     * ```
-     *
      * @param DebugSnapshot $snapshot Snapshot to persist.
      * @param int $historySize Maximum number of retained entries.
      *
diff --git a/src/Theme/ThemeResolver.php b/src/Theme/ThemeResolver.php
index 53c15fd..6546ebd 100644
--- a/src/Theme/ThemeResolver.php
+++ b/src/Theme/ThemeResolver.php
@@ -9,14 +9,6 @@
 
 /**
  * Resolves the effective debugger theme from the request's cookie and query parameters.
- *
- * The persisted cookie (written by the client-side theme toggle) always outranks the `yii_debug_theme` query
- * parameter, which is only a link-time snapshot; anything other than `dark` resolves to `light`.
- *
- * Usage example:
- * ```php
- * $theme = \PHPForge\Debug\Theme\ThemeResolver::resolve($request->getCookieParams(), $request->getQueryParams());
- * ```
  */
 final class ThemeResolver
 {
diff --git a/src/Toolbar/ToolbarItem.php b/src/Toolbar/ToolbarItem.php
index 29a807b..11b024c 100644
--- a/src/Toolbar/ToolbarItem.php
+++ b/src/Toolbar/ToolbarItem.php
@@ -35,15 +35,8 @@ public function __construct(
     /**
      * Returns the metric payload consumed by the toolbar runtime.
      *
-     * Usage example:
-     *
-     * ```php
-     * $payload = (new \PHPForge\Debug\Toolbar\ToolbarItem('12 ms', label: 'Time'))->jsonSerialize();
-     * ```
-     *
      * @return array{value: string, status: string, label?: string, icon?: string, title?: string, url?: string,
-     * id?: string}
-     * Serialized metric payload.
+     * id?: string} Serialized metric payload.
      */
     public function jsonSerialize(): array
     {
diff --git a/src/Toolbar/ToolbarPanel.php b/src/Toolbar/ToolbarPanel.php
index 2e66f11..1e3bb43 100644
--- a/src/Toolbar/ToolbarPanel.php
+++ b/src/Toolbar/ToolbarPanel.php
@@ -32,12 +32,6 @@ public function __construct(
     /**
      * Returns the panel payload consumed by the toolbar runtime.
      *
-     * Usage example:
-     *
-     * ```php
-     * $payload = (new \PHPForge\Debug\Toolbar\ToolbarPanel('request', 'Request'))->jsonSerialize();
-     * ```
-     *
      * @return array{
      *     id: string,
      *     title: string,
diff --git a/src/View/Grid/ActiveFilterBanner.php b/src/View/Grid/ActiveFilterBanner.php
index 46d4514..b0ea00a 100644
--- a/src/View/Grid/ActiveFilterBanner.php
+++ b/src/View/Grid/ActiveFilterBanner.php
@@ -14,18 +14,6 @@
 
 /**
  * Renders the active-filter banner above a panel grid.
- *
- * The banner surfaces every active `Prefix[attribute]` filter as a removable pill, plus a "Clear all" action. URL
- * construction stays with the caller: the removal-URL builder receives the attribute names to drop and returns the
- * rebuilt link, so every other query parameter (sort, page size, theme) is preserved by the adapter's own routing.
- *
- * Usage example:
- * ```php
- * $html = \PHPForge\Debug\View\Grid\ActiveFilterBanner::render(
- *     ['statusCode' => '404'],
- *     static fn(array $without): string => '/debug?cleared=1',
- * );
- * ```
  */
 final class ActiveFilterBanner
 {
diff --git a/src/View/Grid/RowClass.php b/src/View/Grid/RowClass.php
index ee30b7b..d698151 100644
--- a/src/View/Grid/RowClass.php
+++ b/src/View/Grid/RowClass.php
@@ -14,14 +14,6 @@ final class RowClass
     /**
      * Returns the row-attributes array carrying the `yii-debug-row-<variant>` CSS class for the given status level.
      *
-     * Accepts `success`, `info`, `warning`, `danger`, and `error` (aliased to `danger`). Unknown or empty levels yield
-     * an empty array, so the caller can splat the result safely.
-     *
-     * Usage example:
-     * ```php
-     * $attributes = \PHPForge\Debug\View\Grid\RowClass::for('danger');
-     * ```
-     *
      * @param string|null $level Status keyword, or `null` to skip the class.
      *
      * @return array<string, mixed> Row-attributes array with the `class` key set, or `[]` for unknown/`null` levels.
@@ -34,6 +26,6 @@ public static function for(string|null $level): array
             return [];
         }
 
-        return ['class' => 'yii-debug-row-' . $normalized];
+        return ['class' => "yii-debug-row-{$normalized}"];
     }
 }
diff --git a/src/View/History/HistoryCellRenderer.php b/src/View/History/HistoryCellRenderer.php
index f2f0b62..366d3e6 100644
--- a/src/View/History/HistoryCellRenderer.php
+++ b/src/View/History/HistoryCellRenderer.php
@@ -17,10 +17,6 @@
 /**
  * Renders the History index summary header + the per-cell HTML consumed by the grid columns and the typed
  * row-attributes builder.
- *
- * Stateless static helpers; every method takes a typed {@see HistoryRow} or {@see HistorySummary} and returns a
- * ready-to-echo HTML string (or, for the row-attributes builder, the attribute map the grid consumes for `<tr>`).
- * Link targets are pre-built URL strings supplied by the adapter, so the renderer stays framework-neutral.
  */
 final class HistoryCellRenderer
 {
@@ -194,10 +190,11 @@ public static function renderSummary(HistorySummary $summary, array $bucketUrls,
         $requestLabel = $summary->totalRequests === 1 ? 'captured request' : 'captured requests';
 
         $children = [
-            Span::tag()->html(
-                Strong::tag()->content((string) $summary->totalRequests),
-                " {$requestLabel}",
-            ),
+            Span::tag()
+                ->html(
+                    Strong::tag()->content((string) $summary->totalRequests),
+                    " {$requestLabel}",
+                ),
         ];
 
         foreach ($summary->statusBuckets as $bucket) {
diff --git a/src/View/History/HistoryRow.php b/src/View/History/HistoryRow.php
index 057faa7..80c320f 100644
--- a/src/View/History/HistoryRow.php
+++ b/src/View/History/HistoryRow.php
@@ -10,9 +10,6 @@
 
 /**
  * Typed view-model for one captured-request row in the History grid.
- *
- * Projects the manifest's {@see RequestSummary} into the shape the grid renders, adding only the pre-formatted clock
- * time; every value is already typed, so no narrowing happens per cell.
  */
 final readonly class HistoryRow
 {
diff --git a/src/View/History/HistoryScale.php b/src/View/History/HistoryScale.php
index b68fa23..d658585 100644
--- a/src/View/History/HistoryScale.php
+++ b/src/View/History/HistoryScale.php
@@ -8,9 +8,6 @@
 
 /**
  * Typed capture-wide maxima for the History grid's micro-gauges.
- *
- * Computed once per page from the visible rows, so every Duration/Memory cell scales its rail against the same
- * reference.
  */
 final readonly class HistoryScale
 {
diff --git a/src/View/History/HistorySummary.php b/src/View/History/HistorySummary.php
index b0bbc1f..f060577 100644
--- a/src/View/History/HistorySummary.php
+++ b/src/View/History/HistorySummary.php
@@ -11,9 +11,6 @@
 
 /**
  * Typed aggregate view-model for the History index summary header.
- *
- * Pre-computes the captured-request total, the per-status-bucket counts + sample codes, and the unique status-code list
- * consumed by the grid's status filter dropdown.
  */
 final readonly class HistorySummary
 {
diff --git a/src/View/Sidebar/SidebarNavItem.php b/src/View/Sidebar/SidebarNavItem.php
index 30b28dd..b449cda 100644
--- a/src/View/Sidebar/SidebarNavItem.php
+++ b/src/View/Sidebar/SidebarNavItem.php
@@ -6,9 +6,6 @@
 
 /**
  * Typed view-model for one entry in the debugger sidebar panel navigation.
- *
- * Encapsulates the per-panel resolution (icon SVG, link target, tooltip text, active-state flag) so the renderer
- * stays focused on emitting markup. Used for both the 'History' entry and every registered panel link.
  */
 final readonly class SidebarNavItem
 {
diff --git a/src/View/Sidebar/SidebarRenderer.php b/src/View/Sidebar/SidebarRenderer.php
index 6a2f382..88a1ccd 100644
--- a/src/View/Sidebar/SidebarRenderer.php
+++ b/src/View/Sidebar/SidebarRenderer.php
@@ -16,12 +16,6 @@
 
 /**
  * Renders the debugger sidebar partial.
- *
- * Stateless static helpers: the public entry point takes a typed {@see SidebarView} with pre-built link targets and
- * returns ready-to-echo HTML, so the renderer stays framework-neutral.
- *
- * The snapshot card (top section) and panel-list nav (bottom section) are built by private helpers and rendered
- * directly by the shared layout.
  */
 final class SidebarRenderer
 {
@@ -29,11 +23,6 @@ final class SidebarRenderer
 
     /**
      * Renders the full sidebar (`<aside>` with the snapshot card + panel nav).
-     *
-     * Usage example:
-     * ```php
-     * $html = \PHPForge\Debug\View\Sidebar\SidebarRenderer::render($view);
-     * ```
      */
     public static function render(SidebarView $view): string
     {
diff --git a/src/View/Sidebar/SidebarSnapshot.php b/src/View/Sidebar/SidebarSnapshot.php
index e8f65ff..16d916d 100644
--- a/src/View/Sidebar/SidebarSnapshot.php
+++ b/src/View/Sidebar/SidebarSnapshot.php
@@ -7,10 +7,6 @@
 /**
  * Typed view-model for the snapshot card surfaced at the top of the debugger sidebar ('CURRENT REQUEST' /
  * 'NEWEST REQUEST').
- *
- * Pre-resolves every loose-array access on the request summary ('method', 'url', 'statusCode', 'time', 'ajax') plus
- * the navigation URLs ('Newest' / 'Newer' / 'Older' / 'Oldest'), the status-pill variant, path-only URL display, and
- * the cursor-mode flag that the shared history-cursor JavaScript needs to wire the grid highlight.
  */
 final readonly class SidebarSnapshot
 {
diff --git a/tests/Capture/CapturePolicyTest.php b/tests/Capture/CapturePolicyTest.php
index 58861ca..16a6673 100644
--- a/tests/Capture/CapturePolicyTest.php
+++ b/tests/Capture/CapturePolicyTest.php
@@ -16,21 +16,33 @@
 #[Group('capture')]
 final class CapturePolicyTest extends TestCase
 {
+    public function testConstructorAcceptsTheSmallestPositiveBodyLimit(): void
+    {
+        self::assertSame(
+            ['decoded' => null, 'raw' => 'a'],
+            (new CapturePolicy(maxBodyBytes: 1))->redactBody('a', null),
+            'A one-byte body limit must remain valid.',
+        );
+    }
     public function testConstructorRejectsANonPositiveBodyLimit(): void
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('greater than zero');
+        $this->expectExceptionMessage(
+            'greater than zero',
+        );
 
         $policy = new CapturePolicy(maxBodyBytes: 0);
 
-        self::fail('Expected invalid policy construction to fail, got ' . $policy::class . '.');
+        self::fail(
+            'Expected invalid policy construction to fail, got ' . $policy::class . '.',
+        );
     }
 
     public function testPolicySupportsAnEmptySensitiveKeyList(): void
     {
         self::assertSame(
-            'password=visible',
-            (new CapturePolicy([]))->redactText('password=visible'),
+            '=visible',
+            (new CapturePolicy([]))->redactText('=visible'),
             'An explicitly empty key list must disable assignment redaction.',
         );
     }
@@ -44,8 +56,19 @@ public function testPolicySupportsAnExplicitSensitiveKeyList(): void
             $policy->redact(['private' => 'secret', 'password' => 'visible']),
             'An explicit policy must replace the default key list.',
         );
-        self::assertTrue($policy->isSensitiveKey('PRIVATE'), 'Policy key checks must ignore case.');
-        self::assertFalse($policy->isSensitiveKey('password'), 'Explicit policy keys must replace defaults.');
+        self::assertTrue(
+            $policy->isSensitiveKey('PRIVATE'),
+            'Policy key checks must ignore case.',
+        );
+        self::assertFalse(
+            $policy->isSensitiveKey('password'),
+            'Explicit policy keys must replace defaults.',
+        );
+        self::assertSame(
+            'privateXkey=visible; private.key=[redacted]',
+            (new CapturePolicy(['private.key']))->redactText('privateXkey=visible; private.key=secret'),
+            'Regular-expression characters in configured keys must be matched literally.',
+        );
     }
 
     public function testRedactBodySanitizesObjectsAndOpaqueAssignments(): void
@@ -60,8 +83,8 @@ public function testRedactBodySanitizesObjectsAndOpaqueAssignments(): void
             $policy->redactBody('{"password":"object-secret"}', (object) ['password' => 'object-secret']),
             'Decoded objects must be normalized and redacted before persistence.',
         );
-        self::assertStringNotContainsString(
-            'opaque-secret',
+        self::assertSame(
+            'password=[redacted]',
             $policy->redactBody('password=opaque-secret', null)['raw'],
             'Opaque assignment bodies must receive best-effort text redaction.',
         );
@@ -93,6 +116,16 @@ public function testRedactBodyTruncatesOpaqueBodiesAtTheByteLimit(): void
             (new CapturePolicy(maxBodyBytes: 3))->redactBody('abcdef', null),
             'Opaque bodies must be truncated at the configured byte limit.',
         );
+        self::assertSame(
+            ['decoded' => null, 'raw' => 'abc'],
+            (new CapturePolicy(maxBodyBytes: 3))->redactBody('abc', null),
+            'A body exactly at the byte limit must not be truncated.',
+        );
+        self::assertSame(
+            ['decoded' => null, 'raw' => str_repeat('a', 65_536) . SensitiveDataRedactor::TRUNCATED],
+            (new CapturePolicy())->redactBody(str_repeat('a', 65_537), null),
+            'The default body limit must remain exactly 65,536 bytes.',
+        );
     }
 
     public function testRedactTextSanitizesAssignmentsWithoutMatchingSuffixes(): void
@@ -125,5 +158,10 @@ public function testRedactUrlSanitizesQueryValuesAndPreservesFragments(): void
             $policy->redactUrl('https://example.test/path?page=1&token=secret#result'),
             'Sensitive query values must be redacted while the fragment is preserved.',
         );
+        self::assertSame(
+            'https://example.test/path?page=1#result',
+            $policy->redactUrl('https://example.test/path?page=1#result'),
+            'A fragment must not become part of a safe query value.',
+        );
     }
 }
diff --git a/tests/Collector/CollectorCoordinatorTest.php b/tests/Collector/CollectorCoordinatorTest.php
index 36c3a66..952aac5 100644
--- a/tests/Collector/CollectorCoordinatorTest.php
+++ b/tests/Collector/CollectorCoordinatorTest.php
@@ -25,8 +25,14 @@ public function testCaptureIsolatesCollectorFailure(): void
     {
         $coordinator = new CollectorCoordinator(
             [
-                new CollectorFixture('app.example', ArrayPayloadSnapshotFixture::capture(['value' => 42])),
-                new CollectorFixture('broken', failCapture: true),
+                new CollectorFixture(
+                    'app.example',
+                    ArrayPayloadSnapshotFixture::capture(['value' => 42]),
+                ),
+                new CollectorFixture(
+                    'broken',
+                    failCapture: true,
+                ),
             ],
         );
 
@@ -59,8 +65,13 @@ public function testCapturePersistsSuccessfulCollectorsAndOmitsNullSnapshots():
     {
         $coordinator = new CollectorCoordinator(
             [
-                new CollectorFixture('app.example', ArrayPayloadSnapshotFixture::capture(['value' => 42])),
-                new CollectorFixture('empty'),
+                new CollectorFixture(
+                    'app.example',
+                    ArrayPayloadSnapshotFixture::capture(['value' => 42]),
+                ),
+                new CollectorFixture(
+                    'empty',
+                ),
             ],
         );
 
@@ -85,8 +96,12 @@ public function testCapturePersistsSuccessfulCollectorsAndOmitsNullSnapshots():
 
     public function testCollectorReturnsRegisteredInstanceOrNull(): void
     {
-        $collector = new CollectorFixture('app.example');
-        $coordinator = new CollectorCoordinator([$collector]);
+        $collector = new CollectorFixture(
+            'app.example',
+        );
+        $coordinator = new CollectorCoordinator(
+            [$collector],
+        );
 
         self::assertSame(
             $collector,
@@ -102,7 +117,11 @@ public function testCollectorReturnsRegisteredInstanceOrNull(): void
     public function testHasCollectorUsesStableId(): void
     {
         $coordinator = new CollectorCoordinator(
-            [new CollectorFixture('app.example')],
+            [
+                new CollectorFixture(
+                    'app.example',
+                ),
+            ],
         );
 
         self::assertTrue(
@@ -117,8 +136,12 @@ public function testHasCollectorUsesStableId(): void
 
     public function testLifecycleCallsCollectorsOncePerCycle(): void
     {
-        $collector = new CollectorFixture('app.example');
-        $coordinator = new CollectorCoordinator([$collector]);
+        $collector = new CollectorFixture(
+            'app.example',
+        );
+        $coordinator = new CollectorCoordinator(
+            [$collector],
+        );
 
         $coordinator->startup();
         $coordinator->startup();
@@ -135,12 +158,36 @@ public function testLifecycleCallsCollectorsOncePerCycle(): void
             $collector->shutdownCount,
             'Shutdown must run once per cycle.',
         );
+
+        $coordinator->startup();
+        $coordinator->shutdown();
+
+        self::assertSame(
+            2,
+            $collector->startupCount,
+            'A completed shutdown must allow a new lifecycle cycle.',
+        );
+        self::assertSame(
+            2,
+            $collector->shutdownCount,
+            'The second lifecycle cycle must also be cleaned up.',
+        );
     }
 
     public function testRunIgnoresFailingCleanupDiagnosticAndPreservesPrimaryThrowable(): void
     {
-        $primary = new RuntimeException('Primary operation failed.');
-        $coordinator = new CollectorCoordinator([new CollectorFixture('broken', failShutdown: true)]);
+        $primary = new RuntimeException(
+            'Primary operation failed.',
+        );
+        $coordinator = new CollectorCoordinator(
+            [
+                new CollectorFixture(
+                    'broken',
+                    failShutdown: true,
+                ),
+            ],
+        );
+
         $caught = null;
 
         try {
@@ -152,14 +199,29 @@ public function testRunIgnoresFailingCleanupDiagnosticAndPreservesPrimaryThrowab
             $caught = $throwable;
         }
 
-        self::assertSame($primary, $caught, 'A diagnostic failure must not replace the exact primary throwable.');
+        self::assertSame(
+            $primary,
+            $caught,
+            'A diagnostic failure must not replace the exact primary throwable.',
+        );
     }
 
     public function testRunPreservesPrimaryThrowableAndReportsCleanupFailure(): void
     {
-        $primary = new RuntimeException('Primary operation failed.');
+        $primary = new RuntimeException(
+            'Primary operation failed.',
+        );
+
         $cleanupFailure = null;
-        $coordinator = new CollectorCoordinator([new CollectorFixture('broken', failShutdown: true)]);
+
+        $coordinator = new CollectorCoordinator(
+            [
+                new CollectorFixture(
+                    'broken',
+                    failShutdown: true,
+                ),
+            ],
+        );
 
         try {
             $coordinator->run(
@@ -169,10 +231,18 @@ static function (Throwable $throwable) use (&$cleanupFailure): void {
                 },
             );
         } catch (RuntimeException $throwable) {
-            self::assertSame($primary, $throwable, 'The exact primary throwable must be rethrown.');
+            self::assertSame(
+                $primary,
+                $throwable,
+                'The exact primary throwable must be rethrown.',
+            );
         }
 
-        self::assertInstanceOf(RuntimeException::class, $cleanupFailure, 'Cleanup failure must reach the observer.');
+        self::assertInstanceOf(
+            RuntimeException::class,
+            $cleanupFailure,
+            'Cleanup failure must reach the observer.',
+        );
         self::assertSame(
             'Collector shutdown failed.',
             $cleanupFailure->getMessage(),
@@ -180,14 +250,59 @@ static function (Throwable $throwable) use (&$cleanupFailure): void {
         );
     }
 
+    public function testRunPreservesPrimaryThrowableWithoutACleanupFailureHandler(): void
+    {
+        $primary = new RuntimeException(
+            'Primary operation failed.',
+        );
+        $coordinator = new CollectorCoordinator(
+            [
+                new CollectorFixture(
+                    'broken',
+                    failShutdown: true,
+                ),
+            ],
+        );
+
+        $caught = null;
+
+        try {
+            $coordinator->run(static fn(): never => throw $primary);
+        } catch (RuntimeException $throwable) {
+            $caught = $throwable;
+        }
+
+        self::assertSame(
+            $primary,
+            $caught,
+            'Cleanup failure reporting must be optional when an operation already failed.',
+        );
+    }
+
     public function testRunReturnsOperationResultAndCompletesLifecycle(): void
     {
-        $collector = new CollectorFixture('app.example');
-        $coordinator = new CollectorCoordinator([$collector]);
+        $collector = new CollectorFixture(
+            'app.example',
+        );
+        $coordinator = new CollectorCoordinator(
+            [$collector],
+        );
 
-        self::assertSame('result', $coordinator->run(static fn(): string => 'result'), 'Operation result must survive.');
-        self::assertSame(1, $collector->startupCount, 'Run must start the collector.');
-        self::assertSame(1, $collector->shutdownCount, 'Run must stop the collector.');
+        self::assertSame(
+            'result',
+            $coordinator->run(static fn(): string => 'result'),
+            'Operation result must survive.',
+        );
+        self::assertSame(
+            1,
+            $collector->startupCount,
+            'Run must start the collector.',
+        );
+        self::assertSame(
+            1,
+            $collector->shutdownCount,
+            'Run must stop the collector.',
+        );
     }
 
     public function testShutdownContinuesAfterCollectorFailure(): void
@@ -202,8 +317,16 @@ public function testShutdownContinuesAfterCollectorFailure(): void
             failShutdown: true,
             shutdownFailureMessage: 'Second shutdown failed.',
         );
-        $successful = new CollectorFixture('successful');
-        $coordinator = new CollectorCoordinator([$firstBroken, $secondBroken, $successful]);
+        $successful = new CollectorFixture(
+            'successful',
+        );
+        $coordinator = new CollectorCoordinator(
+            [
+                $firstBroken,
+                $secondBroken,
+                $successful,
+            ],
+        );
 
         $coordinator->startup();
 
@@ -230,9 +353,19 @@ public function testShutdownContinuesAfterCollectorFailure(): void
 
     public function testShutdownRetriesOnlyCollectorsWhoseCleanupFailed(): void
     {
-        $successful = new CollectorFixture('successful');
-        $flaky = new CollectorFixture('flaky', shutdownFailuresRemaining: 1);
-        $coordinator = new CollectorCoordinator([$successful, $flaky]);
+        $successful = new CollectorFixture(
+            'successful',
+        );
+        $flaky = new CollectorFixture(
+            'flaky',
+            shutdownFailuresRemaining: 1,
+        );
+        $coordinator = new CollectorCoordinator(
+            [
+                $successful,
+                $flaky,
+            ],
+        );
 
         $coordinator->startup();
 
@@ -245,16 +378,37 @@ public function testShutdownRetriesOnlyCollectorsWhoseCleanupFailed(): void
         $coordinator->shutdown();
         $coordinator->shutdown();
 
-        self::assertSame(1, $successful->shutdownCount, 'Successful cleanup must not be repeated.');
-        self::assertSame(2, $flaky->shutdownCount, 'Failed cleanup must be retried until it succeeds.');
+        self::assertSame(
+            1,
+            $successful->shutdownCount,
+            'Successful cleanup must not be repeated.',
+        );
+        self::assertSame(
+            2,
+            $flaky->shutdownCount,
+            'Failed cleanup must be retried until it succeeds.',
+        );
     }
 
     public function testStartupAllowsRetryAfterRollback(): void
     {
-        $first = new CollectorFixture('first');
-        $flaky = new CollectorFixture('flaky', startupFailuresRemaining: 1);
-        $later = new CollectorFixture('later');
-        $coordinator = new CollectorCoordinator([$first, $flaky, $later]);
+        $first = new CollectorFixture(
+            'first',
+        );
+        $flaky = new CollectorFixture(
+            'flaky',
+            startupFailuresRemaining: 1,
+        );
+        $later = new CollectorFixture(
+            'later',
+        );
+        $coordinator = new CollectorCoordinator(
+            [
+                $first,
+                $flaky,
+                $later,
+            ],
+        );
 
         $startupFailed = false;
 
@@ -325,9 +479,20 @@ public function testStartupAllowsRetryAfterRollback(): void
 
     public function testStartupRetriesIncompleteRollbackCleanupBeforeStartingANewCycle(): void
     {
-        $flakyCleanup = new CollectorFixture('flaky-cleanup', shutdownFailuresRemaining: 1);
-        $flakyStartup = new CollectorFixture('flaky-startup', startupFailuresRemaining: 1);
-        $coordinator = new CollectorCoordinator([$flakyCleanup, $flakyStartup]);
+        $flakyCleanup = new CollectorFixture(
+            'flaky-cleanup',
+            shutdownFailuresRemaining: 1,
+        );
+        $flakyStartup = new CollectorFixture(
+            'flaky-startup',
+            startupFailuresRemaining: 1,
+        );
+        $coordinator = new CollectorCoordinator(
+            [
+                $flakyCleanup,
+                $flakyStartup,
+            ],
+        );
 
         try {
             $coordinator->startup();
@@ -338,18 +503,47 @@ public function testStartupRetriesIncompleteRollbackCleanupBeforeStartingANewCyc
         $coordinator->startup();
         $coordinator->shutdown();
 
-        self::assertSame(2, $flakyCleanup->startupCount, 'Collector must start again after its cleanup retry succeeds.');
-        self::assertSame(3, $flakyCleanup->shutdownCount, 'Failed rollback, retry, and final cleanup must each run once.');
-        self::assertSame(2, $flakyStartup->startupCount, 'Failed startup must be retried in the new cycle.');
-        self::assertSame(2, $flakyStartup->shutdownCount, 'Partial and successful cycles must both be cleaned.');
+        self::assertSame(
+            2,
+            $flakyCleanup->startupCount,
+            'Collector must start again after its cleanup retry succeeds.',
+        );
+        self::assertSame(
+            3,
+            $flakyCleanup->shutdownCount,
+            'Failed rollback, retry, and final cleanup must each run once.',
+        );
+        self::assertSame(
+            2,
+            $flakyStartup->startupCount,
+            'Failed startup must be retried in the new cycle.',
+        );
+        self::assertSame(
+            2,
+            $flakyStartup->shutdownCount,
+            'Partial and successful cycles must both be cleaned.',
+        );
     }
 
     public function testStartupRollsBackAffectedCollectorsWhenSecondCollectorFails(): void
     {
-        $first = new CollectorFixture('first');
-        $failed = new CollectorFixture('failed', startupFailuresRemaining: 1);
-        $later = new CollectorFixture('later');
-        $coordinator = new CollectorCoordinator([$first, $failed, $later]);
+        $first = new CollectorFixture(
+            'first',
+        );
+        $failed = new CollectorFixture(
+            'failed',
+            startupFailuresRemaining: 1,
+        );
+        $later = new CollectorFixture(
+            'later',
+        );
+        $coordinator = new CollectorCoordinator(
+            [
+                $first,
+                $failed,
+                $later,
+            ],
+        );
 
         $failure = null;
 
@@ -423,8 +617,12 @@ public function testThrowInvalidArgumentExceptionForDuplicateId(): void
 
         new CollectorCoordinator(
             [
-                new CollectorFixture('app.example'),
-                new CollectorFixture('app.example'),
+                new CollectorFixture(
+                    'app.example',
+                ),
+                new CollectorFixture(
+                    'app.example',
+                ),
             ],
         );
     }
@@ -441,7 +639,9 @@ public function testThrowInvalidArgumentExceptionForEmptyId(): void
 
     public function testThrowRuntimeExceptionWhenRollbackShutdownFails(): void
     {
-        $first = new CollectorFixture('first');
+        $first = new CollectorFixture(
+            'first',
+        );
         $rollbackFailure = new CollectorFixture(
             'rollback-failure',
             failShutdown: true,
@@ -452,8 +652,17 @@ public function testThrowRuntimeExceptionWhenRollbackShutdownFails(): void
             startupFailuresRemaining: 1,
             startupFailureMessage: 'Primary startup failed.',
         );
-        $later = new CollectorFixture('later');
-        $coordinator = new CollectorCoordinator([$first, $rollbackFailure, $startupFailure, $later]);
+        $later = new CollectorFixture(
+            'later',
+        );
+        $coordinator = new CollectorCoordinator(
+            [
+                $first,
+                $rollbackFailure,
+                $startupFailure,
+                $later,
+            ],
+        );
 
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage(
diff --git a/tests/Data/FilterEngineTest.php b/tests/Data/FilterEngineTest.php
index 5b6a272..8dd1cbe 100644
--- a/tests/Data/FilterEngineTest.php
+++ b/tests/Data/FilterEngineTest.php
@@ -25,7 +25,10 @@ public function testAddConditionIgnoresEmptyAndNonScalarValues(): void
         $engine->addCondition('level', null);
         $engine->addCondition('level', ['error']);
 
-        $rows = [['level' => 'info'], ['level' => 'error']];
+        $rows = [
+            ['level' => 'info'],
+            ['level' => 'error'],
+        ];
 
         self::assertSame(
             $engine->filter($rows),
@@ -47,6 +50,49 @@ public function testAddMinimumConditionKeepsRowsAtOrAboveTheBound(): void
         );
     }
 
+    public function testFilterAppliesConditionsAfterNumericAndPartialMatches(): void
+    {
+        $engine = new FilterEngine();
+
+        $engine->addCondition('duration', '>5');
+        $engine->addCondition('category', 'db');
+
+        self::assertSame(
+            [
+                [
+                    'duration' => 6,
+                    'category' => 'db',
+                ],
+            ],
+            $engine->filter(
+                [
+                    ['duration' => 6, 'category' => 'app'],
+                    ['duration' => 6, 'category' => 'db'],
+                ],
+            ),
+            'A numeric match must not skip later conditions.',
+        );
+
+        $engine->addCondition('message', 'query', partial: true);
+        $engine->addCondition('category', 'db');
+
+        self::assertSame(
+            [
+                [
+                    'message' => 'query complete',
+                    'category' => 'db',
+                ],
+            ],
+            $engine->filter(
+                [
+                    ['message' => 'query complete', 'category' => 'app'],
+                    ['message' => 'query complete', 'category' => 'db'],
+                ],
+            ),
+            'A partial match must not skip later conditions.',
+        );
+    }
+
     public function testFilterComparesNonScalarCandidatesThroughDumpExport(): void
     {
         $engine = new FilterEngine();
@@ -55,7 +101,12 @@ public function testFilterComparesNonScalarCandidatesThroughDumpExport(): void
 
         self::assertCount(
             1,
-            $engine->filter([['payload' => ['alpha' => 1]], ['payload' => ['beta' => 2]]]),
+            $engine->filter(
+                [
+                    ['payload' => ['alpha' => 1]],
+                    ['payload' => ['beta' => 2]],
+                ],
+            ),
             'Array candidates must match through their exported representation.',
         );
     }
@@ -81,9 +132,27 @@ public function testFilterMatchesCaseInsensitiveSubstringWhenPartial(): void
 
         self::assertSame(
             [['message' => 'Session started']],
-            $engine->filter([['message' => 'Session started'], ['message' => 'Connection opened']]),
+            $engine->filter(
+                [
+                    ['message' => 'Session started'],
+                    ['message' => 'Connection opened'],
+                ],
+            ),
             'Partial conditions must match case-insensitive substrings.',
         );
+
+        $engine->addCondition('message', 'ÁRBOL', partial: true);
+
+        self::assertSame(
+            [['message' => 'El árbol crece']],
+            $engine->filter(
+                [
+                    ['message' => 'El árbol crece'],
+                    ['message' => 'Tree'],
+                ],
+            ),
+            'Partial conditions must apply Unicode-aware case folding.',
+        );
     }
 
     public function testFilterMatchesCaseInsensitiveWholeValueByDefault(): void
@@ -94,9 +163,40 @@ public function testFilterMatchesCaseInsensitiveWholeValueByDefault(): void
 
         self::assertSame(
             [['level' => 'error']],
-            $engine->filter([['level' => 'error'], ['level' => 'error-handler']]),
+            $engine->filter(
+                [
+                    ['level' => 'error'],
+                    ['level' => 'error-handler'],
+                ],
+            ),
             'Default conditions must match the whole value case-insensitively.',
         );
+
+        $engine->addCondition('label', 'ÜBER');
+
+        self::assertSame(
+            [['label' => 'über']],
+            $engine->filter(
+                [
+                    ['label' => 'über'],
+                    ['label' => 'uber'],
+                ],
+            ),
+            'Whole-value conditions must apply Unicode-aware case folding to both operands.',
+        );
+
+        $engine->addCondition('label', 'über');
+
+        self::assertSame(
+            [['label' => 'ÜBER']],
+            $engine->filter(
+                [
+                    ['label' => 'ÜBER'],
+                    ['label' => 'uber'],
+                ],
+            ),
+            'Whole-value conditions must apply Unicode-aware case folding to the candidate.',
+        );
     }
 
     public function testFilterParsesLeadingComparisonOperators(): void
@@ -107,7 +207,13 @@ public function testFilterParsesLeadingComparisonOperators(): void
 
         self::assertSame(
             [['sqlCount' => 9]],
-            $engine->filter([['sqlCount' => 3], ['sqlCount' => 9]]),
+            $engine->filter(
+                [
+                    ['sqlCount' => 3],
+                    ['sqlCount' => 5],
+                    ['sqlCount' => 9],
+                ],
+            ),
             'A leading `>` must compare numerically.',
         );
 
@@ -115,7 +221,13 @@ public function testFilterParsesLeadingComparisonOperators(): void
 
         self::assertSame(
             [['duration' => '0.25']],
-            $engine->filter([['duration' => '0.25'], ['duration' => '0.75']]),
+            $engine->filter(
+                [
+                    ['duration' => '0.25'],
+                    ['duration' => '0.5'],
+                    ['duration' => '0.75'],
+                ],
+            ),
             'A leading `<` must compare numeric strings numerically.',
         );
     }
@@ -143,7 +255,6 @@ public function testFilterReadsPublicPropertiesFromObjectRows(): void
     public function testFilterRejectsMalformedInternalConditions(): void
     {
         $engine = new FilterEngine();
-
         $property = new ReflectionProperty($engine, 'conditions');
 
         $property->setValue($engine, [['attribute' => 'value', 'operator' => '>', 'value' => '5']]);
@@ -171,11 +282,51 @@ public function testFilterRejectsNonNumericCandidatesForNumericOperators(): void
 
         self::assertSame(
             [],
-            $engine->filter([['sqlCount' => 'many'], ['sqlCount' => null]]),
+            $engine->filter(
+                [
+                    ['sqlCount' => 'many'],
+                    ['sqlCount' => null],
+                ],
+            ),
             'Numeric operators must drop rows whose candidate is not numeric.',
         );
     }
 
+    public function testFilterRequiresTheEntireComparisonGrammarToMatch(): void
+    {
+        foreach (['prefix >5', '>5 suffix'] as $value) {
+            $engine = new FilterEngine();
+
+            $engine->addCondition('value', $value);
+
+            self::assertSame(
+                [['value' => $value]],
+                $engine->filter(
+                    [
+                        ['value' => $value],
+                        ['value' => 9],
+                    ],
+                ),
+                'Comparison syntax with leading or trailing data must remain a text condition.',
+            );
+        }
+
+        $engine = new FilterEngine();
+
+        $engine->addCondition('value', ">5\n");
+
+        self::assertSame(
+            [['value' => 9]],
+            $engine->filter(
+                [
+                    ['value' => 3],
+                    ['value' => 9],
+                ],
+            ),
+            'Trailing whitespace, including a final newline, must remain valid comparison syntax.',
+        );
+    }
+
     public function testFilterResetsConditionsAfterEachRun(): void
     {
         $engine = new FilterEngine();
diff --git a/tests/Data/PageSizeTest.php b/tests/Data/PageSizeTest.php
index 124a332..9cfd65b 100644
--- a/tests/Data/PageSizeTest.php
+++ b/tests/Data/PageSizeTest.php
@@ -91,43 +91,55 @@ public function testResolveReturnsNullForTheAllKeyword(): void
 
     public function testSelectorHtmlMarksTheCurrentOptionSelected(): void
     {
-        $html = PageSize::selectorHtml('25');
-
-        self::assertStringContainsString(
-            'data-yii-debug-pagesize',
-            $html,
-            'Selector must carry the JS hook.',
-        );
-        self::assertStringContainsString(
-            'name="per-page"',
-            $html,
-            'Selector must submit as `per-page`.',
-        );
-        self::assertStringContainsString(
-            '<option value="25" selected>',
-            $html,
-            'The current value must render selected.',
-        );
-        self::assertMatchesRegularExpression(
-            '/<option value="all">\s*All\s*<\/option>/',
-            $html,
-            "The 'all' option must render with its display label.",
-        );
-        self::assertStringContainsString(
-            'yii-debug-grid-pagesize-label',
-            $html,
-            'Label span must carry its class.',
+        self::assertSame(
+            <<<HTML
+            <label class="yii-debug-grid-pagesize"><span class="yii-debug-grid-pagesize-label">Rows</span><select class="yii-debug-grid-pagesize-select" name="per-page" data-yii-debug-pagesize="true">
+            <option value="10">
+            10
+            </option>
+            <option value="25" selected>
+            25
+            </option>
+            <option value="50">
+            50
+            </option>
+            <option value="100">
+            100
+            </option>
+            <option value="all">
+            All
+            </option>
+            </select></label>
+            HTML,
+            PageSize::selectorHtml('25'),
+            'The selector must render the exact JS hook, field name, labels, and selected option.',
         );
     }
 
     public function testSelectorHtmlSelectsCanonicalizedAllKeyword(): void
     {
-        $html = PageSize::selectorHtml(PageSize::current('ALL'));
-
-        self::assertStringContainsString(
-            '<option value="all" selected>',
-            $html,
-            "The canonicalized 'all' keyword must select the matching option.",
+        self::assertSame(
+            <<<HTML
+            <label class="yii-debug-grid-pagesize"><span class="yii-debug-grid-pagesize-label">Rows</span><select class="yii-debug-grid-pagesize-select" name="per-page" data-yii-debug-pagesize="true">
+            <option value="10">
+            10
+            </option>
+            <option value="25">
+            25
+            </option>
+            <option value="50">
+            50
+            </option>
+            <option value="100">
+            100
+            </option>
+            <option value="all" selected>
+            All
+            </option>
+            </select></label>
+            HTML,
+            PageSize::selectorHtml(PageSize::current('ALL')),
+            "The canonicalized 'all' keyword must render the exact selected selector.",
         );
     }
 }
diff --git a/tests/Data/QueryInputTest.php b/tests/Data/QueryInputTest.php
index 6695a91..f207a40 100644
--- a/tests/Data/QueryInputTest.php
+++ b/tests/Data/QueryInputTest.php
@@ -32,7 +32,10 @@ public function testGroupDropsEmptyNonScalarAndNonStringKeyedEntries(): void
         );
 
         self::assertSame(
-            ['statusCode' => '404', 'count' => '7'],
+            [
+                'statusCode' => '404',
+                'count' => '7',
+            ],
             $filters,
             'Empty strings, arrays, and integer keys must be dropped; numeric values must stringify.',
         );
diff --git a/tests/Helper/AvatarTest.php b/tests/Helper/AvatarTest.php
index 74ec731..8178c5a 100644
--- a/tests/Helper/AvatarTest.php
+++ b/tests/Helper/AvatarTest.php
@@ -10,8 +10,6 @@
 
 /**
  * Unit tests for {@see Avatar} deriving deterministic avatar hues.
- *
- * @since 0.1
  */
 #[Group('avatar')]
 #[Group('helpers')]
diff --git a/tests/Helper/CellMoreTest.php b/tests/Helper/CellMoreTest.php
index 3161933..ad5e309 100644
--- a/tests/Helper/CellMoreTest.php
+++ b/tests/Helper/CellMoreTest.php
@@ -13,8 +13,6 @@
 /**
  * Unit tests for {@see CellMore} covering the collapsible clamp container, the verbatim body passthrough, and the
  * toggle wiring (delegation attribute, collapsed ARIA state, label).
- *
- * @since 0.1
  */
 #[Group('helpers')]
 #[Group('cell-more')]
@@ -27,8 +25,14 @@ public function testClampUsesStrictSourceLengthThreshold(): void
             CellMore::clamp('content', str_repeat('a', CellMore::THRESHOLD)),
             'Threshold-length source must remain unclamped.',
         );
-        self::assertStringContainsString(
-            'yii-debug-cell-more',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-cell-more">
+            <div class="yii-debug-cell-more-body">
+            content
+            </div><button class="yii-debug-cell-more-toggle" type="button" aria-expanded="false" data-yii-debug-toggle="cell-more">[+] Show more</button>
+            </div>
+            HTML,
             CellMore::clamp('content', str_repeat('a', CellMore::THRESHOLD + 1)),
             'Source beyond the threshold must be clamped.',
         );
@@ -38,56 +42,33 @@ public function testWrapEmitsCollapsedToggleWiredForDelegation(): void
     {
         $html = CellMore::wrap('body');
 
-        self::assertStringContainsString(
-            '<button',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-cell-more">
+            <div class="yii-debug-cell-more-body">
+            body
+            </div><button class="yii-debug-cell-more-toggle" type="button" aria-expanded="false" data-yii-debug-toggle="cell-more">[+] Show more</button>
+            </div>
+            HTML,
             $html,
             'Disclosure control must be a native button.',
         );
-        self::assertStringContainsString(
-            'type="button"',
-            $html,
-            'Button must not submit surrounding forms.',
-        );
-        self::assertStringNotContainsString(
-            'javascript:',
-            $html,
-            'No `javascript:` URI may reach the markup.',
-        );
-        self::assertStringContainsString(
-            'data-yii-debug-toggle="cell-more"',
-            $html,
-            'Toggle must carry the delegation attribute.',
-        );
-        self::assertStringContainsString(
-            'aria-expanded="false"',
-            $html,
-            'Initial state must be collapsed.',
-        );
-        self::assertStringContainsString(
-            '[+] Show more',
-            $html,
-            'Collapsed label must invite expansion.',
-        );
     }
 
     public function testWrapKeepsBodyContentVerbatimInsideClampContainer(): void
     {
         $html = CellMore::wrap('<div class="yii-debug-db-sql">SELECT 1</div>');
 
-        self::assertStringContainsString(
-            'yii-debug-cell-more-body',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-cell-more">
+            <div class="yii-debug-cell-more-body">
+            <div class="yii-debug-db-sql">SELECT 1</div>
+            </div><button class="yii-debug-cell-more-toggle" type="button" aria-expanded="false" data-yii-debug-toggle="cell-more">[+] Show more</button>
+            </div>
+            HTML,
             $html,
             'Body container class must be present.',
         );
-        self::assertStringContainsString(
-            '<div class="yii-debug-db-sql">SELECT 1</div>',
-            $html,
-            'Content must pass through unescaped.',
-        );
-        self::assertStringContainsString(
-            'yii-debug-cell-more',
-            $html,
-            'Clamp container class must be present.',
-        );
     }
 }
diff --git a/tests/Helper/CoerceTest.php b/tests/Helper/CoerceTest.php
index 68efca5..f7c337a 100644
--- a/tests/Helper/CoerceTest.php
+++ b/tests/Helper/CoerceTest.php
@@ -11,8 +11,6 @@
 
 /**
  * Unit tests for {@see Coerce} normalizing mixed values.
- *
- * @since 0.1
  */
 #[Group('helpers')]
 #[Group('coerce')]
@@ -130,12 +128,19 @@ public function testTraceFramesDropsMalformedFramesAndIntegerKeys(): void
     {
         self::assertSame(
             [
-                ['file' => '/app/index.php', 'line' => 10],
+                [
+                    'file' => '/app/index.php',
+                    'line' => 10,
+                ],
                 ['function' => 'run'],
             ],
             Coerce::traceFrames(
                 [
-                    ['file' => '/app/index.php', 'line' => 10, 0 => 'drop'],
+                    [
+                        'file' => '/app/index.php',
+                        'line' => 10,
+                        0 => 'drop',
+                    ],
                     'drop',
                     ['function' => 'run'],
                 ],
diff --git a/tests/Helper/DisclosureTest.php b/tests/Helper/DisclosureTest.php
index 1df8bb1..120430e 100644
--- a/tests/Helper/DisclosureTest.php
+++ b/tests/Helper/DisclosureTest.php
@@ -10,8 +10,6 @@
 
 /**
  * Unit tests for {@see Disclosure} rendering shared collapsible sections.
- *
- * @since 0.1
  */
 #[Group('helpers')]
 #[Group('disclosure')]
@@ -21,21 +19,15 @@ public function testHintRendersBothStateLabelsOutsideTheAccessibilityTree(): voi
     {
         $hint = Disclosure::hint()->render();
 
-        self::assertStringContainsString(
-            'aria-hidden="true"',
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-disclosure-hint" aria-hidden="true"><span data-yii-debug-hint="collapsed">click to expand</span><span data-yii-debug-hint="expanded">click to collapse</span></span>
+            HTML,
             $hint,
             'Hint must stay outside the accessibility tree.',
         );
-        self::assertStringContainsString(
-            'data-yii-debug-hint="collapsed">click to expand',
-            $hint,
-            'Collapsed state must invite expansion.',
-        );
-        self::assertStringContainsString(
-            'data-yii-debug-hint="expanded">click to collapse',
-            $hint,
-            'Expanded state must invite collapse.',
-        );
+
+
     }
 
     public function testRenderEncodesTitleAndKeepsBodyMarkup(): void
diff --git a/tests/Helper/DumpTest.php b/tests/Helper/DumpTest.php
index 2ccc29a..7876a51 100644
--- a/tests/Helper/DumpTest.php
+++ b/tests/Helper/DumpTest.php
@@ -10,8 +10,6 @@
 
 /**
  * Unit tests for {@see Dump} covering the display and parsable renderings of the JSON-safe value domain.
- *
- * @since 0.1
  */
 #[Group('helpers')]
 final class DumpTest extends TestCase
diff --git a/tests/Helper/EmptyStateTest.php b/tests/Helper/EmptyStateTest.php
index 178901e..8995094 100644
--- a/tests/Helper/EmptyStateTest.php
+++ b/tests/Helper/EmptyStateTest.php
@@ -12,8 +12,6 @@
 /**
  * Unit tests for {@see EmptyState} covering the shared empty-state card: container class, headline encoding, trusted
  * body rendering, and body-element ordering.
- *
- * @since 0.1
  */
 #[Group('helpers')]
 #[Group('empty-state')]
@@ -51,8 +49,14 @@ public function testCardRendersBodyChildrenInOrder(): void
 
     public function testCardRendersTrustedBodyMarkupVerbatim(): void
     {
-        self::assertStringContainsString(
-            '<p>Trusted body</p>',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-empty-state">
+            <h2>
+            Nothing captured
+            </h2><p>Trusted body</p>
+            </div>
+            HTML,
             EmptyState::card('Nothing captured', '<p>Trusted body</p>'),
             'Trusted body markup must be rendered verbatim.',
         );
diff --git a/tests/Helper/FormatTest.php b/tests/Helper/FormatTest.php
index ea94cc9..eae7fa6 100644
--- a/tests/Helper/FormatTest.php
+++ b/tests/Helper/FormatTest.php
@@ -10,8 +10,6 @@
 
 /**
  * Unit tests for {@see Format} covering the megabyte readout and the trimmed CSS percentage formatter.
- *
- * @since 0.1
  */
 #[Group('helpers')]
 #[Group('format')]
diff --git a/tests/Helper/FqcnTest.php b/tests/Helper/FqcnTest.php
index 12ad711..bd31235 100644
--- a/tests/Helper/FqcnTest.php
+++ b/tests/Helper/FqcnTest.php
@@ -11,8 +11,6 @@
 /**
  * Unit tests for {@see Fqcn} covering the shared two-tone label markup: namespace/short-name splitting, method-suffix
  * handling, the plain-value and empty-value fallbacks, and the `title` attribute.
- *
- * @since 0.1
  */
 #[Group('helpers')]
 #[Group('fqcn')]
@@ -34,8 +32,10 @@ public function testNamespacePartReturnsPrefixOrEmptyString(): void
 
     public function testRenderLabelExposesFullValueInTitleAttribute(): void
     {
-        self::assertStringContainsString(
-            'title="yii\base\Event"',
+        self::assertSame(
+            <<<HTML
+            <span title="yii\base\Event"><span class="yii-debug-muted">yii\base\</span><wbr><strong>Event</strong></span>
+            HTML,
             Fqcn::renderLabel('yii\\base\\Event'),
             'Full value must sit in the `title` attribute.',
         );
@@ -45,32 +45,28 @@ public function testRenderLabelKeepsMethodSuffixInsideStrongShortName(): void
     {
         $label = Fqcn::renderLabel('yii\\db\\Command::query');
 
-        self::assertStringContainsString(
-            '<strong>Command::query</strong>',
+        self::assertSame(
+            <<<HTML
+            <span title="yii\db\Command::query"><span class="yii-debug-muted">yii\db\</span><wbr><strong>Command::query</strong></span>
+            HTML,
             $label,
             'Method pair must render bold as one segment.',
         );
-        self::assertStringContainsString(
-            'yii\db\\',
-            $label,
-            'Namespace prefix must keep its trailing separator.',
-        );
+
     }
 
     public function testRenderLabelOmitsMutedPrefixForPlainValues(): void
     {
         $label = Fqcn::renderLabel('application');
 
-        self::assertStringContainsString(
-            '<strong>application</strong>',
+        self::assertSame(
+            <<<HTML
+            <span title="application"><strong>application</strong></span>
+            HTML,
             $label,
             'Plain value must render bold.',
         );
-        self::assertStringNotContainsString(
-            'yii-debug-muted',
-            $label,
-            'Plain values must not emit a namespace prefix.',
-        );
+
     }
 
     public function testRenderLabelRendersEmDashForEmptyValue(): void
@@ -93,16 +89,14 @@ public function testRenderLabelSplitsNamespacedValueIntoMutedNamespaceAndStrongS
             $label,
             'Namespaced labels must keep the namespace, break opportunity, and short name in display order.',
         );
-        self::assertStringContainsString(
-            'yii-debug-muted',
+        self::assertSame(
+            <<<HTML
+            <span title="yii\base\Event"><span class="yii-debug-muted">yii\base\</span><wbr><strong>Event</strong></span>
+            HTML,
             $label,
             'Namespace prefix must render muted.',
         );
-        self::assertStringContainsString(
-            '<strong>Event</strong>',
-            $label,
-            'Short name must render bold.',
-        );
+
     }
 
     public function testShortNameReturnsFinalSegmentOrOriginalValue(): void
diff --git a/tests/Helper/GaugeTest.php b/tests/Helper/GaugeTest.php
index 331e719..ba2ac0d 100644
--- a/tests/Helper/GaugeTest.php
+++ b/tests/Helper/GaugeTest.php
@@ -10,8 +10,6 @@
 
 /**
  * Unit tests for {@see Gauge} covering the micro-gauge markup, the no-scale passthrough, and the percentage clamps.
- *
- * @since 0.1
  */
 #[Group('helpers')]
 #[Group('gauge')]
@@ -19,13 +17,17 @@ final class GaugeTest extends TestCase
 {
     public function testRenderClampsPercentagesIntoTheRailRange(): void
     {
-        self::assertStringContainsString(
-            "style='--yii-debug-gauge: 100%;'",
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-gauge" style='--yii-debug-gauge: 100%;'><span class="yii-debug-gauge-value">big</span><span class="yii-debug-gauge-bar" aria-hidden="true"></span></span>
+            HTML,
             Gauge::render('big', 2.0, 1.0),
             'Values above the maximum must clamp to `100%`.',
         );
-        self::assertStringContainsString(
-            "style='--yii-debug-gauge: 0%;'",
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-gauge" style='--yii-debug-gauge: 0%;'><span class="yii-debug-gauge-value">negative</span><span class="yii-debug-gauge-bar" aria-hidden="true"></span></span>
+            HTML,
             Gauge::render('negative', -1.0, 4.0),
             'Negative values must clamp to `0%`.',
         );
@@ -47,8 +49,10 @@ public function testRenderReturnsValueUntouchedWithoutPositiveMax(): void
 
     public function testRenderRoundsTheRailPercentageToThreeDecimals(): void
     {
-        self::assertStringContainsString(
-            "style='--yii-debug-gauge: 33.333%;'",
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-gauge" style='--yii-debug-gauge: 33.333%;'><span class="yii-debug-gauge-value">1 ms</span><span class="yii-debug-gauge-bar" aria-hidden="true"></span></span>
+            HTML,
             Gauge::render('1 ms', 1.0, 3.0),
             'Thirds must round to three decimals.',
         );
diff --git a/tests/Helper/IconTest.php b/tests/Helper/IconTest.php
index f36a0bc..457cd33 100644
--- a/tests/Helper/IconTest.php
+++ b/tests/Helper/IconTest.php
@@ -11,8 +11,6 @@
 
 /**
  * Unit tests for {@see Icon} covering the file-resolution and in-memory cache branches of the SVG renderer.
- *
- * @since 0.1
  */
 #[Group('helpers')]
 #[Group('icon')]
@@ -59,8 +57,10 @@ public function testRenderReturnsSanitizedMarkupForBundledIcon(): void
             $markup,
             'Bundled icons must produce non-empty SVG markup.',
         );
-        self::assertStringContainsString(
-            '<svg',
+        self::assertSame(
+            <<<HTML
+            <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="9"/><path d="M12 7v5l3 2"/></svg>
+            HTML,
             $markup,
             'Rendered markup must include the opening `<svg>` tag.',
         );
diff --git a/tests/Helper/LogLevelTest.php b/tests/Helper/LogLevelTest.php
index cd296c2..5b38e15 100644
--- a/tests/Helper/LogLevelTest.php
+++ b/tests/Helper/LogLevelTest.php
@@ -10,8 +10,6 @@
 
 /**
  * Unit tests for {@see LogLevel} pinning the wire values shared with the Yii logger constants.
- *
- * @since 0.1
  */
 #[Group('helpers')]
 final class LogLevelTest extends TestCase
@@ -53,7 +51,11 @@ public function testNameMapsWireValuesToTheYiiLoggerNames(): void
             LogLevel::name(LogLevel::PROFILE_END),
             'Profile-end marker must keep the logger name.',
         );
-        self::assertSame('unknown', LogLevel::name(0x999), 'Unrecognized values must degrade to unknown.');
+        self::assertSame(
+            'unknown',
+            LogLevel::name(0x999),
+            'Unrecognized values must degrade to unknown.',
+        );
     }
     public function testWireValuesMatchTheYiiLoggerConstants(): void
     {
diff --git a/tests/Helper/SensitiveDataRedactorTest.php b/tests/Helper/SensitiveDataRedactorTest.php
index 5501b63..2bd109c 100644
--- a/tests/Helper/SensitiveDataRedactorTest.php
+++ b/tests/Helper/SensitiveDataRedactorTest.php
@@ -10,8 +10,6 @@
 
 /**
  * Unit tests for {@see SensitiveDataRedactor} covering exact, case-insensitive, and nested key replacement.
- *
- * @since 0.1
  */
 #[Group('helpers')]
 final class SensitiveDataRedactorTest extends TestCase
@@ -31,7 +29,11 @@ public function testDefaultPolicyBoundsDepthAndNodeTraversal(): void
             json_encode(SensitiveDataRedactor::redact($deep), JSON_THROW_ON_ERROR),
             'Redaction must stop traversing beyond the depth budget.',
         );
-        self::assertCount(10_001, $wide, 'Redaction must retain one explicit marker at the node boundary.');
+        self::assertCount(
+            10_001,
+            $wide,
+            'Redaction must retain one explicit marker at the node boundary.',
+        );
         self::assertSame(
             SensitiveDataRedactor::TRUNCATED,
             $wide[10_000] ?? null,
@@ -39,6 +41,29 @@ public function testDefaultPolicyBoundsDepthAndNodeTraversal(): void
         );
     }
 
+    public function testDefaultPolicyPreservesTheExactDepthBoundaryAndLaterSiblings(): void
+    {
+        $value = [
+            'tooDeep' => ['password' => 'secret'],
+            'after' => 'preserved',
+        ];
+        $expected = [
+            'tooDeep' => SensitiveDataRedactor::TRUNCATED,
+            'after' => 'preserved',
+        ];
+
+        for ($depth = 0; $depth < 10; $depth++) {
+            $value = ['nested' => $value];
+            $expected = ['nested' => $expected];
+        }
+
+        self::assertSame(
+            $expected,
+            SensitiveDataRedactor::redact($value),
+            'Only arrays beyond depth ten must truncate, without dropping later siblings.',
+        );
+    }
+
     public function testRedactNormalizesNestedPublicObjectsBeforeTraversal(): void
     {
         self::assertSame(
diff --git a/tests/Helper/TabsTest.php b/tests/Helper/TabsTest.php
index 7fb96f1..96a2cca 100644
--- a/tests/Helper/TabsTest.php
+++ b/tests/Helper/TabsTest.php
@@ -11,8 +11,6 @@
 
 /**
  * Unit tests for {@see Tabs} covering the accessible active and inactive tab states.
- *
- * @since 0.1
  */
 #[Group('helpers')]
 final class TabsTest extends TestCase
@@ -36,35 +34,36 @@ public function testRenderMarksOnlyTheFirstTabAndPanelAsActive(): void
             'example',
             'Example tabs',
             [
-                ['label' => 'First', 'content' => '<p>One</p>'],
-                ['label' => 'Second', 'content' => '<p>Two</p>'],
+                [
+                    'label' => 'First',
+                    'content' => '<p>One</p>',
+                ],
+                [
+                    'label' => 'Second',
+                    'content' => '<p>Two</p>',
+                ],
             ],
         );
 
-        self::assertStringContainsString(
-            '<a class="yii-debug-tab-link is-active" id="example-tab-0" href="#example-panel-0" role="tab" '
-            . 'tabindex="0" aria-controls="example-panel-0" aria-selected="true" data-yii-debug-toggle="tab">First</a>',
+        self::assertSame(
+            <<<HTML
+            <ul class="yii-debug-tabs" role="tablist" aria-label="Example tabs">
+            <li class="yii-debug-tab" role="presentation">
+            <a class="yii-debug-tab-link is-active" id="example-tab-0" href="#example-panel-0" role="tab" tabindex="0" aria-controls="example-panel-0" aria-selected="true" data-yii-debug-toggle="tab">First</a>
+            </li><li class="yii-debug-tab" role="presentation">
+            <a class="yii-debug-tab-link" id="example-tab-1" href="#example-panel-1" role="tab" tabindex="-1" aria-controls="example-panel-1" aria-selected="false" data-yii-debug-toggle="tab">Second</a>
+            </li>
+            </ul><div class="yii-debug-tab-content">
+            <div class="yii-debug-tab-panel is-active" id="example-panel-0" role="tabpanel" aria-labelledby="example-tab-0">
+            <p>One</p>
+            </div><div class="yii-debug-tab-panel" id="example-panel-1" role="tabpanel" aria-labelledby="example-tab-1" hidden>
+            <p>Two</p>
+            </div>
+            </div>
+            HTML,
             $html,
             'First tab must be selected, active, and keyboard-focusable.',
         );
-        self::assertStringContainsString(
-            '<a class="yii-debug-tab-link" id="example-tab-1" href="#example-panel-1" role="tab" tabindex="-1" '
-            . 'aria-controls="example-panel-1" aria-selected="false" data-yii-debug-toggle="tab">Second</a>',
-            $html,
-            'Inactive tab must be unselected and removed from the initial tab order.',
-        );
-        self::assertStringContainsString(
-            '<div class="yii-debug-tab-panel is-active" id="example-panel-0" role="tabpanel" '
-            . 'aria-labelledby="example-tab-0">',
-            $html,
-            'First panel must be active and visible.',
-        );
-        self::assertStringContainsString(
-            '<div class="yii-debug-tab-panel" id="example-panel-1" role="tabpanel" '
-            . 'aria-labelledby="example-tab-1" hidden>',
-            $html,
-            'Inactive panel must remain hidden until its tab is selected.',
-        );
     }
 
     public function testRenderSelectsTheRequestedInitialTab(): void
@@ -89,8 +88,14 @@ public function testRenderSelectsTheRequestedInitialTab(): void
                 'example',
                 'Example tabs',
                 [
-                    ['label' => 'First', 'content' => '<p>One</p>'],
-                    ['label' => 'Second', 'content' => '<p>Two</p>'],
+                    [
+                        'label' => 'First',
+                        'content' => '<p>One</p>',
+                    ],
+                    [
+                        'label' => 'Second',
+                        'content' => '<p>Two</p>',
+                    ],
                 ],
                 1,
             ),
@@ -101,12 +106,19 @@ public function testRenderSelectsTheRequestedInitialTab(): void
     public function testRenderThrowsForANegativeActiveIndex(): void
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The active tab index must identify a supplied tab.');
+        $this->expectExceptionMessage(
+            'The active tab index must identify a supplied tab.',
+        );
 
         Tabs::render(
             'example',
             'Example tabs',
-            [['label' => 'First', 'content' => '<p>One</p>']],
+            [
+                [
+                    'label' => 'First',
+                    'content' => '<p>One</p>',
+                ],
+            ],
             -1,
         );
     }
@@ -114,12 +126,19 @@ public function testRenderThrowsForANegativeActiveIndex(): void
     public function testRenderThrowsForAnOutOfRangeActiveIndex(): void
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The active tab index must identify a supplied tab.');
+        $this->expectExceptionMessage(
+            'The active tab index must identify a supplied tab.',
+        );
 
         Tabs::render(
             'example',
             'Example tabs',
-            [['label' => 'First', 'content' => '<p>One</p>']],
+            [
+                [
+                    'label' => 'First',
+                    'content' => '<p>One</p>',
+                ],
+            ],
             1,
         );
     }
diff --git a/tests/Helper/VocabularyTest.php b/tests/Helper/VocabularyTest.php
index 05c1734..2605cf9 100644
--- a/tests/Helper/VocabularyTest.php
+++ b/tests/Helper/VocabularyTest.php
@@ -10,8 +10,6 @@
 
 /**
  * Unit tests for {@see Vocabulary} mapping HTTP and SQL values to semantic suffixes.
- *
- * @since 0.1
  */
 #[Group('helpers')]
 #[Group('vocabulary')]
diff --git a/tests/Instrumentation/InstrumentationGuardTest.php b/tests/Instrumentation/InstrumentationGuardTest.php
index 1f36e41..1037abb 100644
--- a/tests/Instrumentation/InstrumentationGuardTest.php
+++ b/tests/Instrumentation/InstrumentationGuardTest.php
@@ -20,26 +20,40 @@ public function testObserveExecutesSuccessfulObserver(): void
     {
         $observed = false;
 
-        (new InstrumentationGuard())->observe(static function () use (&$observed): void {
-            $observed = true;
-        });
+        (new InstrumentationGuard())
+            ->observe(
+                static function () use (&$observed): void {
+                    $observed = true;
+                },
+            );
 
-        self::assertTrue($observed, 'A successful diagnostic observer must run exactly where invoked.');
+        self::assertTrue(
+            $observed,
+            'A successful diagnostic observer must run exactly where invoked.',
+        );
     }
 
     public function testObserveReportsExactFailureWithoutPropagatingIt(): void
     {
         $expected = new RuntimeException('Collector failed.');
+
         $reported = null;
+
         $guard = new InstrumentationGuard(
             static function (Throwable $failure) use (&$reported): void {
                 $reported = $failure;
             },
         );
 
-        $guard->observe(static fn(): never => throw $expected);
+        $guard->observe(
+            static fn(): never => throw $expected,
+        );
 
-        self::assertSame($expected, $reported, 'The failure handler must receive the exact instrumentation throwable.');
+        self::assertSame(
+            $expected,
+            $reported,
+            'The failure handler must receive the exact instrumentation throwable.',
+        );
     }
 
     public function testObserveSuppressesFailureHandlerException(): void
@@ -50,7 +64,9 @@ public function testObserveSuppressesFailureHandlerException(): void
             static fn(Throwable $_failure): never => throw new RuntimeException('Handler failed.'),
         );
 
-        $guard->observe(static fn(): never => throw new RuntimeException('Collector failed.'));
+        $guard->observe(
+            static fn(): never => throw new RuntimeException('Collector failed.'),
+        );
 
     }
 
@@ -58,8 +74,9 @@ public function testObserveSuppressesFailureWithoutAHandler(): void
     {
         $this->expectNotToPerformAssertions();
 
-        (new InstrumentationGuard())->observe(
-            static fn(): never => throw new RuntimeException('Collector failed.'),
-        );
+        (new InstrumentationGuard())
+            ->observe(
+                static fn(): never => throw new RuntimeException('Collector failed.'),
+            );
     }
 }
diff --git a/tests/Panel/Asset/AssetBundleNormalizerTest.php b/tests/Panel/Asset/AssetBundleNormalizerTest.php
index 40d031b..4e7a8e0 100644
--- a/tests/Panel/Asset/AssetBundleNormalizerTest.php
+++ b/tests/Panel/Asset/AssetBundleNormalizerTest.php
@@ -17,8 +17,6 @@
  * file-label unwrapping and `bodyCols` layout hint computation.
  *
  * {@see AssetBundleNormalizerProvider} for test case data providers.
- *
- * @since 0.1
  */
 #[Group('panel')]
 #[Group('asset')]
@@ -36,14 +34,20 @@ public function testNormalizeAggregatesTotalsAcrossBundles(): void
                             'depends' => ['app\\B'],
                         ],
                         'app\\B' => [
-                            'css' => ['b.css', 'c.css'],
+                            'css' => [
+                                'b.css',
+                                'c.css',
+                            ],
                             'js' => [],
                             'depends' => [],
                         ],
                         'app\\C' => [
                             'css' => [],
                             'js' => ['c.js'],
-                            'depends' => ['app\\A', 'app\\B'],
+                            'depends' => [
+                                'app\\A',
+                                'app\\B',
+                            ],
                         ],
                     ],
                 ),
diff --git a/tests/Panel/Asset/AssetCardRendererTest.php b/tests/Panel/Asset/AssetCardRendererTest.php
index 23812f0..6b989a6 100644
--- a/tests/Panel/Asset/AssetCardRendererTest.php
+++ b/tests/Panel/Asset/AssetCardRendererTest.php
@@ -30,16 +30,34 @@ public function testRenderCardEmitsArticleWithBundleAnchorId(): void
 
         $html = AssetCardRenderer::renderCard($bundle, $summary)->render();
 
-        self::assertStringContainsString(
-            'class="yii-debug-asset-card"',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-asset-card" id="app\-app-asset">
+            <header class="yii-debug-asset-card-head">
+            <span class="yii-debug-asset-card-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m12 3l8 4.5v9L12 21l-8-4.5v-9zm0 9l8-4.5M12 12v9m0-9L4 7.5m12-2.25l-8 4.5"/></svg></span><div class="yii-debug-asset-card-title">
+            <h2 class="yii-debug-asset-card-name">
+            AppAsset
+            </h2><span class="yii-debug-asset-card-fqcn">app\</span>
+            </div><div class="yii-debug-asset-card-meta">
+            <span class="yii-debug-asset-chip yii-debug-asset-chip-css"><strong>1</strong> css</span>
+            </div>
+            </header><div class="yii-debug-asset-card-body" data-cols="1">
+            <section class="yii-debug-asset-section">
+            <h3 class="yii-debug-asset-section-title">
+            Files
+            </h3><div class="yii-debug-asset-files">
+            <div class="yii-debug-asset-file">
+            <span class="yii-debug-asset-file-type yii-debug-asset-file-type-css">.css</span><span class="yii-debug-asset-file-name" title="style.css">style.css</span>
+            </div>
+            </div>
+            </section>
+            </div>
+            </article>
+            HTML,
             $html,
             'Card must carry the wrapper class.',
         );
-        self::assertStringContainsString(
-            "id=\"{$bundle->id}\"",
-            $html,
-            'Card must expose the bundle anchor id.',
-        );
+
     }
 
     public function testRenderCardEmitsCssFilesListAndChipForCssOnlyBundle(): void
@@ -50,23 +68,38 @@ public function testRenderCardEmitsCssFilesListAndChipForCssOnlyBundle(): void
             );
 
         $bundle = $summary->bundles[0] ?? self::fail('Expected one bundle.');
+
         $html = AssetCardRenderer::renderCard($bundle, $summary)->render();
 
-        self::assertStringContainsString(
-            '<strong>1</strong> css<',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-asset-card" id="app\-app-asset">
+            <header class="yii-debug-asset-card-head">
+            <span class="yii-debug-asset-card-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m12 3l8 4.5v9L12 21l-8-4.5v-9zm0 9l8-4.5M12 12v9m0-9L4 7.5m12-2.25l-8 4.5"/></svg></span><div class="yii-debug-asset-card-title">
+            <h2 class="yii-debug-asset-card-name">
+            AppAsset
+            </h2><span class="yii-debug-asset-card-fqcn">app\</span>
+            </div><div class="yii-debug-asset-card-meta">
+            <span class="yii-debug-asset-chip yii-debug-asset-chip-css"><strong>1</strong> css</span>
+            </div>
+            </header><div class="yii-debug-asset-card-body" data-cols="1">
+            <section class="yii-debug-asset-section">
+            <h3 class="yii-debug-asset-section-title">
+            Files
+            </h3><div class="yii-debug-asset-files">
+            <div class="yii-debug-asset-file">
+            <span class="yii-debug-asset-file-type yii-debug-asset-file-type-css">.css</span><span class="yii-debug-asset-file-name" title="app.css">app.css</span>
+            </div>
+            </div>
+            </section>
+            </div>
+            </article>
+            HTML,
             $html,
             "CSS-only bundle must render the 'css' chip.",
         );
-        self::assertStringContainsString(
-            'class="yii-debug-asset-file-type yii-debug-asset-file-type-css"',
-            $html,
-            'CSS file rows must be rendered through the typed file renderer.',
-        );
-        self::assertStringContainsString(
-            'title="app.css">app.css<',
-            $html,
-            'CSS file rows must retain the file label and tooltip.',
-        );
+
+
     }
 
     public function testRenderCardEmitsJsFilesListAndChipForJsOnlyBundle(): void
@@ -80,21 +113,35 @@ public function testRenderCardEmitsJsFilesListAndChipForJsOnlyBundle(): void
 
         $html = AssetCardRenderer::renderCard($bundle, $summary)->render();
 
-        self::assertStringContainsString(
-            '<strong>1</strong> js<',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-asset-card" id="app\-app-asset">
+            <header class="yii-debug-asset-card-head">
+            <span class="yii-debug-asset-card-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m12 3l8 4.5v9L12 21l-8-4.5v-9zm0 9l8-4.5M12 12v9m0-9L4 7.5m12-2.25l-8 4.5"/></svg></span><div class="yii-debug-asset-card-title">
+            <h2 class="yii-debug-asset-card-name">
+            AppAsset
+            </h2><span class="yii-debug-asset-card-fqcn">app\</span>
+            </div><div class="yii-debug-asset-card-meta">
+            <span class="yii-debug-asset-chip yii-debug-asset-chip-js"><strong>1</strong> js</span>
+            </div>
+            </header><div class="yii-debug-asset-card-body" data-cols="1">
+            <section class="yii-debug-asset-section">
+            <h3 class="yii-debug-asset-section-title">
+            Files
+            </h3><div class="yii-debug-asset-files">
+            <div class="yii-debug-asset-file">
+            <span class="yii-debug-asset-file-type yii-debug-asset-file-type-js">.js</span><span class="yii-debug-asset-file-name" title="app.js">app.js</span>
+            </div>
+            </div>
+            </section>
+            </div>
+            </article>
+            HTML,
             $html,
             "JS-only bundle must render the 'js' chip.",
         );
-        self::assertStringContainsString(
-            'yii-debug-asset-file-type-js',
-            $html,
-            'JS file row must carry the type modifier class.',
-        );
-        self::assertStringContainsString(
-            'app.js',
-            $html,
-            'JS file label must be rendered.',
-        );
+
+
     }
 
     public function testRenderCardEmitsPluralChipForMultipleDependencies(): void
@@ -118,8 +165,30 @@ public function testRenderCardEmitsPluralChipForMultipleDependencies(): void
 
         $html = AssetCardRenderer::renderCard($bundle, $summary)->render();
 
-        self::assertStringContainsString(
-            '<strong>3</strong> deps<',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-asset-card" id="app\-app-asset">
+            <header class="yii-debug-asset-card-head">
+            <span class="yii-debug-asset-card-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m12 3l8 4.5v9L12 21l-8-4.5v-9zm0 9l8-4.5M12 12v9m0-9L4 7.5m12-2.25l-8 4.5"/></svg></span><div class="yii-debug-asset-card-title">
+            <h2 class="yii-debug-asset-card-name">
+            AppAsset
+            </h2><span class="yii-debug-asset-card-fqcn">app\</span>
+            </div><div class="yii-debug-asset-card-meta">
+            <span class="yii-debug-asset-chip yii-debug-asset-chip-deps"><strong>3</strong> deps</span>
+            </div>
+            </header><div class="yii-debug-asset-card-body" data-cols="1">
+            <section class="yii-debug-asset-section">
+            <h3 class="yii-debug-asset-section-title">
+            Wiring
+            </h3><div class="yii-debug-asset-depends">
+            <span class="yii-debug-asset-depends-label">Depends on 3</span><div class="yii-debug-asset-depends-list">
+            <a class="yii-debug-asset-depend" href="#app\-a" title="app\A"><span class="yii-debug-asset-depend-icon" aria-hidden="true">↳</span><span class="yii-debug-asset-depend-name">A</span></a><a class="yii-debug-asset-depend" href="#app\-b" title="app\B"><span class="yii-debug-asset-depend-icon" aria-hidden="true">↳</span><span class="yii-debug-asset-depend-name">B</span></a><a class="yii-debug-asset-depend" href="#app\-c" title="app\C"><span class="yii-debug-asset-depend-icon" aria-hidden="true">↳</span><span class="yii-debug-asset-depend-name">C</span></a>
+            </div>
+            </div>
+            </section>
+            </div>
+            </article>
+            HTML,
             $html,
             "Multiple dependencies must read 'N deps'.",
         );
@@ -141,8 +210,19 @@ public function testRenderCardEmitsShortNameAndNamespacePrefix(): void
             $html,
             'Header must render the bundle short name.',
         );
-        self::assertStringContainsString(
-            'class="yii-debug-asset-card-fqcn">vendor\\package\\<',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-asset-card" id="vendor\package\-app-asset">
+            <header class="yii-debug-asset-card-head">
+            <span class="yii-debug-asset-card-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m12 3l8 4.5v9L12 21l-8-4.5v-9zm0 9l8-4.5M12 12v9m0-9L4 7.5m12-2.25l-8 4.5"/></svg></span><div class="yii-debug-asset-card-title">
+            <h2 class="yii-debug-asset-card-name">
+            AppAsset
+            </h2><span class="yii-debug-asset-card-fqcn">vendor\package\</span>
+            </div><div class="yii-debug-asset-card-meta">
+            </div>
+            </header>
+            </article>
+            HTML,
             $html,
             'Header must render the namespace prefix.',
         );
@@ -159,16 +239,33 @@ public function testRenderCardEmitsSingularChipForOneDependency(): void
 
         $html = AssetCardRenderer::renderCard($bundle, $summary)->render();
 
-        self::assertStringContainsString(
-            '<strong>1</strong> dep<',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-asset-card" id="app\-app-asset">
+            <header class="yii-debug-asset-card-head">
+            <span class="yii-debug-asset-card-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m12 3l8 4.5v9L12 21l-8-4.5v-9zm0 9l8-4.5M12 12v9m0-9L4 7.5m12-2.25l-8 4.5"/></svg></span><div class="yii-debug-asset-card-title">
+            <h2 class="yii-debug-asset-card-name">
+            AppAsset
+            </h2><span class="yii-debug-asset-card-fqcn">app\</span>
+            </div><div class="yii-debug-asset-card-meta">
+            <span class="yii-debug-asset-chip yii-debug-asset-chip-deps"><strong>1</strong> dep</span>
+            </div>
+            </header><div class="yii-debug-asset-card-body" data-cols="1">
+            <section class="yii-debug-asset-section">
+            <h3 class="yii-debug-asset-section-title">
+            Wiring
+            </h3><div class="yii-debug-asset-depends">
+            <span class="yii-debug-asset-depends-label">Depends on 1</span><div class="yii-debug-asset-depends-list">
+            <a class="yii-debug-asset-depend" href="#app\-other" title="app\Other"><span class="yii-debug-asset-depend-icon" aria-hidden="true">↳</span><span class="yii-debug-asset-depend-name">Other</span></a>
+            </div>
+            </div>
+            </section>
+            </div>
+            </article>
+            HTML,
             $html,
             "Single dependency must read '1 dep'.",
         );
-        self::assertStringNotContainsString(
-            '1</strong> deps<',
-            $html,
-            "Singular form must not pluralize to 'deps'.",
-        );
     }
 
     public function testRenderCardEmitsTwoColumnLayoutWhenFilesAndWiringPresent(): void
@@ -189,21 +286,47 @@ public function testRenderCardEmitsTwoColumnLayoutWhenFilesAndWiringPresent(): v
 
         $html = AssetCardRenderer::renderCard($bundle, $summary)->render();
 
-        self::assertStringContainsString(
-            'data-cols="2"',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-asset-card" id="app\-app-asset">
+            <header class="yii-debug-asset-card-head">
+            <span class="yii-debug-asset-card-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m12 3l8 4.5v9L12 21l-8-4.5v-9zm0 9l8-4.5M12 12v9m0-9L4 7.5m12-2.25l-8 4.5"/></svg></span><div class="yii-debug-asset-card-title">
+            <h2 class="yii-debug-asset-card-name">
+            AppAsset
+            </h2><span class="yii-debug-asset-card-fqcn">app\</span>
+            </div><div class="yii-debug-asset-card-meta">
+            <span class="yii-debug-asset-chip yii-debug-asset-chip-css"><strong>1</strong> css</span>
+            </div>
+            </header><div class="yii-debug-asset-card-body" data-cols="2">
+            <section class="yii-debug-asset-section">
+            <h3 class="yii-debug-asset-section-title">
+            Files
+            </h3><div class="yii-debug-asset-files">
+            <div class="yii-debug-asset-file">
+            <span class="yii-debug-asset-file-type yii-debug-asset-file-type-css">.css</span><span class="yii-debug-asset-file-name" title="app.css">app.css</span>
+            </div>
+            </div>
+            </section><section class="yii-debug-asset-section">
+            <h3 class="yii-debug-asset-section-title">
+            Wiring
+            </h3><dl class="yii-debug-asset-wiring">
+            <div class="yii-debug-asset-wiring-row">
+            <dt class="yii-debug-asset-wiring-label">
+            source
+            </dt><dd class="yii-debug-asset-wiring-value">
+            @app/assets
+            </dd>
+            </div>
+            </dl>
+            </section>
+            </div>
+            </article>
+            HTML,
             $html,
             "Files + wiring must produce a '2-column' body.",
         );
-        self::assertStringContainsString(
-            'Files',
-            $html,
-            'Files section heading must be present.',
-        );
-        self::assertStringContainsString(
-            'Wiring',
-            $html,
-            'Wiring section heading must be present.',
-        );
+
+
     }
 
     public function testRenderCardLinksDependencyToRegisteredAnchor(): void
@@ -219,25 +342,36 @@ public function testRenderCardLinksDependencyToRegisteredAnchor(): void
             );
 
         $bundle = $summary->bundles[0] ?? self::fail('Expected the source bundle.');
-        $target = $summary->bundles[1] ?? self::fail('Expected the target bundle.');
 
         $html = AssetCardRenderer::renderCard($bundle, $summary)->render();
 
-        self::assertStringContainsString(
-            "href=\"#{$target->id}\"",
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-asset-card" id="app\-app-asset">
+            <header class="yii-debug-asset-card-head">
+            <span class="yii-debug-asset-card-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m12 3l8 4.5v9L12 21l-8-4.5v-9zm0 9l8-4.5M12 12v9m0-9L4 7.5m12-2.25l-8 4.5"/></svg></span><div class="yii-debug-asset-card-title">
+            <h2 class="yii-debug-asset-card-name">
+            AppAsset
+            </h2><span class="yii-debug-asset-card-fqcn">app\</span>
+            </div><div class="yii-debug-asset-card-meta">
+            <span class="yii-debug-asset-chip yii-debug-asset-chip-deps"><strong>1</strong> dep</span>
+            </div>
+            </header><div class="yii-debug-asset-card-body" data-cols="1">
+            <section class="yii-debug-asset-section">
+            <h3 class="yii-debug-asset-section-title">
+            Wiring
+            </h3><div class="yii-debug-asset-depends">
+            <span class="yii-debug-asset-depends-label">Depends on 1</span><div class="yii-debug-asset-depends-list">
+            <a class="yii-debug-asset-depend" href="#app\-target" title="app\Target"><span class="yii-debug-asset-depend-icon" aria-hidden="true">↳</span><span class="yii-debug-asset-depend-name">Target</span></a>
+            </div>
+            </div>
+            </section>
+            </div>
+            </article>
+            HTML,
             $html,
             'Dep link must target the registered anchor.',
         );
-        self::assertStringContainsString(
-            'title="app\\Target"',
-            $html,
-            'Dep link must keep the FQCN in the title.',
-        );
-        self::assertStringContainsString(
-            '>Target<',
-            $html,
-            'Dep link must show the short class name.',
-        );
     }
 
     public function testRenderCardOmitsBodyWhenBundleHasNoFilesOrWiringOrDeps(): void
@@ -251,21 +385,22 @@ public function testRenderCardOmitsBodyWhenBundleHasNoFilesOrWiringOrDeps(): voi
 
         $html = AssetCardRenderer::renderCard($bundle, $summary)->render();
 
-        self::assertStringNotContainsString(
-            'yii-debug-asset-card-body',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-asset-card" id="app\-bare-asset">
+            <header class="yii-debug-asset-card-head">
+            <span class="yii-debug-asset-card-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m12 3l8 4.5v9L12 21l-8-4.5v-9zm0 9l8-4.5M12 12v9m0-9L4 7.5m12-2.25l-8 4.5"/></svg></span><div class="yii-debug-asset-card-title">
+            <h2 class="yii-debug-asset-card-name">
+            BareAsset
+            </h2><span class="yii-debug-asset-card-fqcn">app\</span>
+            </div><div class="yii-debug-asset-card-meta">
+            </div>
+            </header>
+            </article>
+            HTML,
             $html,
             'Empty bundles must omit the card body.',
         );
-        self::assertStringNotContainsString(
-            'yii-debug-asset-section',
-            $html,
-            'No body means no sections.',
-        );
-        self::assertStringNotContainsString(
-            'yii-debug-asset-chip-',
-            $html,
-            'Zero CSS, JS, and dependency counts must omit their header chips.',
-        );
     }
 
     public function testRenderCardWiringRendersBasePathRow(): void
@@ -284,8 +419,33 @@ public function testRenderCardWiringRendersBasePathRow(): void
             $html,
             "Populated 'basePath' must render its row.",
         );
-        self::assertStringContainsString(
-            '@webroot/assets',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-asset-card" id="app\-app-asset">
+            <header class="yii-debug-asset-card-head">
+            <span class="yii-debug-asset-card-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m12 3l8 4.5v9L12 21l-8-4.5v-9zm0 9l8-4.5M12 12v9m0-9L4 7.5m12-2.25l-8 4.5"/></svg></span><div class="yii-debug-asset-card-title">
+            <h2 class="yii-debug-asset-card-name">
+            AppAsset
+            </h2><span class="yii-debug-asset-card-fqcn">app\</span>
+            </div><div class="yii-debug-asset-card-meta">
+            </div>
+            </header><div class="yii-debug-asset-card-body" data-cols="1">
+            <section class="yii-debug-asset-section">
+            <h3 class="yii-debug-asset-section-title">
+            Wiring
+            </h3><dl class="yii-debug-asset-wiring">
+            <div class="yii-debug-asset-wiring-row">
+            <dt class="yii-debug-asset-wiring-label">
+            base
+            </dt><dd class="yii-debug-asset-wiring-value">
+            @webroot/assets
+            </dd>
+            </div>
+            </dl>
+            </section>
+            </div>
+            </article>
+            HTML,
             $html,
             "Populated 'basePath' value must be rendered.",
         );
@@ -307,8 +467,33 @@ public function testRenderCardWiringRendersOnlyPopulatedFields(): void
             $html,
             "Populated 'baseUrl' must render its row.",
         );
-        self::assertStringContainsString(
-            '/assets',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-asset-card" id="app\-app-asset">
+            <header class="yii-debug-asset-card-head">
+            <span class="yii-debug-asset-card-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m12 3l8 4.5v9L12 21l-8-4.5v-9zm0 9l8-4.5M12 12v9m0-9L4 7.5m12-2.25l-8 4.5"/></svg></span><div class="yii-debug-asset-card-title">
+            <h2 class="yii-debug-asset-card-name">
+            AppAsset
+            </h2><span class="yii-debug-asset-card-fqcn">app\</span>
+            </div><div class="yii-debug-asset-card-meta">
+            </div>
+            </header><div class="yii-debug-asset-card-body" data-cols="1">
+            <section class="yii-debug-asset-section">
+            <h3 class="yii-debug-asset-section-title">
+            Wiring
+            </h3><dl class="yii-debug-asset-wiring">
+            <div class="yii-debug-asset-wiring-row">
+            <dt class="yii-debug-asset-wiring-label">
+            url
+            </dt><dd class="yii-debug-asset-wiring-value">
+            /assets
+            </dd>
+            </div>
+            </dl>
+            </section>
+            </div>
+            </article>
+            HTML,
             $html,
             "Populated 'baseUrl' value must be rendered.",
         );
diff --git a/tests/Panel/CapturedSnapshotTest.php b/tests/Panel/CapturedSnapshotTest.php
index 8cb238f..993f35f 100644
--- a/tests/Panel/CapturedSnapshotTest.php
+++ b/tests/Panel/CapturedSnapshotTest.php
@@ -27,12 +27,12 @@ public function testDumpSnapshotCapturesAndHydratesRows(): void
         $captured = DumpSnapshot::capture(
             [
                 ['dump', LogLevel::INFO, 'application', 1_700_000_000.5, [['file' => '/app/index.php']]],
-                'invalid',
             ],
         );
         $payload = $captured->jsonSerialize();
 
         $snapshot = DumpSnapshot::fromArray($payload, '$.panels.dump');
+
         $capturedRow = $captured->entries()[0] ?? self::fail('Expected one captured dump row.');
         $row = $snapshot->entries()[0] ?? self::fail('Expected one hydrated dump row.');
 
@@ -85,13 +85,62 @@ public function testLogSnapshotCapturesLinksAndHydratesRows(): void
         $captured = LogSnapshot::capture(
             [
                 ['first', LogLevel::INFO, 'application', 100.0, [], 1_024],
-                'invalid',
                 ['second', LogLevel::WARNING, 'application', 100.25, [], 2_048],
+                ['third', LogLevel::ERROR, 'application', 101.0, [], 4_096],
             ],
         );
         $payload = $captured->jsonSerialize();
 
+        self::assertSame(
+            [
+                'entries' => [
+                    [
+                        'id' => 1,
+                        'message' => 'first',
+                        'level' => LogLevel::INFO,
+                        'category' => 'application',
+                        'time' => 100_000.0,
+                        'timeOfPrevious' => 100_000.0,
+                        'timeSincePrevious' => 0.0,
+                        'idOfPrevious' => null,
+                        'idOfNext' => 2,
+                        'memory' => 1_024,
+                        'trace' => [],
+                    ],
+                    [
+                        'id' => 2,
+                        'message' => 'second',
+                        'level' => LogLevel::WARNING,
+                        'category' => 'application',
+                        'time' => 100_250.0,
+                        'timeOfPrevious' => 100_000.0,
+                        'timeSincePrevious' => 0.25,
+                        'idOfPrevious' => 1,
+                        'idOfNext' => 3,
+                        'memory' => 2_048,
+                        'trace' => [],
+                    ],
+                    [
+                        'id' => 3,
+                        'message' => 'third',
+                        'level' => LogLevel::ERROR,
+                        'category' => 'application',
+                        'time' => 101_000.0,
+                        'timeOfPrevious' => 100_250.0,
+                        'timeSincePrevious' => 0.75,
+                        'idOfPrevious' => 2,
+                        'idOfNext' => null,
+                        'memory' => 4_096,
+                        'trace' => [],
+                    ],
+                ],
+            ],
+            $payload,
+            'Log capture must preserve tuple indexes, time deltas, and terminal navigation exactly.',
+        );
+
         $snapshot = LogSnapshot::fromArray($payload, '$.panels.log');
+
         $first = $snapshot->entries()[0] ?? self::fail('Expected the first hydrated log row.');
         $second = $snapshot->entries()[1] ?? self::fail('Expected the second hydrated log row.');
 
@@ -130,6 +179,7 @@ public function testMailSnapshotCapturesAndHydratesMessages(): void
         $payload = $captured->jsonSerialize();
 
         $snapshot = MailSnapshot::fromArray($payload, '$.panels.mail');
+
         $capturedMessage = $captured->entries()[0] ?? self::fail('Expected one captured mail message.');
         $message = $snapshot->entries()[0] ?? self::fail('Expected one hydrated mail message.');
 
@@ -169,6 +219,7 @@ public function testQueueSnapshotHydratesCapturedRecords(): void
         $payload = $captured->jsonSerialize();
 
         $snapshot = QueueSnapshot::fromArray($payload, '$.panels.queue');
+
         $capturedRecord = $captured->entries()[0] ?? self::fail('Expected one captured queue record.');
         $record = $snapshot->entries()[0] ?? self::fail('Expected one hydrated queue record.');
 
@@ -233,11 +284,45 @@ public function testRouterSnapshotCapturesAndHydratesRouteTrace(): void
         $captured = RouterSnapshot::capture(
             'site/index',
             [
-                ['Route resolved.', LogLevel::TRACE],
-                [['rule' => 'yii\\rest\\UrlRule', 'parent' => '', 'match' => false], LogLevel::INFO],
-                [['rule' => 'app\\rules\\ViewRule', 'parent' => 'yii\\rest\\UrlRule', 'match' => true], LogLevel::INFO],
-                [['rule' => 'yii\\rest\\UrlRule', 'match' => false], LogLevel::INFO],
-                [['invalid' => true], LogLevel::INFO],
+                [
+                    'Route resolved.',
+                    LogLevel::TRACE,
+                ],
+                [
+                    ['invalid' => true],
+                    LogLevel::INFO,
+                ],
+                [
+                    [
+                        'rule' => 'yii\\rest\\UrlRule',
+                        'parent' => '',
+                        'match' => false,
+                    ],
+                    LogLevel::INFO,
+                ],
+                [
+                    [
+                        'rule' => 'app\\rules\\ViewRule',
+                        'parent' => 'yii\\rest\\UrlRule',
+                        'match' => true,
+                    ],
+                    LogLevel::INFO,
+                ],
+                [
+                    [
+                        'rule' => 'yii\\rest\\UrlRule',
+                        'match' => false,
+                    ],
+                    LogLevel::INFO,
+                ],
+                [
+                    [
+                        'rule' => 'app\\rules\\AfterRule',
+                        'parent' => '',
+                        'match' => false,
+                    ],
+                    LogLevel::INFO,
+                ],
             ],
             'post/42',
         );
@@ -261,9 +346,9 @@ public function testRouterSnapshotCapturesAndHydratesRouteTrace(): void
             'Trace message must be retained.',
         );
         self::assertSame(
-            2,
+            3,
             count($snapshot->entries()),
-            'Nested REST duplicate must be omitted.',
+            'Invalid rows and nested REST duplicates must be skipped without dropping later rules.',
         );
     }
 
diff --git a/tests/Panel/Config/ConfigCardRendererTest.php b/tests/Panel/Config/ConfigCardRendererTest.php
index 5167232..006bdcf 100644
--- a/tests/Panel/Config/ConfigCardRendererTest.php
+++ b/tests/Panel/Config/ConfigCardRendererTest.php
@@ -9,8 +9,8 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * Unit tests for {@see ConfigCardRenderer} covering readout grid composition, PHP-extension pills, application
- * details rows, the conditional installed-extensions section and the php-info call-to-action link.
+ * Unit tests for {@see ConfigCardRenderer} covering readout grid composition, PHP-extension pills, application details
+ * rows, the conditional installed-extensions section and the php-info call-to-action link.
  */
 #[Group('panel')]
 #[Group('config')]
@@ -22,36 +22,37 @@ public function testRenderApplicationDetailsSectionShowsCharsetAndLanguageRows()
 
         $html = ConfigCardRenderer::renderApplicationDetailsSection($summary->application)->render();
 
-        self::assertStringContainsString(
-            'Charset',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-section">
+            <h2 class="yii-debug-section-title">
+            <span class="yii-debug-section-mark">//</span> Application details
+            </h2><dl class="yii-debug-dl">
+            <div class="yii-debug-dl-row">
+            <dt>
+            Charset
+            </dt><dd>
+            UTF-8
+            </dd>
+            </div><div class="yii-debug-dl-row">
+            <dt>
+            Current language
+            </dt><dd>
+            en-US (English, United States)
+            </dd>
+            </div><div class="yii-debug-dl-row">
+            <dt>
+            Source language
+            </dt><dd>
+            en (English)
+            </dd>
+            </div>
+            </dl>
+            </section>
+            HTML,
             $html,
             'Charset row must be labeled.',
         );
-        self::assertStringContainsString(
-            'UTF-8',
-            $html,
-            'Charset value must be rendered.'
-        );
-        self::assertStringContainsString(
-            'Current language',
-            $html,
-            'Current language row must be labeled.'
-        );
-        self::assertStringContainsString(
-            'en-US (English, United States)',
-            $html,
-            'Current language must include its language and region display names.'
-        );
-        self::assertStringContainsString(
-            'Source language',
-            $html,
-            'Source language row must be labeled.'
-        );
-        self::assertStringContainsString(
-            'en (English)',
-            $html,
-            'Source language must include its display language.',
-        );
     }
 
     public function testRenderApplicationDetailsSectionShowsEmDashWhenCharsetIsEmpty(): void
@@ -60,8 +61,34 @@ public function testRenderApplicationDetailsSectionShowsEmDashWhenCharsetIsEmpty
 
         $html = ConfigCardRenderer::renderApplicationDetailsSection($summary->application)->render();
 
-        self::assertStringContainsString(
-            '—',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-section">
+            <h2 class="yii-debug-section-title">
+            <span class="yii-debug-section-mark">//</span> Application details
+            </h2><dl class="yii-debug-dl">
+            <div class="yii-debug-dl-row">
+            <dt>
+            Charset
+            </dt><dd>
+            —
+            </dd>
+            </div><div class="yii-debug-dl-row">
+            <dt>
+            Current language
+            </dt><dd>
+            —
+            </dd>
+            </div><div class="yii-debug-dl-row">
+            <dt>
+            Source language
+            </dt><dd>
+            —
+            </dd>
+            </div>
+            </dl>
+            </section>
+            HTML,
             $html,
             'Empty charset must render the em-dash placeholder.',
         );
@@ -85,36 +112,23 @@ public function testRenderInstalledExtensionsSectionListsEveryPackageWithVersion
 
         $html = $section->render();
 
-        self::assertStringContainsString(
-            'Installed extensions',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-section">
+            <h2 class="yii-debug-section-title">
+            <span class="yii-debug-section-mark">&gt;_</span> Installed extensions <span class="yii-debug-section-count">2</span>
+            </h2><div class="yii-debug-packages">
+            <article class="yii-debug-package">
+            <span class="yii-debug-package-glyph" aria-hidden="true">◆</span><span class="yii-debug-package-name">acme/foo</span><span class="yii-debug-package-version">v1.0.0</span>
+            </article><article class="yii-debug-package">
+            <span class="yii-debug-package-glyph" aria-hidden="true">◆</span><span class="yii-debug-package-name">acme/bar</span><span class="yii-debug-package-version">v2.5.1</span>
+            </article>
+            </div>
+            </section>
+            HTML,
             $html,
             'Section heading must be present.',
         );
-        self::assertStringContainsString(
-            'acme/foo',
-            $html,
-            'First package name must be listed.',
-        );
-        self::assertStringContainsString(
-            'v1.0.0',
-            $html,
-            "First package version must be prefixed with 'v'.",
-        );
-        self::assertStringContainsString(
-            'acme/bar',
-            $html,
-            'Second package name must be listed.',
-        );
-        self::assertStringContainsString(
-            'v2.5.1',
-            $html,
-            "Second package version must be prefixed with 'v'.",
-        );
-        self::assertStringContainsString(
-            '>2<',
-            $html,
-            'Section count chip must render the roster size.',
-        );
     }
 
     public function testRenderInstalledExtensionsSectionReturnsNullWhenRosterIsEmpty(): void
@@ -133,71 +147,32 @@ public function testRenderPhpExtensionsSectionEmitsOneOnAndThreeOffPills(): void
 
         $html = ConfigCardRenderer::renderPhpExtensionsSection($summary->php)->render();
 
-        self::assertStringContainsString(
-            'Xdebug',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-section">
+            <h2 class="yii-debug-section-title">
+            <span class="yii-debug-section-mark">::</span> PHP extensions
+            </h2><div class="yii-debug-ext-strip">
+            <span class="yii-debug-ext-pill is-on"><span class="yii-debug-ext-pill-dot" aria-hidden="true"></span><span class="yii-debug-ext-pill-label">Xdebug</span><span class="yii-debug-ext-pill-state">on</span></span><span class="yii-debug-ext-pill is-off"><span class="yii-debug-ext-pill-dot" aria-hidden="true"></span><span class="yii-debug-ext-pill-label">APCu</span><span class="yii-debug-ext-pill-state">off</span></span><span class="yii-debug-ext-pill is-off"><span class="yii-debug-ext-pill-dot" aria-hidden="true"></span><span class="yii-debug-ext-pill-label">Memcache</span><span class="yii-debug-ext-pill-state">off</span></span><span class="yii-debug-ext-pill is-off"><span class="yii-debug-ext-pill-dot" aria-hidden="true"></span><span class="yii-debug-ext-pill-label">Memcached</span><span class="yii-debug-ext-pill-state">off</span></span>
+            </div>
+            </section>
+            HTML,
             $html,
             'Xdebug label must be present.',
         );
-        self::assertStringContainsString(
-            'APCu',
-            $html,
-            'APCu label must be present.',
-        );
-        self::assertStringContainsString(
-            'Memcache',
-            $html,
-            'Memcache label must be present.',
-        );
-        self::assertStringContainsString(
-            'Memcached',
-            $html,
-            'Memcached label must be present.',
-        );
-        self::assertStringContainsString(
-            'class="yii-debug-ext-pill is-on"><span class="yii-debug-ext-pill-dot" aria-hidden="true"></span>'
-                . '<span class="yii-debug-ext-pill-label">Xdebug</span>'
-                . '<span class="yii-debug-ext-pill-state">on</span>',
-            $html,
-            "Enabled Xdebug must pair the 'is-on' modifier with the 'on' label.",
-        );
-        self::assertStringContainsString(
-            'class="yii-debug-ext-pill is-off"><span class="yii-debug-ext-pill-dot" aria-hidden="true"></span>'
-                . '<span class="yii-debug-ext-pill-label">APCu</span>'
-                . '<span class="yii-debug-ext-pill-state">off</span>',
-            $html,
-            "Disabled APCu must pair the 'is-off' modifier with the 'off' label.",
-        );
     }
 
     public function testRenderPhpInfoCtaProducesAnchorWithProvidedHref(): void
     {
         $html = ConfigCardRenderer::renderPhpInfoCta('/debug/default/php-info')->render();
 
-        self::assertStringContainsString(
-            'class="yii-debug-cta"',
+        self::assertSame(
+            <<<HTML
+            <a class="yii-debug-cta" href="/debug/default/php-info" rel="noopener" target="_blank"><span class="yii-debug-cta-prompt" aria-hidden="true">→</span><span>View full phpinfo</span><span class="yii-debug-cta-external" aria-hidden="true">↗</span></a>
+            HTML,
             $html,
             'CTA must carry the wrapper class.',
         );
-        self::assertStringContainsString(
-            'href="/debug/default/php-info"',
-            $html,
-            'CTA href must round-trip the caller-provided URL.',
-        );
-        self::assertStringContainsString(
-            'target="_blank"',
-            $html,
-            'CTA must open in a new tab.',
-        );
-        self::assertStringContainsString(
-            'rel="noopener"',
-            $html,
-            "CTA must declare 'rel=\"noopener\"' for safety.",
-        );
-        self::assertStringContainsString(
-            'View full phpinfo',
-            $html,
-            'CTA must show the descriptive label.',
-        );
     }
 
     public function testRenderReadoutGridShowsDebugOffMutedChipWhenDebugIsFalse(): void
@@ -206,16 +181,24 @@ public function testRenderReadoutGridShowsDebugOffMutedChipWhenDebugIsFalse(): v
 
         $html = ConfigCardRenderer::renderReadoutGrid($summary)->render();
 
-        self::assertStringContainsString(
-            'yii-debug-readout-chip yii-debug-readout-chip-muted',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-readout">
+            <article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">Yii</span><span class="yii-debug-readout-value">2.0.0</span><span class="yii-debug-readout-meta">framework</span>
+            </article><article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">PHP</span><span class="yii-debug-readout-value">8.3.0</span><span class="yii-debug-readout-meta">runtime</span>
+            </article><article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">Environment</span><span class="yii-debug-readout-value">dev</span><span class="yii-debug-readout-meta"><span class="yii-debug-readout-chip yii-debug-readout-chip-muted">debug off</span></span>
+            </article><article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">Application</span><span class="yii-debug-readout-value">Test</span><span class="yii-debug-readout-meta">instance</span>
+            </article>
+            </div>
+            HTML,
             $html,
             'Disabled chip must use the muted modifier.',
         );
-        self::assertStringContainsString(
-            'off',
-            $html,
-            "Disabled chip must read 'off'.",
-        );
+
     }
 
     public function testRenderReadoutGridShowsDebugOnChipWhenDebugIsTrue(): void
@@ -224,26 +207,23 @@ public function testRenderReadoutGridShowsDebugOnChipWhenDebugIsTrue(): void
 
         $html = ConfigCardRenderer::renderReadoutGrid($summary)->render();
 
-        self::assertStringContainsString(
-            'debug',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-readout">
+            <article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">Yii</span><span class="yii-debug-readout-value">2.0.0</span><span class="yii-debug-readout-meta">framework</span>
+            </article><article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">PHP</span><span class="yii-debug-readout-value">8.3.0</span><span class="yii-debug-readout-meta">runtime</span>
+            </article><article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">Environment</span><span class="yii-debug-readout-value">dev</span><span class="yii-debug-readout-meta"><span class="yii-debug-readout-chip">debug on</span></span>
+            </article><article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">Application</span><span class="yii-debug-readout-value">Test</span><span class="yii-debug-readout-meta">instance</span>
+            </article>
+            </div>
+            HTML,
             $html,
             'Debug chip text must be present.',
         );
-        self::assertStringContainsString(
-            'on',
-            $html,
-            "Debug chip must read 'on' when debug is 'true'.",
-        );
-        self::assertStringContainsString(
-            '<span class="yii-debug-readout-meta"><span class="yii-debug-readout-chip">debug',
-            $html,
-            'Stringable readout metadata must be rendered as HTML instead of escaped text.',
-        );
-        self::assertStringNotContainsString(
-            'yii-debug-readout-chip-muted">debug',
-            $html,
-            'Active chip must not be muted.',
-        );
     }
 
     public function testRenderReadoutGridShowsEmDashWhenApplicationNameIsEmpty(): void
@@ -252,8 +232,20 @@ public function testRenderReadoutGridShowsEmDashWhenApplicationNameIsEmpty(): vo
 
         $html = ConfigCardRenderer::renderReadoutGrid($summary)->render();
 
-        self::assertStringContainsString(
-            '—',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-readout">
+            <article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">Yii</span><span class="yii-debug-readout-value">2.0.0</span><span class="yii-debug-readout-meta">framework</span>
+            </article><article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">PHP</span><span class="yii-debug-readout-value">8.3.0</span><span class="yii-debug-readout-meta">runtime</span>
+            </article><article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">Environment</span><span class="yii-debug-readout-value">dev</span><span class="yii-debug-readout-meta"><span class="yii-debug-readout-chip">debug on</span></span>
+            </article><article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">Application</span><span class="yii-debug-readout-value">—</span><span class="yii-debug-readout-meta">instance</span>
+            </article>
+            </div>
+            HTML,
             $html,
             "Empty 'name' must render the em-dash placeholder.",
         );
@@ -265,8 +257,20 @@ public function testRenderReadoutGridShowsInstanceFallbackWhenApplicationVersion
 
         $html = ConfigCardRenderer::renderReadoutGrid($summary)->render();
 
-        self::assertStringContainsString(
-            'instance',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-readout">
+            <article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">Yii</span><span class="yii-debug-readout-value">2.0.0</span><span class="yii-debug-readout-meta">framework</span>
+            </article><article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">PHP</span><span class="yii-debug-readout-value">8.3.0</span><span class="yii-debug-readout-meta">runtime</span>
+            </article><article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">Environment</span><span class="yii-debug-readout-value">dev</span><span class="yii-debug-readout-meta"><span class="yii-debug-readout-chip">debug on</span></span>
+            </article><article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">Application</span><span class="yii-debug-readout-value">Test</span><span class="yii-debug-readout-meta">instance</span>
+            </article>
+            </div>
+            HTML,
             $html,
             "Empty 'version' must fall back to 'instance' text.",
         );
@@ -278,16 +282,24 @@ public function testRenderReadoutGridShowsVersionChipWhenApplicationVersionIsPre
 
         $html = ConfigCardRenderer::renderReadoutGrid($summary)->render();
 
-        self::assertStringContainsString(
-            'v1.2.3',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-readout">
+            <article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">Yii</span><span class="yii-debug-readout-value">2.0.0</span><span class="yii-debug-readout-meta">framework</span>
+            </article><article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">PHP</span><span class="yii-debug-readout-value">8.3.0</span><span class="yii-debug-readout-meta">runtime</span>
+            </article><article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">Environment</span><span class="yii-debug-readout-value">dev</span><span class="yii-debug-readout-meta"><span class="yii-debug-readout-chip">debug on</span></span>
+            </article><article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">Application</span><span class="yii-debug-readout-value">Test</span><span class="yii-debug-readout-meta"><span class="yii-debug-readout-chip yii-debug-readout-chip-muted">v1.2.3</span></span>
+            </article>
+            </div>
+            HTML,
             $html,
             'Version chip must show the prefixed application version.',
         );
-        self::assertStringNotContainsString(
-            '>instance<',
-            $html,
-            "Version chip must replace the 'instance' fallback.",
-        );
+
     }
 
     public function testRenderReadoutGridShowsYiiAndPhpAndEnvironmentAndApplicationCards(): void
@@ -296,46 +308,23 @@ public function testRenderReadoutGridShowsYiiAndPhpAndEnvironmentAndApplicationC
 
         $html = ConfigCardRenderer::renderReadoutGrid($summary)->render();
 
-        self::assertStringContainsString(
-            'class="yii-debug-readout"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-readout">
+            <article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">Yii</span><span class="yii-debug-readout-value">2.0.50</span><span class="yii-debug-readout-meta">framework</span>
+            </article><article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">PHP</span><span class="yii-debug-readout-value">8.3.10</span><span class="yii-debug-readout-meta">runtime</span>
+            </article><article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">Environment</span><span class="yii-debug-readout-value">prod</span><span class="yii-debug-readout-meta"><span class="yii-debug-readout-chip">debug on</span></span>
+            </article><article class="yii-debug-readout-card">
+            <span class="yii-debug-readout-corner" data-corner="tl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="tr" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="bl" aria-hidden="true"></span><span class="yii-debug-readout-corner" data-corner="br" aria-hidden="true"></span><span class="yii-debug-readout-label">Application</span><span class="yii-debug-readout-value">Demo</span><span class="yii-debug-readout-meta">instance</span>
+            </article>
+            </div>
+            HTML,
             $html,
             'Outer wrapper class must be present.',
         );
-        self::assertStringContainsString(
-            'Yii',
-            $html,
-            'Yii readout label must be present.',
-        );
-        self::assertStringContainsString(
-            '2.0.50',
-            $html,
-            'Yii readout value must be present.',
-        );
-        self::assertStringContainsString(
-            'PHP',
-            $html,
-            'PHP readout label must be present.',
-        );
-        self::assertStringContainsString(
-            '8.3.10',
-            $html,
-            'PHP readout value must be present.',
-        );
-        self::assertStringContainsString(
-            'Environment',
-            $html,
-            'Environment readout label must be present.',
-        );
-        self::assertStringContainsString(
-            'Application',
-            $html,
-            'Application readout label must be present.',
-        );
-        self::assertStringContainsString(
-            'Demo',
-            $html,
-            'Application readout value must be present.',
-        );
     }
 
     /**
diff --git a/tests/Panel/Db/DbExplainRendererTest.php b/tests/Panel/Db/DbExplainRendererTest.php
index 5428f45..0e3daa9 100644
--- a/tests/Panel/Db/DbExplainRendererTest.php
+++ b/tests/Panel/Db/DbExplainRendererTest.php
@@ -18,7 +18,7 @@ final class DbExplainRendererTest extends TestCase
     public function testRenderEmptyPlan(): void
     {
         self::assertSame(
-            <<<'HTML'
+            <<<HTML
             <div class="yii-debug-explain">
             <h1 class="yii-debug-explain-title">
             EXPLAIN
@@ -35,7 +35,7 @@ public function testRenderEmptyPlan(): void
     public function testRenderError(): void
     {
         self::assertSame(
-            <<<'HTML'
+            <<<HTML
             <div class="yii-debug-explain">
             <h1 class="yii-debug-explain-title">
             EXPLAIN
@@ -54,7 +54,7 @@ public function testRenderError(): void
     public function testRenderQueryAndResultTable(): void
     {
         self::assertSame(
-            <<<'HTML'
+            <<<HTML
             <div class="yii-debug-explain">
             <h1 class="yii-debug-explain-title">
             EXPLAIN
diff --git a/tests/Panel/Db/DbQueryRendererTest.php b/tests/Panel/Db/DbQueryRendererTest.php
index 6f008c7..a3ed3d8 100644
--- a/tests/Panel/Db/DbQueryRendererTest.php
+++ b/tests/Panel/Db/DbQueryRendererTest.php
@@ -67,26 +67,18 @@ public function testRenderQueryCellEmitsExplainToggleWithBuiltUrl(): void
             self::makeUrlBuilder('request-tag-1'),
         );
 
-        self::assertStringContainsString(
-            'yii-debug-db-explain',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-db-sql">
+            <span class="yii-debug-sql-kw">SELECT</span> <span class="yii-debug-sql-num">1</span>
+            </div><div class="yii-debug-db-explain">
+            <a class="yii-debug-db-explain-toggle" href="/debug/db-explain?seq=7&amp;tag=request-tag-1" role="button" aria-expanded="false" aria-label="Toggle EXPLAIN output"><span class="yii-debug-db-explain-chevron" aria-hidden="true">›</span><span class="yii-debug-db-explain-label">Explain</span></a><div class="yii-debug-db-explain-text">
+            </div>
+            </div>
+            HTML,
             $html,
             'Explain toggle wrapper must be present.',
         );
-        self::assertStringContainsString(
-            'seq=7',
-            $html,
-            'Explain URL must carry the row sequence.',
-        );
-        self::assertStringContainsString(
-            'tag=request-tag-1',
-            $html,
-            'Explain URL must carry the request tag.',
-        );
-        self::assertStringContainsString(
-            'aria-label="Toggle EXPLAIN output"',
-            $html,
-            'Toggle must expose an accessible name.',
-        );
     }
 
     public function testRenderQueryCellEmitsTraceListWhenTracePresent(): void
@@ -98,16 +90,19 @@ public function testRenderQueryCellEmitsTraceListWhenTracePresent(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            'class="yii-debug-trace"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-db-sql">
+            <span class="yii-debug-sql-kw">SELECT</span> <span class="yii-debug-sql-num">1</span>
+            </div><ul class="yii-debug-trace">
+            <li>
+            /app/User.php:
+            </li>
+            </ul>
+            HTML,
             $html,
             'Trace list must carry the dedicated class.',
         );
-        self::assertStringContainsString(
-            'User.php',
-            $html,
-            'Trace list must render frame metadata.',
-        );
     }
 
     public function testRenderQueryCellEscapesQueryContent(): void
@@ -119,16 +114,16 @@ public function testRenderQueryCellEscapesQueryContent(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            '&lt;script&gt;',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-db-sql">
+            &lt;script&gt;
+            </div>
+            HTML,
             $html,
             'Query content must be HTML-escaped.',
         );
-        self::assertStringNotContainsString(
-            '<script>',
-            $html,
-            'Raw HTML must not leak into the output.',
-        );
+
     }
 
     public function testRenderQueryCellOmitsExplainToggleWhenHasExplainIsFalse(): void
@@ -140,8 +135,12 @@ public function testRenderQueryCellOmitsExplainToggleWhenHasExplainIsFalse(): vo
             self::makeUrlBuilder(),
         );
 
-        self::assertStringNotContainsString(
-            'yii-debug-db-explain',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-db-sql">
+            <span class="yii-debug-sql-kw">SELECT</span> <span class="yii-debug-sql-num">1</span>
+            </div>
+            HTML,
             $html,
             'Explain toggle must be hidden when the driver does not support EXPLAIN.',
         );
@@ -156,8 +155,12 @@ public function testRenderQueryCellOmitsExplainToggleWhenTypeIsNotExplainable():
             self::makeUrlBuilder(),
         );
 
-        self::assertStringNotContainsString(
-            'yii-debug-db-explain',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-db-sql">
+            <span class="yii-debug-sql-kw">SELECT</span> <span class="yii-debug-sql-num">1</span>
+            </div>
+            HTML,
             $html,
             'PRAGMA must not produce an explain toggle.',
         );
@@ -172,8 +175,12 @@ public function testRenderQueryCellOmitsTraceListWhenTraceEmpty(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringNotContainsString(
-            'yii-debug-trace',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-db-sql">
+            <span class="yii-debug-sql-kw">SELECT</span> <span class="yii-debug-sql-num">1</span>
+            </div>
+            HTML,
             $html,
             'Empty trace must omit the trace list entirely.',
         );
@@ -188,21 +195,15 @@ public function testRenderQueryCellWrapsSqlInTheDebugSqlContainer(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            'class="yii-debug-db-sql"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-db-sql">
+            <span class="yii-debug-sql-kw">SELECT</span> <span class="yii-debug-sql-num">1</span>
+            </div>
+            HTML,
             $html,
             'SQL must be wrapped in the dedicated container.',
         );
-        self::assertStringContainsString(
-            '<span class="yii-debug-sql-kw">SELECT</span>',
-            $html,
-            'SQL keywords must be highlighted.',
-        );
-        self::assertStringContainsString(
-            '<span class="yii-debug-sql-num">1</span>',
-            $html,
-            'SQL numbers must be highlighted.',
-        );
     }
 
     public function testRenderRowsCellShowsEnDashWhenRowsAreUnknown(): void
@@ -259,13 +260,17 @@ public function testRenderTimeCellKeepsMillisecondsBelowTheNextBoundary(): void
 
     public function testRenderTypeCellMapsInsertToPostAndDeleteToDeleteVerbs(): void
     {
-        self::assertStringContainsString(
-            'yii-debug-verb-post',
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-db-type yii-debug-verb-post">INSERT</span>
+            HTML,
             DbQueryRenderer::renderTypeCell(self::makeRow(type: 'INSERT')),
             "INSERT must map to the 'post' verb.",
         );
-        self::assertStringContainsString(
-            'yii-debug-verb-delete',
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-db-type yii-debug-verb-delete">DELETE</span>
+            HTML,
             DbQueryRenderer::renderTypeCell(self::makeRow(type: 'DELETE')),
             "DELETE must map to the 'delete' verb.",
         );
@@ -275,16 +280,14 @@ public function testRenderTypeCellWrapsTypeInAColoredBadge(): void
     {
         $html = DbQueryRenderer::renderTypeCell(self::makeRow(type: 'SELECT'));
 
-        self::assertStringContainsString(
-            'class="yii-debug-db-type yii-debug-verb-get"',
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-db-type yii-debug-verb-get">SELECT</span>
+            HTML,
             $html,
             "SELECT must use the 'get' verb.",
         );
-        self::assertStringContainsString(
-            '>SELECT<',
-            $html,
-            'Type label must be rendered as the badge content.',
-        );
+
     }
 
     /**
diff --git a/tests/Panel/Db/SqlHighlighterTest.php b/tests/Panel/Db/SqlHighlighterTest.php
index 9e5d30c..218e025 100644
--- a/tests/Panel/Db/SqlHighlighterTest.php
+++ b/tests/Panel/Db/SqlHighlighterTest.php
@@ -18,9 +18,9 @@ final class SqlHighlighterTest extends TestCase
     public function testHighlightEscapesHtmlInsideStringLiteralsAndPlainSegments(): void
     {
         self::assertSame(
-            '<span class="yii-debug-sql-kw">SELECT</span> a &amp; b, '
-            . "<span class=\"yii-debug-sql-str\">'&lt;script&gt;alert(1)&lt;/script&gt;'</span> "
-            . '<span class="yii-debug-sql-kw">FROM</span> t',
+            <<<HTML
+            <span class="yii-debug-sql-kw">SELECT</span> a &amp; b, <span class="yii-debug-sql-str">'&lt;script&gt;alert(1)&lt;/script&gt;'</span> <span class="yii-debug-sql-kw">FROM</span> t
+            HTML,
             SqlHighlighter::highlight("SELECT a & b, '<script>alert(1)</script>' FROM t"),
             'Markup must be escaped in every segment.',
         );
@@ -29,7 +29,9 @@ public function testHighlightEscapesHtmlInsideStringLiteralsAndPlainSegments():
     public function testHighlightHandlesBackslashEscapedQuoteInsideStringLiteral(): void
     {
         self::assertSame(
-            "<span class=\"yii-debug-sql-str\">'a\\'s'</span>",
+            <<<HTML
+            <span class="yii-debug-sql-str">'a\\'s'</span>
+            HTML,
             SqlHighlighter::highlight("'a\\'s'"),
             'Backslash escape must extend the literal.',
         );
@@ -38,7 +40,9 @@ public function testHighlightHandlesBackslashEscapedQuoteInsideStringLiteral():
     public function testHighlightKeepsDigitsAttachedToIdentifiersUnwrapped(): void
     {
         self::assertSame(
-            '<span class="yii-debug-sql-kw">FROM</span> tbl1',
+            <<<HTML
+            <span class="yii-debug-sql-kw">FROM</span> tbl1
+            HTML,
             SqlHighlighter::highlight('FROM tbl1'),
             'Digits inside identifiers must stay plain.',
         );
@@ -56,7 +60,9 @@ public function testHighlightKeepsDoubleColonCastsUnwrapped(): void
     public function testHighlightKeepsKeywordsInsideStringLiteralsUnwrapped(): void
     {
         self::assertSame(
-            "<span class=\"yii-debug-sql-str\">'it''s from where'</span>",
+            <<<HTML
+            <span class="yii-debug-sql-str">'it''s from where'</span>
+            HTML,
             SqlHighlighter::highlight("'it''s from where'"),
             'Doubled-quote escape must extend the literal.',
         );
@@ -65,8 +71,9 @@ public function testHighlightKeepsKeywordsInsideStringLiteralsUnwrapped(): void
     public function testHighlightLeavesQuotedIdentifiersUnwrapped(): void
     {
         self::assertSame(
-            '<span class="yii-debug-sql-kw">SELECT</span> "from", `where` '
-            . '<span class="yii-debug-sql-kw">FROM</span> t',
+            <<<HTML
+            <span class="yii-debug-sql-kw">SELECT</span> "from", `where` <span class="yii-debug-sql-kw">FROM</span> t
+            HTML,
             SqlHighlighter::highlight('SELECT "from", `where` FROM t'),
             'Quoted identifiers must stay span-free.',
         );
@@ -75,7 +82,9 @@ public function testHighlightLeavesQuotedIdentifiersUnwrapped(): void
     public function testHighlightMatchesKeywordsCaseInsensitively(): void
     {
         self::assertSame(
-            '<span class="yii-debug-sql-kw">select</span> <span class="yii-debug-sql-num">1</span>',
+            <<<HTML
+            <span class="yii-debug-sql-kw">select</span> <span class="yii-debug-sql-num">1</span>
+            HTML,
             SqlHighlighter::highlight('select 1'),
             'Lowercase keywords must be wrapped.',
         );
@@ -120,8 +129,9 @@ public function testHighlightReturnsEscapedInputWhenNoTokenMatches(): void
     public function testHighlightWrapsBindParametersAndPlaceholders(): void
     {
         self::assertSame(
-            '<span class="yii-debug-sql-kw">WHERE</span> id <span class="yii-debug-sql-kw">IN</span> '
-            . '(<span class="yii-debug-sql-param">:ids</span>, <span class="yii-debug-sql-param">?</span>)',
+            <<<HTML
+            <span class="yii-debug-sql-kw">WHERE</span> id <span class="yii-debug-sql-kw">IN</span> (<span class="yii-debug-sql-param">:ids</span>, <span class="yii-debug-sql-param">?</span>)
+            HTML,
             SqlHighlighter::highlight('WHERE id IN (:ids, ?)'),
             'Named and positional parameters must be wrapped.',
         );
@@ -130,8 +140,9 @@ public function testHighlightWrapsBindParametersAndPlaceholders(): void
     public function testHighlightWrapsIntegerAndDecimalNumbers(): void
     {
         self::assertSame(
-            '<span class="yii-debug-sql-kw">LIMIT</span> <span class="yii-debug-sql-num">10</span> '
-            . '<span class="yii-debug-sql-kw">OFFSET</span> <span class="yii-debug-sql-num">3.14</span>',
+            <<<HTML
+            <span class="yii-debug-sql-kw">LIMIT</span> <span class="yii-debug-sql-num">10</span> <span class="yii-debug-sql-kw">OFFSET</span> <span class="yii-debug-sql-num">3.14</span>
+            HTML,
             SqlHighlighter::highlight('LIMIT 10 OFFSET 3.14'),
             'Integers and decimals must be wrapped.',
         );
@@ -140,9 +151,10 @@ public function testHighlightWrapsIntegerAndDecimalNumbers(): void
     public function testHighlightWrapsLineAndBlockComments(): void
     {
         self::assertSame(
-            "<span class=\"yii-debug-sql-comment\">/* multi\nline */</span> "
-            . '<span class="yii-debug-sql-num">1</span> '
-            . '<span class="yii-debug-sql-comment">-- tail note</span>',
+            <<<HTML
+            <span class="yii-debug-sql-comment">/* multi
+            line */</span> <span class="yii-debug-sql-num">1</span> <span class="yii-debug-sql-comment">-- tail note</span>
+            HTML,
             SqlHighlighter::highlight("/* multi\nline */ 1 -- tail note"),
             'Both comment forms must be wrapped.',
         );
diff --git a/tests/Panel/Dump/DumpCardRendererTest.php b/tests/Panel/Dump/DumpCardRendererTest.php
index 83e89a6..69319ba 100644
--- a/tests/Panel/Dump/DumpCardRendererTest.php
+++ b/tests/Panel/Dump/DumpCardRendererTest.php
@@ -20,44 +20,43 @@ final class DumpCardRendererTest extends TestCase
 {
     public function testRenderMessageCellAllowsOnlyDumpHighlighterMarkup(): void
     {
-        $message = <<<'HTML'
+        $message = <<<HTML
+        <pre><code style="color: #000000"><span style="color: #0000BB">safe</span></code></pre>
+        <span onclick="alert(1)">unsafe attribute</span><script>alert(1)</script>
+        HTML;
+
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="object">safe</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
             <pre><code style="color: #000000"><span style="color: #0000BB">safe</span></code></pre>
-            <span onclick="alert(1)">unsafe attribute</span><script>alert(1)</script>
-            HTML;
-
-        $html = DumpCardRenderer::renderMessageCell(
-            self::makeRow(message: $message),
-            self::traceLine(),
-            0,
-        );
-
-        self::assertStringContainsString(
-            '<pre><code style="color: #000000"><span style="color: #0000BB">safe</span></code></pre>',
-            $html,
-            'The exact fixed markup emitted by PHP dump highlighters must remain available.',
-        );
-        self::assertStringContainsString(
-            '&lt;span onclick="alert(1)"&gt;unsafe attribute&lt;/span&gt;',
-            $html,
-            'Highlighter tags with arbitrary attributes must be escaped.',
-        );
-        self::assertStringContainsString(
-            '&lt;script&gt;alert(1)&lt;/script&gt;',
-            $html,
-            'Executable tags from a callback or manipulated snapshot must be escaped.',
-        );
-        self::assertStringNotContainsString('<script>', $html, 'Executable dump markup must never reach the UI.');
-        self::assertStringNotContainsString(
-            '<span onclick=',
-            $html,
-            'Arbitrary dump attributes must never reach the UI as markup.',
+            &lt;span onclick="alert(1)"&gt;unsafe attribute&lt;/span&gt;&lt;script&gt;alert(1)&lt;/script&gt;
+            </div>
+            </div>
+            HTML,
+            DumpCardRenderer::renderMessageCell(
+                self::makeRow(message: $message),
+                self::traceLine(),
+                0,
+            ),
+            'Only the exact fixed dump-highlighter markup may survive in the complete card HTML.',
         );
     }
 
     public function testRenderMessageCellDecodesHtml5QuoteEntitiesBeforeTypeDetection(): void
     {
-        self::assertStringContainsString(
-            'data-type="string"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="string">string</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php &apos;hello&apos;
+            </div>
+            </div>
+            HTML,
             DumpCardRenderer::renderMessageCell(
                 self::makeRow(message: '&lt;?php &apos;hello&apos;'),
                 self::traceLine(),
@@ -74,16 +73,20 @@ public function testRenderMessageCellEmitsIndexBadgeBasedOnIndex(): void
             0,
         );
 
-        self::assertStringContainsString(
-            'class="yii-debug-dump-index"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="string">string</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php "hello"
+            </div>
+            </div>
+            HTML,
             $html,
             'Index badge must carry the dedicated class.',
         );
-        self::assertStringContainsString(
-            '#1',
-            $html,
-            'Index badge must show the 1-based row number.',
-        );
+
     }
 
     public function testRenderMessageCellEmitsTraceListWhenTraceHasFrames(): void
@@ -94,16 +97,24 @@ public function testRenderMessageCellEmitsTraceListWhenTraceHasFrames(): void
             0,
         );
 
-        self::assertStringContainsString(
-            'class="yii-debug-trace"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="string">string</span><span class="yii-debug-dump-meta"><span class="yii-debug-dump-trace" title="/app/User.php:42">User.php:42</span></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php "hello"<ul class="yii-debug-trace">
+            <li>
+            /app/User.php:
+            </li>
+            </ul>
+            </div>
+            </div>
+            HTML,
             $html,
             "Trace list '<ul>' must carry the dedicated class.",
         );
-        self::assertStringContainsString(
-            'User.php',
-            $html,
-            'Trace list must render frame metadata.',
-        );
+
     }
 
     public function testRenderMessageCellEscapesMalformedAndMismatchedDumpTags(): void
@@ -116,12 +127,20 @@ public function testRenderMessageCellEscapesMalformedAndMismatchedDumpTags(): vo
             0,
         );
 
-        self::assertStringContainsString(
-            '<span style="color: #0000BB">safe&lt;&lt;/code&gt;</span>&lt;broken',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="object">safe</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            <span style="color: #0000BB">safe&lt;&lt;/code&gt;</span>&lt;broken
+            </div>
+            </div>
+            HTML,
             $html,
             'Only balanced allowlisted tags may be reconstructed around malformed persisted input.',
         );
-        self::assertStringNotContainsString('</code></span><broken', $html, 'Mismatched and incomplete tags must stay inert.');
+
     }
 
     public function testRenderMessageCellFormatsMillisecondsAtTheUpperBoundary(): void
@@ -132,13 +151,63 @@ public function testRenderMessageCellFormatsMillisecondsAtTheUpperBoundary(): vo
             0,
         );
 
-        self::assertStringContainsString(
-            date('H:i:s', 1_700_000_000) . '.123',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="string">string</span><span class="yii-debug-dump-meta"><span class="yii-debug-dump-time">22:13:20.123</span></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php "hello"
+            </div>
+            </div>
+            HTML,
             $html,
             'Millisecond conversion must use exactly one thousand units per second.',
         );
     }
 
+    public function testRenderMessageCellKeepsPollutedAllowlistTokensEscaped(): void
+    {
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;x&lt;span style="color: #0000BB"&gt;value&lt;/span&gt;&gt;
+            </div>
+            </div>
+            HTML,
+            DumpCardRenderer::renderMessageCell(
+                self::makeRow(message: '<x<span style="color: #0000BB">value</span>>'),
+                self::traceLine(),
+                0,
+            ),
+            'Allowlisted-looking tokens polluted with nested delimiters must remain inert.',
+        );
+    }
+
+    public function testRenderMessageCellKeepsPollutedClosingTokensEscaped(): void
+    {
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="object">value</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;span style="color: #0000BB"&gt;value&lt;x&lt;/span&gt;&gt;
+            </div>
+            </div>
+            HTML,
+            DumpCardRenderer::renderMessageCell(
+                self::makeRow(message: '<span style="color: #0000BB">value<x</span>>'),
+                self::traceLine(),
+                0,
+            ),
+            'A closing token polluted with a leading nested delimiter must not balance an allowlisted opening tag.',
+        );
+    }
+
     public function testRenderMessageCellKeepsTimeAndTraceMetadataTogether(): void
     {
         $html = DumpCardRenderer::renderMessageCell(
@@ -147,14 +216,38 @@ public function testRenderMessageCellKeepsTimeAndTraceMetadataTogether(): void
             0,
         );
 
-        self::assertStringContainsString('yii-debug-dump-time', $html, 'Time metadata must be retained.');
-        self::assertStringContainsString('yii-debug-dump-trace', $html, 'Trace metadata must be retained.');
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="string">string</span><span class="yii-debug-dump-meta"><span class="yii-debug-dump-time">22:13:20.500</span><span class="yii-debug-dump-trace" title="/app/User.php:42">User.php:42</span></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php "hello"<ul class="yii-debug-trace">
+            <li>
+            /app/User.php:
+            </li>
+            </ul>
+            </div>
+            </div>
+            HTML,
+            $html,
+            'Time metadata must be retained.',
+        );
+
     }
 
     public function testRenderMessageCellNormalizesUppercaseScalarIdentifiers(): void
     {
-        self::assertStringContainsString(
-            'data-type="bool"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="bool">bool</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php TRUE
+            </div>
+            </div>
+            HTML,
             DumpCardRenderer::renderMessageCell(
                 self::makeRow(message: '&lt;?php TRUE'),
                 self::traceLine(),
@@ -172,22 +265,38 @@ public function testRenderMessageCellOmitsNonPositiveTraceLineSuffix(): void
             0,
         );
 
-        self::assertStringContainsString(
-            'class="yii-debug-dump-trace" title="/app/User.php">User.php</span>',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="string">string</span><span class="yii-debug-dump-meta"><span class="yii-debug-dump-trace" title="/app/User.php">User.php</span></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php "hello"<ul class="yii-debug-trace">
+            <li>
+            /app/User.php:
+            </li>
+            </ul>
+            </div>
+            </div>
+            HTML,
             $html,
             'Line zero must not be exposed as a source location suffix.',
         );
-        self::assertStringNotContainsString(
-            'User.php:0',
-            $html,
-            'Line zero must remain absent from the label and tooltip.',
-        );
+
     }
 
     public function testRenderMessageCellOmitsTimeWhenTimeIsZero(): void
     {
-        self::assertStringNotContainsString(
-            'yii-debug-dump-time',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="string">string</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php "hello"
+            </div>
+            </div>
+            HTML,
             DumpCardRenderer::renderMessageCell(
                 self::makeRow(time: 0.0),
                 self::traceLine(),
@@ -199,8 +308,20 @@ public function testRenderMessageCellOmitsTimeWhenTimeIsZero(): void
 
     public function testRenderMessageCellOmitsTraceLabelWhenFirstFrameHasNoFile(): void
     {
-        self::assertStringNotContainsString(
-            'yii-debug-dump-trace',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="string">string</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php "hello"<ul class="yii-debug-trace">
+            <li>
+            :
+            </li>
+            </ul>
+            </div>
+            </div>
+            HTML,
             DumpCardRenderer::renderMessageCell(
                 self::makeRow(trace: [['line' => 42]]),
                 self::traceLine(),
@@ -212,8 +333,16 @@ public function testRenderMessageCellOmitsTraceLabelWhenFirstFrameHasNoFile(): v
 
     public function testRenderMessageCellOmitsTraceListWhenTraceIsEmpty(): void
     {
-        self::assertStringNotContainsString(
-            'yii-debug-trace',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="string">string</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php "hello"
+            </div>
+            </div>
+            HTML,
             DumpCardRenderer::renderMessageCell(
                 self::makeRow(trace: []),
                 self::traceLine(),
@@ -225,8 +354,15 @@ public function testRenderMessageCellOmitsTraceListWhenTraceIsEmpty(): void
 
     public function testRenderMessageCellOmitsTypeBadgeWhenPayloadIsEmpty(): void
     {
-        self::assertStringNotContainsString(
-            'yii-debug-dump-type',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            </div>
+            </div>
+            HTML,
             DumpCardRenderer::renderMessageCell(
                 self::makeRow(message: ''),
                 self::traceLine(),
@@ -244,8 +380,16 @@ public function testRenderMessageCellOmitsTypeBadgeWhenPayloadStartsWithSymbol()
             0,
         );
 
-        self::assertStringNotContainsString(
-            'yii-debug-dump-type',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php +42
+            </div>
+            </div>
+            HTML,
             $html,
             'Unrecognized payload prefix must not produce a type badge.',
         );
@@ -259,18 +403,20 @@ public function testRenderMessageCellRendersFormattedTimeWhenTimeIsPositive(): v
             0,
         );
 
-        $expected = date('H:i:s', 1_700_000_000) . '.789';
-
-        self::assertStringContainsString(
-            'class="yii-debug-dump-time"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="string">string</span><span class="yii-debug-dump-meta"><span class="yii-debug-dump-time">22:13:20.789</span></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php "hello"
+            </div>
+            </div>
+            HTML,
             $html,
             'Time span must carry the dedicated class.',
         );
-        self::assertStringContainsString(
-            $expected,
-            $html,
-            "Time must format as 'H:i:s.mmm'.",
-        );
+
     }
 
     public function testRenderMessageCellRendersTraceLabelWithBasenameAndLine(): void
@@ -281,27 +427,37 @@ public function testRenderMessageCellRendersTraceLabelWithBasenameAndLine(): voi
             0,
         );
 
-        self::assertStringContainsString(
-            'class="yii-debug-dump-trace"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="string">string</span><span class="yii-debug-dump-meta"><span class="yii-debug-dump-trace" title="/app/User.php:42">User.php:42</span></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php "hello"<ul class="yii-debug-trace">
+            <li>
+            /app/User.php:
+            </li>
+            </ul>
+            </div>
+            </div>
+            HTML,
             $html,
             'Trace label span must carry the dedicated class.',
         );
-        self::assertStringContainsString(
-            'User.php:42',
-            $html,
-            "Trace label must show 'basename:line'.",
-        );
-        self::assertStringContainsString(
-            'title="/app/User.php:42"',
-            $html,
-            'Trace label tooltip must keep the full path.',
-        );
     }
 
     public function testRenderMessageCellRequiresIdentifierAtThePayloadStart(): void
     {
-        self::assertStringNotContainsString(
-            'yii-debug-dump-type',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php +Widget
+            </div>
+            </div>
+            HTML,
             DumpCardRenderer::renderMessageCell(
                 self::makeRow(message: '&lt;?php +Widget'),
                 self::traceLine(),
@@ -319,22 +475,34 @@ public function testRenderMessageCellSniffsArrayTypeFromOpeningBracket(): void
             0,
         );
 
-        self::assertStringContainsString(
-            'data-type="array"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="array">array</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php [1, 2, 3]
+            </div>
+            </div>
+            HTML,
             $html,
             "Array type key must be tagged via 'data-type'.",
         );
-        self::assertStringContainsString(
-            '>array<',
-            $html,
-            'Array label must be visible.',
-        );
+
     }
 
     public function testRenderMessageCellSniffsBoolFromTrueOrFalseLiteral(): void
     {
-        self::assertStringContainsString(
-            'data-type="bool"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="bool">bool</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php true
+            </div>
+            </div>
+            HTML,
             DumpCardRenderer::renderMessageCell(
                 self::makeRow(message: '&lt;?php true'),
                 self::traceLine(),
@@ -342,8 +510,16 @@ public function testRenderMessageCellSniffsBoolFromTrueOrFalseLiteral(): void
             ),
             "'true' literal must be tagged as 'bool'.",
         );
-        self::assertStringContainsString(
-            'data-type="bool"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="bool">bool</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php false
+            </div>
+            </div>
+            HTML,
             DumpCardRenderer::renderMessageCell(
                 self::makeRow(message: '&lt;?php false'),
                 self::traceLine(),
@@ -355,8 +531,16 @@ public function testRenderMessageCellSniffsBoolFromTrueOrFalseLiteral(): void
 
     public function testRenderMessageCellSniffsNullFromNullLiteral(): void
     {
-        self::assertStringContainsString(
-            'data-type="null"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="null">null</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php null
+            </div>
+            </div>
+            HTML,
             DumpCardRenderer::renderMessageCell(
                 self::makeRow(message: '&lt;?php null'),
                 self::traceLine(),
@@ -368,8 +552,16 @@ public function testRenderMessageCellSniffsNullFromNullLiteral(): void
 
     public function testRenderMessageCellSniffsNumberFromLeadingDigit(): void
     {
-        self::assertStringContainsString(
-            'data-type="number"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="number">number</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php 42
+            </div>
+            </div>
+            HTML,
             DumpCardRenderer::renderMessageCell(
                 self::makeRow(message: '&lt;?php 42'),
                 self::traceLine(),
@@ -387,22 +579,34 @@ public function testRenderMessageCellSniffsObjectFromIdentifierAndKeepsTheClassN
             0,
         );
 
-        self::assertStringContainsString(
-            'data-type="object"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="object">yii\base\Component</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php yii\base\Component#42
+            </div>
+            </div>
+            HTML,
             $html,
             "Identifier payload must be tagged as 'object'.",
         );
-        self::assertStringContainsString(
-            'yii\\base\\Component',
-            $html,
-            'The full class identifier must be exposed as the badge label.',
-        );
+
     }
 
     public function testRenderMessageCellSniffsStringTypeFromQuoteCharacter(): void
     {
-        self::assertStringContainsString(
-            'data-type="string"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="string">string</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php 'hello'
+            </div>
+            </div>
+            HTML,
             DumpCardRenderer::renderMessageCell(
                 self::makeRow(message: "&lt;?php 'hello'"),
                 self::traceLine(),
@@ -410,8 +614,16 @@ public function testRenderMessageCellSniffsStringTypeFromQuoteCharacter(): void
             ),
             "Single-quoted payload must be tagged as 'string'.",
         );
-        self::assertStringContainsString(
-            'data-type="string"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="string">string</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php "hello"
+            </div>
+            </div>
+            HTML,
             DumpCardRenderer::renderMessageCell(
                 self::makeRow(message: '&lt;?php "hello"'),
                 self::traceLine(),
@@ -421,12 +633,41 @@ public function testRenderMessageCellSniffsStringTypeFromQuoteCharacter(): void
         );
     }
 
+    public function testRenderMessageCellSubstitutesInvalidUtf8InTheExactCardHtml(): void
+    {
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="object">safe</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            safe�tail
+            </div>
+            </div>
+            HTML,
+            DumpCardRenderer::renderMessageCell(
+                self::makeRow(message: "safe\xFFtail"),
+                self::traceLine(),
+                0,
+            ),
+            'Invalid UTF-8 must be substituted rather than blanking or truncating the card.',
+        );
+    }
+
     public function testRenderMessageCellTrimsWhitespaceBeforeTypeDetection(): void
     {
-        self::assertStringContainsString(
-            'data-type="number"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="number">number</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+                42
+            </div>
+            </div>
+            HTML,
             DumpCardRenderer::renderMessageCell(
-                self::makeRow(message: '   42'),
+                self::makeRow(message: '    42'),
                 self::traceLine(),
                 0,
             ),
@@ -442,16 +683,20 @@ public function testRenderMessageCellWrapsPayloadInTheDumpCardContainer(): void
             0,
         );
 
-        self::assertStringContainsString(
-            'class="yii-debug-dump"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-dump">
+            <header class="yii-debug-dump-card-head">
+            <span class="yii-debug-dump-index" aria-hidden="true">#1</span><span class="yii-debug-dump-type" data-type="string">string</span><span class="yii-debug-dump-meta"></span>
+            </header><div class="yii-debug-dump-body">
+            &lt;?php "x"
+            </div>
+            </div>
+            HTML,
             $html,
             'Outer wrapper class must be present.',
         );
-        self::assertStringContainsString(
-            'class="yii-debug-dump-body"',
-            $html,
-            'Body wrapper class must be present.',
-        );
+
     }
 
     /**
diff --git a/tests/Panel/Dump/DumpRowTest.php b/tests/Panel/Dump/DumpRowTest.php
index 51b6b56..ef5292f 100644
--- a/tests/Panel/Dump/DumpRowTest.php
+++ b/tests/Panel/Dump/DumpRowTest.php
@@ -35,65 +35,15 @@ public function testFromArrayRoundTripsEveryField(): void
         );
     }
 
-    public function testFromLoggerTupleFallsBackToEmptyValuesForAMalformedTuple(): void
-    {
-        $row = DumpRow::fromLoggerTuple([]);
-
-        self::assertSame(
-            '',
-            $row->message,
-            'Missing payload must fall back to an empty string.',
-        );
-        self::assertSame(
-            0,
-            $row->level,
-            "Missing level must fall back to '0'.",
-        );
-        self::assertSame(
-            '',
-            $row->category,
-            'Missing category must fall back to an empty string.',
-        );
-        self::assertSame(
-            0.0,
-            $row->time,
-            "Missing timestamp must fall back to '0'.",
-        );
-        self::assertSame(
-            [],
-            $row->trace,
-            'Missing trace must fall back to an empty list.',
-        );
-    }
-
-    public function testFromLoggerTupleKeepsOnlyStringKeyedArrayTraceFrames(): void
+    public function testFromLoggerTupleUsesCanonicalFieldsAndScalesTime(): void
     {
         $row = DumpRow::fromLoggerTuple(
             [
                 'msg',
                 LogLevel::TRACE,
                 'app',
-                1.0,
-                [['file' => 'a.php', 7 => 'dropped'], 'not-a-frame'],
-            ],
-        );
-
-        self::assertSame(
-            [['file' => 'a.php']],
-            $row->trace,
-            'Non-array frames and integer keys must be dropped.',
-        );
-    }
-
-    public function testFromLoggerTupleNarrowsNumericStringsAndScalesTime(): void
-    {
-        $row = DumpRow::fromLoggerTuple(
-            [
-                'msg',
-                '8',
-                'app',
-                '2.5',
-                [],
+                2.5,
+                [['file' => 'a.php']],
             ],
         );
 
@@ -103,20 +53,25 @@ public function testFromLoggerTupleNarrowsNumericStringsAndScalesTime(): void
             'Payload must round-trip verbatim.',
         );
         self::assertSame(
-            8,
+            LogLevel::TRACE,
             $row->level,
-            "Numeric-string level must narrow to 'int'.",
+            'Level must come from the canonical logger tuple.',
         );
         self::assertSame(
             'app',
             $row->category,
-            'Category must come from the logger tuple category position.',
+            'Category must come from the canonical logger tuple.',
         );
         self::assertSame(
             2_500.0,
             $row->time,
             'Timestamp must be scaled to milliseconds.',
         );
+        self::assertSame(
+            [['file' => 'a.php']],
+            $row->trace,
+            'Trace frames must be preserved.',
+        );
     }
 
     public function testThrowHydrationExceptionWhenAFieldIsMissing(): void
diff --git a/tests/Panel/Event/EventCellRendererTest.php b/tests/Panel/Event/EventCellRendererTest.php
index e5fcbc5..ae36c1b 100644
--- a/tests/Panel/Event/EventCellRendererTest.php
+++ b/tests/Panel/Event/EventCellRendererTest.php
@@ -20,37 +20,29 @@ public function testRenderClassCellOmitsNamespacePrefixForGlobalClasses(): void
     {
         $cell = EventCellRenderer::renderClassCell(self::makeRow(class: 'stdClass'));
 
-        self::assertStringContainsString(
-            '<strong>stdClass</strong>',
+        self::assertSame(
+            <<<HTML
+            <span title="stdClass"><strong>stdClass</strong></span>
+            HTML,
             $cell,
             'Short name must render bold.',
         );
-        self::assertStringNotContainsString(
-            'yii-debug-muted',
-            $cell,
-            'Global classes must not emit a namespace prefix.',
-        );
+
     }
 
     public function testRenderClassCellSplitsFqcnIntoMutedNamespaceAndStrongShortName(): void
     {
         $cell = EventCellRenderer::renderClassCell(self::makeRow(class: 'yii\\base\\Event'));
 
-        self::assertStringContainsString(
-            'yii-debug-muted',
+        self::assertSame(
+            <<<HTML
+            <span title="yii\base\Event"><span class="yii-debug-muted">yii\base\</span><wbr><strong>Event</strong></span>
+            HTML,
             $cell,
             'Namespace prefix must render muted.',
         );
-        self::assertStringContainsString(
-            '<strong>Event</strong>',
-            $cell,
-            'Short name must render bold.',
-        );
-        self::assertStringContainsString(
-            'yii\base\Event',
-            $cell,
-            'Full FQCN must sit in the `title` attribute.',
-        );
+
+
     }
 
     public function testRenderSenderCellRendersEmDashForStaticEvents(): void
@@ -66,16 +58,14 @@ public function testRenderSenderCellSplitsFqcnIntoMutedNamespaceAndStrongShortNa
     {
         $cell = EventCellRenderer::renderSenderCell(self::makeRow(senderClass: 'yii\\web\\Application'));
 
-        self::assertStringContainsString(
-            'yii-debug-muted',
+        self::assertSame(
+            <<<HTML
+            <span title="yii\web\Application"><span class="yii-debug-muted">yii\web\</span><wbr><strong>Application</strong></span>
+            HTML,
             $cell,
             'Namespace prefix must render muted.',
         );
-        self::assertStringContainsString(
-            '<strong>Application</strong>',
-            $cell,
-            'Short name must render bold.',
-        );
+
     }
 
     public function testRenderStaticCellRendersEmDashForObjectEvents(): void
@@ -91,16 +81,14 @@ public function testRenderStaticCellRendersMutedBadgeForStaticEvents(): void
     {
         $cell = EventCellRenderer::renderStaticCell(self::makeRow(isStatic: '1'));
 
-        self::assertStringContainsString(
-            'yii-debug-badge-muted',
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-badge yii-debug-badge-muted">static</span>
+            HTML,
             $cell,
             'Static flag must render the muted badge.',
         );
-        self::assertStringContainsString(
-            'static',
-            $cell,
-            "Badge text must read 'static'.",
-        );
+
     }
 
     public function testRenderTimeCellFormatsTimestampAsHmsWithMillis(): void
diff --git a/tests/Panel/Log/LogCellRendererTest.php b/tests/Panel/Log/LogCellRendererTest.php
index 8883f8d..53daf98 100644
--- a/tests/Panel/Log/LogCellRendererTest.php
+++ b/tests/Panel/Log/LogCellRendererTest.php
@@ -11,9 +11,9 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * Unit tests for {@see LogCellRenderer} covering the typed cell renderers used by the logs grid (time, level,
- * two-tone category label, time-since-previous navigation, message + trace, SQL highlighting for DB command entries,
- * row options).
+ * Unit tests for {@see LogCellRenderer} covering the typed cell renderers used by the logs grid (time, level, two-tone
+ * category label, time-since-previous navigation, message + trace, SQL highlighting for DB command entries, row options
+ * ).
  */
 #[Group('panel')]
 #[Group('log')]
@@ -71,8 +71,10 @@ public function testBuildRowOptionsOmitsClassForLevelsWithoutVariantMapping(): v
 
     public function testRenderCategoryCellKeepsMethodSuffixInsideStrongShortName(): void
     {
-        self::assertStringContainsString(
-            '<strong>Command::query</strong>',
+        self::assertSame(
+            <<<HTML
+            <span title="yii\db\Command::query"><span class="yii-debug-muted">yii\db\</span><wbr><strong>Command::query</strong></span>
+            HTML,
             LogCellRenderer::renderCategoryCell(self::makeRow(category: 'yii\\db\\Command::query')),
             'Method pair must render bold as one segment.',
         );
@@ -82,32 +84,28 @@ public function testRenderCategoryCellRendersPlainCategoryWithoutMutedPrefix():
     {
         $cell = LogCellRenderer::renderCategoryCell(self::makeRow(category: 'application'));
 
-        self::assertStringContainsString(
-            '<strong>application</strong>',
+        self::assertSame(
+            <<<HTML
+            <span title="application"><strong>application</strong></span>
+            HTML,
             $cell,
             'Plain category must render bold.',
         );
-        self::assertStringNotContainsString(
-            'yii-debug-muted',
-            $cell,
-            'Plain categories must not emit a namespace prefix.',
-        );
+
     }
 
     public function testRenderCategoryCellSplitsFqcnCategoryIntoMutedNamespaceAndStrongShortName(): void
     {
         $cell = LogCellRenderer::renderCategoryCell(self::makeRow(category: 'yii\\web\\UrlManager::parseRequest'));
 
-        self::assertStringContainsString(
-            'yii-debug-muted',
+        self::assertSame(
+            <<<HTML
+            <span title="yii\web\UrlManager::parseRequest"><span class="yii-debug-muted">yii\web\</span><wbr><strong>UrlManager::parseRequest</strong></span>
+            HTML,
             $cell,
             'Namespace prefix must render muted.',
         );
-        self::assertStringContainsString(
-            'title="yii\web\UrlManager::parseRequest"',
-            $cell,
-            'Full category must sit in the `title` attribute.',
-        );
+
     }
 
     public function testRenderLevelCellWrapsLevelNameInVocabularyChip(): void
@@ -122,13 +120,17 @@ public function testRenderLevelCellWrapsLevelNameInVocabularyChip(): void
             LogCellRenderer::renderLevelCell(self::makeRow(level: LogLevel::WARNING)),
             "Warning level must wear the 'warning' chip.",
         );
-        self::assertStringContainsString(
-            'yii-debug-level-trace',
+        self::assertSame(
+            <<<'HTML'
+        <span class="yii-debug-level-chip yii-debug-level-trace">trace</span>
+        HTML,
             LogCellRenderer::renderLevelCell(self::makeRow(level: LogLevel::TRACE)),
             "Trace level must wear the 'trace' chip.",
         );
-        self::assertStringContainsString(
-            'yii-debug-level-profile',
+        self::assertSame(
+            <<<'HTML'
+        <span class="yii-debug-level-chip yii-debug-level-profile">profile</span>
+        HTML,
             LogCellRenderer::renderLevelCell(self::makeRow(level: LogLevel::PROFILE)),
             "Profile level must wear the 'profile' chip.",
         );
@@ -144,40 +146,39 @@ public function testRenderMessageCellAppendsTraceListWhenTraceHasFrames(): void
             self::traceLine(),
         );
 
-        self::assertStringContainsString(
-            'Something happened',
+        self::assertSame(
+            <<<HTML
+            Something happened<ul class="yii-debug-trace">
+            <li>
+            /app/User.php:
+            </li>
+            </ul>
+            HTML,
             $html,
             'Message text must be present.',
         );
-        self::assertStringContainsString(
-            'class="yii-debug-trace"',
-            $html,
-            'Trace list must carry the dedicated class.',
-        );
-        self::assertStringContainsString(
-            'User.php',
-            $html,
-            'Trace list must render frame metadata.',
-        );
     }
 
     public function testRenderMessageCellClampsLongMessageBehindMoreToggle(): void
     {
+        $message = str_repeat('long message segment ', 40);
+
         $html = LogCellRenderer::renderMessageCell(
-            self::makeRow(message: str_repeat('long message segment ', 40)),
+            self::makeRow(message: $message),
             self::traceLine(),
         );
 
-        self::assertStringContainsString(
-            'yii-debug-cell-more',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-cell-more">
+            <div class="yii-debug-cell-more-body">
+            {$message}
+            </div><button class="yii-debug-cell-more-toggle" type="button" aria-expanded="false" data-yii-debug-toggle="cell-more">[+] Show more</button>
+            </div>
+            HTML,
             $html,
             'Long message must render inside the clamp.',
         );
-        self::assertStringContainsString(
-            '[+] Show more',
-            $html,
-            'Clamp must expose the expand toggle.',
-        );
     }
 
     public function testRenderMessageCellEscapesPlainMessageWhenTraceIsEmpty(): void
@@ -187,15 +188,12 @@ public function testRenderMessageCellEscapesPlainMessageWhenTraceIsEmpty(): void
             self::traceLine(),
         );
 
-        self::assertStringContainsString(
-            '&lt;script&gt;',
-            $html,
-            'Message must be HTML-escaped.',
-        );
-        self::assertStringNotContainsString(
-            'yii-debug-trace',
+        self::assertSame(
+            <<<HTML
+            &lt;script&gt;alert(1)&lt;/script&gt;
+            HTML,
             $html,
-            'Empty trace must omit the trace list.',
+            'Message must render as exact HTML-escaped text without a trace list.',
         );
     }
 
@@ -206,16 +204,16 @@ public function testRenderMessageCellHighlightsSqlForDbCommandCategory(): void
             self::traceLine(),
         );
 
-        self::assertStringContainsString(
-            'class="yii-debug-db-sql"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-db-sql">
+            <span class="yii-debug-sql-kw">SELECT</span> * <span class="yii-debug-sql-kw">FROM</span> `user` <span class="yii-debug-sql-kw">WHERE</span> id = <span class="yii-debug-sql-num">1</span>
+            </div>
+            HTML,
             $html,
             'SQL body must wear the mono wrapper.',
         );
-        self::assertStringContainsString(
-            '<span class="yii-debug-sql-kw">SELECT</span>',
-            $html,
-            'Keywords must be token-wrapped.',
-        );
+
     }
 
     public function testRenderMessageCellKeepsPlainEscapingForNonDbCategory(): void
@@ -234,10 +232,12 @@ public function testRenderMessageCellKeepsPlainEscapingForNonDbCategory(): void
 
     public function testRenderMessageCellLeavesShortMessageUnclamped(): void
     {
-        self::assertStringNotContainsString(
-            'yii-debug-cell-more',
+        self::assertSame(
+            <<<HTML
+            short message
+            HTML,
             LogCellRenderer::renderMessageCell(self::makeRow(message: 'short message'), self::traceLine()),
-            'Short message must not render the clamp.',
+            'Short message must render exactly without the clamp.',
         );
     }
 
@@ -285,31 +285,15 @@ public function testRenderTimeSincePreviousCellEmitsAbsoluteDiffWithUnitsAndArro
             ),
         );
 
-        self::assertStringContainsString(
-            'class="yii-debug-since-previous"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-since-previous">
+            <a class="yii-debug-since-previous-btn" href="#log-6">&lt;</a><span>1s 500ms</span><a class="yii-debug-since-previous-btn" href="#log-8">&gt;</a>
+            </div>
+            HTML,
             $html,
             'Wrapper class must be present.',
         );
-        self::assertStringContainsString(
-            '1s',
-            $html,
-            'Diff must include the seconds component.',
-        );
-        self::assertStringContainsString(
-            '500ms',
-            $html,
-            'Diff must include the milliseconds component.',
-        );
-        self::assertStringContainsString(
-            'href="#log-6"',
-            $html,
-            'Previous arrow must link to the previous row anchor.',
-        );
-        self::assertStringContainsString(
-            'href="#log-8"',
-            $html,
-            'Next arrow must link to the next row anchor.',
-        );
     }
 
     public function testRenderTimeSincePreviousCellIncludesHoursAndMinutesWhenDeltaExceedsOneHour(): void
@@ -323,8 +307,12 @@ public function testRenderTimeSincePreviousCellIncludesHoursAndMinutesWhenDeltaE
             ),
         );
 
-        self::assertStringContainsString(
-            '2h' . "\u{00A0}" . '5m' . "\u{00A0}" . '7s' . "\u{00A0}" . '250ms',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-since-previous">
+            <a class="yii-debug-since-previous-btn" href="#log-1">&lt;</a><span>2h 5m 7s 250ms</span><a class="yii-debug-since-previous-btn" href="#log-2">&gt;</a>
+            </div>
+            HTML,
             $html,
             'Diff components must be integral and rendered in exact descending unit order.',
         );
@@ -341,24 +329,15 @@ public function testRenderTimeSincePreviousCellRendersDisabledArrowsAtBoundaries
             )
         );
 
-        self::assertStringContainsString(
-            'is-disabled',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-since-previous">
+            <span class="yii-debug-since-previous-btn is-disabled">&lt;</span><span>0ms</span><span class="yii-debug-since-previous-btn is-disabled">&gt;</span>
+            </div>
+            HTML,
             $html,
             'Boundary rows must render disabled arrows.',
         );
-        self::assertStringNotContainsString(
-            'href="#log-',
-            $html,
-            'Disabled arrows must not contain anchor hrefs.',
-        );
-        self::assertStringContainsString(
-            '0ms',
-            $html,
-            "Equal timestamps must render '0ms'.",
-        );
-        self::assertStringNotContainsString("0h\u{00A0}", $html, 'Zero hours must be omitted.');
-        self::assertStringNotContainsString("0m\u{00A0}", $html, 'Zero minutes must be omitted.');
-        self::assertStringNotContainsString("0s\u{00A0}", $html, 'Zero seconds must be omitted.');
     }
 
     public function testRenderTimeSincePreviousCellUsesSixtyMinutesPerHour(): void
@@ -372,10 +351,25 @@ public function testRenderTimeSincePreviousCellUsesSixtyMinutesPerHour(): void
             self::makeRow(time: $base + (60 * 60 + 30) * 1000, timeOfPrevious: $base),
         );
 
-        self::assertStringNotContainsString('1h', $belowHour, 'Fifty-nine minutes must stay below one hour.');
-        self::assertStringContainsString('59m', $belowHour, 'The remaining minutes must be preserved below one hour.');
-        self::assertStringContainsString('1h', $aboveHour, 'Sixty minutes must roll over to one hour.');
-        self::assertStringNotContainsString('60m', $aboveHour, 'Rolled-over hours must leave zero minutes omitted.');
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-since-previous">
+            <span class="yii-debug-since-previous-btn is-disabled">&lt;</span><span>59m 30s 0ms</span><span class="yii-debug-since-previous-btn is-disabled">&gt;</span>
+            </div>
+            HTML,
+            $belowHour,
+            'Fifty-nine minutes must stay below one hour.',
+        );
+
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-since-previous">
+            <span class="yii-debug-since-previous-btn is-disabled">&lt;</span><span>1h 30s 0ms</span><span class="yii-debug-since-previous-btn is-disabled">&gt;</span>
+            </div>
+            HTML,
+            $aboveHour,
+            'Sixty minutes must roll over to one hour.',
+        );
     }
 
     /**
diff --git a/tests/Panel/Log/LogRowTest.php b/tests/Panel/Log/LogRowTest.php
index acd3a1d..6a384de 100644
--- a/tests/Panel/Log/LogRowTest.php
+++ b/tests/Panel/Log/LogRowTest.php
@@ -41,105 +41,15 @@ public function testFromArrayRoundTripsEveryField(): void
         );
     }
 
-    public function testFromLoggerTupleExportsNonStringMessage(): void
+    public function testFromLoggerTupleUsesCanonicalFieldsAndDefaultsOptionalMemory(): void
     {
         $row = LogRow::fromLoggerTuple(
             [
-                ['a' => 1],
+                'message',
                 LogLevel::INFO,
                 'app',
-                1.0,
-                [],
-            ],
-            1,
-            1.0,
-            null,
-            null,
-        );
-
-        self::assertStringContainsString(
-            'a',
-            $row->message,
-            'Array payload must be exported to a readable string.',
-        );
-    }
-
-    public function testFromLoggerTupleFallsBackToZeroesForAMalformedTuple(): void
-    {
-        $row = LogRow::fromLoggerTuple(
-            [],
-            1,
-            0.0,
-            null,
-            null,
-        );
-
-        self::assertSame(
-            0,
-            $row->level,
-            "Missing level must fall back to '0'.",
-        );
-        self::assertSame(
-            '',
-            $row->category,
-            'Missing category must fall back to an empty string.',
-        );
-        self::assertSame(
-            0.0,
-            $row->time,
-            "Missing timestamp must fall back to '0'.",
-        );
-        self::assertSame(
-            0,
-            $row->memory,
-            "Missing memory must fall back to '0'.",
-        );
-        self::assertSame(
-            [],
-            $row->trace,
-            'Missing trace must fall back to an empty list.',
-        );
-    }
-
-    public function testFromLoggerTupleKeepsOnlyStringKeyedArrayTraceFrames(): void
-    {
-        $row = LogRow::fromLoggerTuple(
-            [
-                'msg',
-                LogLevel::INFO,
-                'app',
-                1.0,
-                [
-                    [
-                        'file' => 'a.php',
-                        7 => 'dropped',
-                    ],
-                    'not-a-frame',
-                ],
-            ],
-            1,
-            1.0,
-            null,
-            null,
-        );
-
-        self::assertSame(
-            [['file' => 'a.php']],
-            $row->trace,
-            'Non-array frames and integer keys must be dropped.',
-        );
-    }
-
-    public function testFromLoggerTupleNarrowsNumericStringsAndScalesTime(): void
-    {
-        $row = LogRow::fromLoggerTuple(
-            [
-                'msg',
-                '4',
-                'app',
-                '2.5',
-                [],
-                '4096',
+                2.5,
+                [['file' => 'a.php']],
             ],
             3,
             1.5,
@@ -153,9 +63,9 @@ public function testFromLoggerTupleNarrowsNumericStringsAndScalesTime(): void
             'Row id is assigned by the caller.',
         );
         self::assertSame(
-            4,
+            LogLevel::INFO,
             $row->level,
-            "Numeric-string level must narrow to 'int'.",
+            'Level must come from the canonical logger tuple.',
         );
         self::assertSame(
             'app',
@@ -178,9 +88,9 @@ public function testFromLoggerTupleNarrowsNumericStringsAndScalesTime(): void
             'Delta stays in seconds.',
         );
         self::assertSame(
-            4_096,
+            0,
             $row->memory,
-            "Numeric-string memory must narrow to 'int'.",
+            'Omitted memory must default to zero.',
         );
         self::assertSame(
             2,
@@ -192,6 +102,11 @@ public function testFromLoggerTupleNarrowsNumericStringsAndScalesTime(): void
             $row->idOfNext,
             'Next id is assigned by the caller.',
         );
+        self::assertSame(
+            [['file' => 'a.php']],
+            $row->trace,
+            'Trace frames must be preserved.',
+        );
     }
 
     public function testThrowHydrationExceptionWhenLevelIsANumericString(): void
diff --git a/tests/Panel/Mail/MailCardRendererTest.php b/tests/Panel/Mail/MailCardRendererTest.php
index f090c40..97b927d 100644
--- a/tests/Panel/Mail/MailCardRendererTest.php
+++ b/tests/Panel/Mail/MailCardRendererTest.php
@@ -26,16 +26,25 @@ public function testRenderItemAvatarFallsBackToFixedHueWhenSenderIsEmpty(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            '--mail-hue: 210',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
             $html,
             "Empty sender must fall back to hue '210'.",
         );
-        self::assertStringContainsString(
-            '>?<',
-            $html,
-            "Empty sender must render '?' as the initial.",
-        );
     }
 
     public function testRenderItemBodyPreviewUsesUnicodeCharacterBoundaries(): void
@@ -49,14 +58,41 @@ public function testRenderItemBodyPreviewUsesUnicodeCharacterBoundaries(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            'class="yii-debug-mail-preview">' . str_repeat('é', 140) . '</span>',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">éééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééé</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            éééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééé
+            </div>
+            </article>
+            HTML,
             $exact,
             'Exactly 140 Unicode characters must remain complete and omit the ellipsis.',
         );
-        self::assertStringNotContainsString('…', $exact, 'The exact preview limit must not be treated as overflow.');
-        self::assertStringContainsString(
-            'class="yii-debug-mail-preview">É' . str_repeat('é', 139) . '…</span>',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Éééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééé…</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Ééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééé
+            </div>
+            </article>
+            HTML,
             $long,
             'Long Unicode previews must start at the first character and truncate on a character boundary.',
         );
@@ -69,16 +105,25 @@ public function testRenderItemEscapesBodyContent(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            '&lt;script&gt;',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">&lt;script&gt;alert(1)&lt;/script&gt;</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            &lt;script&gt;alert(1)&lt;/script&gt;
+            </div>
+            </article>
+            HTML,
             $html,
             'Body must be HTML-escaped.',
         );
-        self::assertStringNotContainsString(
-            '<script>alert',
-            $html,
-            'Raw script tags must not leak into the output.',
-        );
     }
 
     public function testRenderItemFormatsRelativeTimeForDaysAgoDelta(): void
@@ -90,8 +135,22 @@ public function testRenderItemFormatsRelativeTimeForDaysAgoDelta(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            '3 d ago',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span><span class="yii-debug-mail-time" title="Nov 11, 2023 · 22:13:20">3 d ago</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
             $html,
             "Days delta must read 'X d ago'.",
         );
@@ -106,8 +165,22 @@ public function testRenderItemFormatsRelativeTimeForHoursAgoDelta(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            '2 h ago',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span><span class="yii-debug-mail-time" title="Nov 14, 2023 · 20:13:20">2 h ago</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
             $html,
             "Hours delta must read 'X h ago'.",
         );
@@ -122,8 +195,22 @@ public function testRenderItemFormatsRelativeTimeForJustNowDelta(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            'just now',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span><span class="yii-debug-mail-time" title="Nov 14, 2023 · 22:13:20">just now</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
             $html,
             "Under-minute delta must read 'just now'.",
         );
@@ -138,8 +225,22 @@ public function testRenderItemFormatsRelativeTimeForMinutesAgoDelta(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            '10 min ago',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span><span class="yii-debug-mail-time" title="Nov 14, 2023 · 22:03:20">10 min ago</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
             $html,
             "Minutes delta must read 'X min ago'.",
         );
@@ -147,8 +248,22 @@ public function testRenderItemFormatsRelativeTimeForMinutesAgoDelta(): void
 
     public function testRenderItemOmitsBodyPreviewWhenBodyIsEmpty(): void
     {
-        self::assertStringNotContainsString(
-            'yii-debug-mail-preview',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body yii-debug-mail-body-empty">
+            (empty body)
+            </div>
+            </article>
+            HTML,
             MailCardRenderer::renderItem(self::makeMessage(body: ''), self::makeUrlBuilder()),
             'Empty body must omit the preview span.',
         );
@@ -156,8 +271,22 @@ public function testRenderItemOmitsBodyPreviewWhenBodyIsEmpty(): void
 
     public function testRenderItemOmitsDownloadLinkWhenFileIsEmpty(): void
     {
-        self::assertStringNotContainsString(
-            'yii-debug-mail-download',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
             MailCardRenderer::renderItem(self::makeMessage(file: ''), self::makeUrlBuilder()),
             'Empty file must omit the download link.',
         );
@@ -165,8 +294,22 @@ public function testRenderItemOmitsDownloadLinkWhenFileIsEmpty(): void
 
     public function testRenderItemOmitsRecipientBlockWhenAllListsAreEmpty(): void
     {
-        self::assertStringNotContainsString(
-            'yii-debug-mail-recipients',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
             MailCardRenderer::renderItem(self::makeMessage(), self::makeUrlBuilder()),
             'Empty recipient lists must omit the block.',
         );
@@ -174,8 +317,22 @@ public function testRenderItemOmitsRecipientBlockWhenAllListsAreEmpty(): void
 
     public function testRenderItemOmitsTechDetailsWhenBothHeadersAndCharsetAreEmpty(): void
     {
-        self::assertStringNotContainsString(
-            'yii-debug-mail-tech',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
             MailCardRenderer::renderItem(self::makeMessage(headers: '', charset: ''), self::makeUrlBuilder()),
             'Empty headers and charset must omit the tech details.',
         );
@@ -183,8 +340,22 @@ public function testRenderItemOmitsTechDetailsWhenBothHeadersAndCharsetAreEmpty(
 
     public function testRenderItemOmitsTimeWhenNull(): void
     {
-        self::assertStringNotContainsString(
-            'yii-debug-mail-time',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
             MailCardRenderer::renderItem(self::makeMessage(time: null), self::makeUrlBuilder()),
             "'null' time must omit the time span.",
         );
@@ -231,16 +402,26 @@ public function testRenderItemRendersBodyPreviewTruncatedAt140Characters(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            'class="yii-debug-mail-preview"',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Lorem ipsum dolor sit amet, Lorem ipsum dolor sit amet, Lorem ipsum dolor sit amet, Lorem ipsum dolor sit amet, Lorem ipsum dolor sit amet, …</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            {$longBody}
+            </div>
+            </article>
+            HTML,
             $html,
             'Preview span must be present when body is non-empty.',
         );
-        self::assertStringContainsString(
-            '…',
-            $html,
-            'Long previews must end with an ellipsis.',
-        );
+
     }
 
     public function testRenderItemRendersDownloadLinkWhenFileIsSet(): void
@@ -250,39 +431,96 @@ public function testRenderItemRendersDownloadLinkWhenFileIsSet(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            'class="yii-debug-mail-download"',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span><a class="yii-debug-mail-download" href="/debug/download-mail?file=/tmp/mail.eml" title="Download .eml" aria-label="Download .eml"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><path d="M12 4v12"/><path d="M7 11l5 5 5-5"/><path d="M5 20h14"/></svg></a>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
             $html,
             'Download link must carry the dedicated class.',
         );
-        self::assertStringContainsString(
-            'href="/debug/download-mail?file=/tmp/mail.eml"',
-            $html,
-            'Download href must round-trip the URL builder output.',
-        );
     }
 
     public function testRenderItemRendersEachRecipientGroupWhenItIsTheOnlyPopulatedList(): void
     {
         $cases = [
-            'to' => [['only-to@example.com'], [], [], [], 'data-role="to"'],
-            'cc' => [[], ['only-cc@example.com'], [], [], 'data-role="cc"'],
-            'bcc' => [[], [], ['only-bcc@example.com'], [], 'data-role="bcc"'],
-            'reply' => [[], [], [], ['only-reply@example.com'], 'data-role="reply"'],
+            'to' => [
+                ['only-to@example.com'],
+                [],
+                [],
+                [],
+                'to',
+                'TO',
+                'only-to@example.com',
+            ],
+            'cc' => [
+                [],
+                ['only-cc@example.com'],
+                [],
+                [],
+                'cc',
+                'CC',
+                'only-cc@example.com',
+            ],
+            'bcc' => [
+                [],
+                [],
+                ['only-bcc@example.com'],
+                [],
+                'bcc',
+                'BCC',
+                'only-bcc@example.com',
+            ],
+            'reply' => [
+                [],
+                [],
+                [],
+                ['only-reply@example.com'],
+                'reply',
+                'REPLY-TO',
+                'only-reply@example.com',
+            ],
         ];
 
-        foreach ($cases as $name => [$to, $cc, $bcc, $replyTo, $role]) {
+        foreach ($cases as $name => [$to, $cc, $bcc, $replyTo, $role, $label, $address]) {
             $html = MailCardRenderer::renderItem(
                 self::makeMessage(to: $to, cc: $cc, bcc: $bcc, replyTo: $replyTo),
                 self::makeUrlBuilder(),
             );
 
-            self::assertStringContainsString('yii-debug-mail-recipients', $html, "{$name} alone must render recipients.");
-            self::assertStringContainsString($role, $html, "{$name} alone must render its role label.");
             self::assertSame(
-                1,
-                substr_count($html, 'class="yii-debug-mail-recipient-pill"'),
-                "{$name} must render one pill.",
+                <<<HTML
+                <article class="yii-debug-mail-card">
+                <header class="yii-debug-mail-card-head">
+                <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+                <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+                Test subject
+                </h2><span class="yii-debug-mail-preview">Test body</span>
+                </div><div class="yii-debug-mail-meta">
+                <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+                </div>
+                </header><div class="yii-debug-mail-recipients">
+                <div class="yii-debug-mail-recipient-group">
+                <span class="yii-debug-mail-recipient-label" data-role="{$role}">{$label}</span><span class="yii-debug-mail-recipient-pills"><span class="yii-debug-mail-recipient-pill" title="{$address}">{$address}</span></span>
+                </div>
+                </div><div class="yii-debug-mail-body">
+                Test body
+                </div>
+                </article>
+                HTML,
+                $html,
+                "{$name} alone must render the exact recipient card markup.",
             );
         }
     }
@@ -294,16 +532,26 @@ public function testRenderItemRendersEmptyBodyPlaceholderWhenBodyIsEmpty(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            'yii-debug-mail-body-empty',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body yii-debug-mail-body-empty">
+            (empty body)
+            </div>
+            </article>
+            HTML,
             $html,
             'Empty body must use the empty-body modifier.',
         );
-        self::assertStringContainsString(
-            '(empty body)',
-            $html,
-            'Empty body placeholder must be visible.',
-        );
+
     }
 
     public function testRenderItemRendersFallbackPlaceholdersWhenFromOrSubjectAreEmpty(): void
@@ -313,16 +561,25 @@ public function testRenderItemRendersFallbackPlaceholdersWhenFromOrSubjectAreEmp
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            '(no sender)',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            (no subject)
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
             $html,
             "Empty from must fall back to '(no sender)'.",
         );
-        self::assertStringContainsString(
-            '(no subject)',
-            $html,
-            "Empty subject must fall back to '(no subject)'.",
-        );
     }
 
     public function testRenderItemRendersFromAndSubject(): void
@@ -332,23 +589,35 @@ public function testRenderItemRendersFromAndSubject(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            'sender@example.com',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 191' aria-hidden="true">S</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">sender@example.com</span><h2 class="yii-debug-mail-subject">
+            Welcome
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
             $html,
             'Sender address must be visible.',
         );
-        self::assertStringContainsString(
-            'Welcome',
-            $html,
-            'Subject must be visible.',
-        );
     }
 
     public function testRenderItemRendersRecipientGroupsWithLabelsAndPills(): void
     {
         $html = MailCardRenderer::renderItem(
             self::makeMessage(
-                to: ['a@example.com', 'b@example.com'],
+                to: [
+                    'a@example.com',
+                    'b@example.com',
+                ],
                 cc: ['carbon@example.com'],
                 bcc: ['bcc@example.com'],
                 replyTo: ['reply@example.com'],
@@ -356,41 +625,35 @@ public function testRenderItemRendersRecipientGroupsWithLabelsAndPills(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            'class="yii-debug-mail-recipients"',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-recipients">
+            <div class="yii-debug-mail-recipient-group">
+            <span class="yii-debug-mail-recipient-label" data-role="to">TO</span><span class="yii-debug-mail-recipient-pills"><span class="yii-debug-mail-recipient-pill" title="a@example.com">a@example.com</span><span class="yii-debug-mail-recipient-pill" title="b@example.com">b@example.com</span></span>
+            </div><div class="yii-debug-mail-recipient-group">
+            <span class="yii-debug-mail-recipient-label" data-role="cc">CC</span><span class="yii-debug-mail-recipient-pills"><span class="yii-debug-mail-recipient-pill" title="carbon@example.com">carbon@example.com</span></span>
+            </div><div class="yii-debug-mail-recipient-group">
+            <span class="yii-debug-mail-recipient-label" data-role="bcc">BCC</span><span class="yii-debug-mail-recipient-pills"><span class="yii-debug-mail-recipient-pill" title="bcc@example.com">bcc@example.com</span></span>
+            </div><div class="yii-debug-mail-recipient-group">
+            <span class="yii-debug-mail-recipient-label" data-role="reply">REPLY-TO</span><span class="yii-debug-mail-recipient-pills"><span class="yii-debug-mail-recipient-pill" title="reply@example.com">reply@example.com</span></span>
+            </div>
+            </div><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
             $html,
             'Recipients wrapper must be present.',
         );
-        self::assertStringContainsString(
-            'TO',
-            $html,
-            'TO label must be present.',
-        );
-        self::assertStringContainsString(
-            'CC',
-            $html,
-            'CC label must be present.',
-        );
-        self::assertStringContainsString(
-            'BCC',
-            $html,
-            'BCC label must be present.',
-        );
-        self::assertStringContainsString(
-            'REPLY-TO',
-            $html,
-            'REPLY-TO label must be present.',
-        );
-        self::assertStringContainsString(
-            'a@example.com',
-            $html,
-            'TO pill must include the address.',
-        );
-        self::assertStringContainsString(
-            'title="carbon@example.com">carbon@example.com</span>',
-            $html,
-            'CC pill must include the address.',
-        );
         self::assertSame(
             5,
             substr_count($html, 'class="yii-debug-mail-recipient-pill"'),
@@ -405,21 +668,25 @@ public function testRenderItemRendersStatusFailWhenIsSuccessfulIsFalse(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            'yii-debug-mail-status-fail',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-fail" title="Mailer reported failure"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Failed</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
             $html,
             "Failed messages must use the 'fail' variant.",
         );
-        self::assertStringContainsString(
-            'Failed',
-            $html,
-            "Status label must read 'Failed'.",
-        );
-        self::assertStringContainsString(
-            'title="Mailer reported failure"',
-            $html,
-            'Failed status must retain its failure tooltip.',
-        );
     }
 
     public function testRenderItemRendersStatusOkWhenIsSuccessfulIsTrue(): void
@@ -429,21 +696,25 @@ public function testRenderItemRendersStatusOkWhenIsSuccessfulIsTrue(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            'yii-debug-mail-status-ok',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
             $html,
             "Successful messages must use the 'ok' variant.",
         );
-        self::assertStringContainsString(
-            'Sent',
-            $html,
-            "Status label must read 'Sent'.",
-        );
-        self::assertStringContainsString(
-            'title="Mailer reported success"',
-            $html,
-            'Successful status must retain its success tooltip.',
-        );
     }
 
     public function testRenderItemRendersTechDetailsWhenHeadersOrCharsetSet(): void
@@ -453,31 +724,31 @@ public function testRenderItemRendersTechDetailsWhenHeadersOrCharsetSet(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            'class="yii-debug-mail-tech"',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div><details class="yii-debug-mail-tech">
+            <summary>
+            <span class="yii-debug-mail-tech-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><path d="M9 6L4 12l5 6"/><path d="M15 6l5 6-5 6"/></svg></span><span class="yii-debug-mail-tech-label">Raw headers</span><span class="yii-debug-mail-tech-charset" title="Charset">UTF-8</span><span class="yii-debug-mail-tech-chevron" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M6 9l6 6 6-6"/></svg></span>
+            </summary><pre class="yii-debug-mail-headers">
+            X-Foo: bar
+            </pre>
+            </details>
+            </article>
+            HTML,
             $html,
             'Tech details wrapper must be present.',
         );
-        self::assertStringContainsString(
-            'class="yii-debug-mail-tech-icon"',
-            $html,
-            'Technical details must retain the code icon.',
-        );
-        self::assertStringContainsString(
-            'Raw headers',
-            $html,
-            'Tech summary label must be present.',
-        );
-        self::assertStringContainsString(
-            'X-Foo: bar',
-            $html,
-            'Header content must be visible.',
-        );
-        self::assertStringContainsString(
-            'UTF-8',
-            $html,
-            'Charset must be visible in the summary.',
-        );
     }
 
     public function testRenderItemRendersTechDetailsWhenOnlyOneTechnicalFieldIsSet(): void
@@ -491,10 +762,55 @@ public function testRenderItemRendersTechDetailsWhenOnlyOneTechnicalFieldIsSet()
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString('yii-debug-mail-tech', $headersOnly, 'Headers alone must render details.');
-        self::assertStringContainsString('X-Only: header', $headersOnly, 'Header-only details must retain the value.');
-        self::assertStringContainsString('yii-debug-mail-tech', $charsetOnly, 'Charset alone must render details.');
-        self::assertStringContainsString('UTF-16', $charsetOnly, 'Charset-only details must retain the value.');
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div><details class="yii-debug-mail-tech">
+            <summary>
+            <span class="yii-debug-mail-tech-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><path d="M9 6L4 12l5 6"/><path d="M15 6l5 6-5 6"/></svg></span><span class="yii-debug-mail-tech-label">Raw headers</span><span class="yii-debug-mail-tech-chevron" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M6 9l6 6 6-6"/></svg></span>
+            </summary><pre class="yii-debug-mail-headers">
+            X-Only: header
+            </pre>
+            </details>
+            </article>
+            HTML,
+            $headersOnly,
+            'Headers alone must render details.',
+        );
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div><details class="yii-debug-mail-tech">
+            <summary>
+            <span class="yii-debug-mail-tech-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><path d="M9 6L4 12l5 6"/><path d="M15 6l5 6-5 6"/></svg></span><span class="yii-debug-mail-tech-label">Raw headers</span><span class="yii-debug-mail-tech-charset" title="Charset">UTF-16</span><span class="yii-debug-mail-tech-chevron" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M6 9l6 6 6-6"/></svg></span>
+            </summary><pre class="yii-debug-mail-headers">
+            </pre>
+            </details>
+            </article>
+            HTML,
+            $charsetOnly,
+            'Charset alone must render details.',
+        );
     }
 
     public function testRenderItemRendersTimeWhenSet(): void
@@ -504,8 +820,22 @@ public function testRenderItemRendersTimeWhenSet(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            'class="yii-debug-mail-time"',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span><span class="yii-debug-mail-time" title="Nov 14, 2023 · 22:13:20">Nov 14, 2023 · 22:13:20</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
             $html,
             'Time span must carry the dedicated class.',
         );
@@ -527,8 +857,44 @@ public function testRenderItemRendersUnicodeAndEmptyLocalPartInitials(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString('>É<', $unicode, 'Unicode initials must be sliced and uppercased safely.');
-        self::assertStringContainsString('>@<', $emptyLocal, 'An empty local part must fall back to the full address.');
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 76' aria-hidden="true">É</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">élise@example.com</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
+            $unicode,
+            'Unicode initials must be sliced and uppercased safely.',
+        );
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 82' aria-hidden="true">@</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">@example.com</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
+            $emptyLocal,
+            'An empty local part must fall back to the full address.',
+        );
     }
 
     public function testRenderItemRendersUppercasedFirstLetterOfLocalPartAsInitial(): void
@@ -538,8 +904,22 @@ public function testRenderItemRendersUppercasedFirstLetterOfLocalPartAsInitial()
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            '>W<',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 204' aria-hidden="true">W</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">wilmer@example.com</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
             $html,
             'Initial must be the uppercased first letter of the local part.',
         );
@@ -552,16 +932,30 @@ public function testRenderItemSkipsRecipientGroupsThatAreEmpty(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            'user@example.com',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-recipients">
+            <div class="yii-debug-mail-recipient-group">
+            <span class="yii-debug-mail-recipient-label" data-role="to">TO</span><span class="yii-debug-mail-recipient-pills"><span class="yii-debug-mail-recipient-pill" title="user@example.com">user@example.com</span></span>
+            </div>
+            </div><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
             $html,
             "Populated 'TO' group must be rendered.",
         );
-        self::assertStringNotContainsString(
-            'CC',
-            $html,
-            "Empty 'CC' group must be skipped.",
-        );
+
     }
 
     public function testRenderItemUsesExactRelativeTimeBoundariesAndUnits(): void
@@ -578,26 +972,60 @@ public function testRenderItemUsesExactRelativeTimeBoundariesAndUnits(): void
         ];
 
         foreach ($cases as [$expected, $diff, $description]) {
+            $time = self::NOW - $diff;
+
+            $absoluteTime = date('M j, Y · H:i:s', $time);
+
             $html = MailCardRenderer::renderItem(
-                self::makeMessage(time: self::NOW - $diff),
+                self::makeMessage(time: $time),
                 self::makeUrlBuilder(),
             );
 
-            self::assertStringContainsString(
-                ">{$expected}<",
+            self::assertSame(
+                <<<HTML
+                <article class="yii-debug-mail-card">
+                <header class="yii-debug-mail-card-head">
+                <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+                <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+                Test subject
+                </h2><span class="yii-debug-mail-preview">Test body</span>
+                </div><div class="yii-debug-mail-meta">
+                <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span><span class="yii-debug-mail-time" title="{$absoluteTime}">{$expected}</span>
+                </div>
+                </header><div class="yii-debug-mail-body">
+                Test body
+                </div>
+                </article>
+                HTML,
                 $html,
-                "Relative time must use the canonical unit for {$description}.",
+                "Relative time must render the exact card markup for {$description}.",
             );
         }
 
-        $absolute = date('M j, Y · H:i:s', self::NOW - 2_592_000);
         $html = MailCardRenderer::renderItem(
             self::makeMessage(time: self::NOW - 2_592_000),
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(">{$absolute}<", $html, 'Thirty days must switch to the absolute label.');
-        self::assertStringNotContainsString('30 d ago', $html, 'The thirty-day boundary must not stay relative.');
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span><span class="yii-debug-mail-time" title="Oct 15, 2023 · 22:13:20">Oct 15, 2023 · 22:13:20</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
+            $html,
+            'Thirty days must switch to the absolute label.',
+        );
     }
 
     public function testRenderItemWrapsContentInArticleWithMailCardClass(): void
@@ -607,16 +1035,25 @@ public function testRenderItemWrapsContentInArticleWithMailCardClass(): void
             self::makeUrlBuilder(),
         );
 
-        self::assertStringContainsString(
-            'class="yii-debug-mail-card"',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-mail-card">
+            <header class="yii-debug-mail-card-head">
+            <span class="yii-debug-mail-avatar" style='--mail-hue: 210' aria-hidden="true">?</span><div class="yii-debug-mail-headline">
+            <span class="yii-debug-mail-from">(no sender)</span><h2 class="yii-debug-mail-subject">
+            Test subject
+            </h2><span class="yii-debug-mail-preview">Test body</span>
+            </div><div class="yii-debug-mail-meta">
+            <span class="yii-debug-mail-status yii-debug-mail-status-ok" title="Mailer reported success"><span class="yii-debug-mail-status-dot" aria-hidden="true"></span> Sent</span>
+            </div>
+            </header><div class="yii-debug-mail-body">
+            Test body
+            </div>
+            </article>
+            HTML,
             $html,
             'Outer wrapper class must be present.',
         );
-        self::assertStringContainsString(
-            'class="yii-debug-mail-card-head"',
-            $html,
-            'Head wrapper class must be present.',
-        );
     }
 
     /**
diff --git a/tests/Panel/Profile/ProfileCellRendererTest.php b/tests/Panel/Profile/ProfileCellRendererTest.php
index 26dcddd..9fa2f11 100644
--- a/tests/Panel/Profile/ProfileCellRendererTest.php
+++ b/tests/Panel/Profile/ProfileCellRendererTest.php
@@ -22,8 +22,10 @@ final class ProfileCellRendererTest extends TestCase
 {
     public function testRenderCategoryCellKeepsMethodSuffixInsideStrongShortName(): void
     {
-        self::assertStringContainsString(
-            '<strong>Command::query</strong>',
+        self::assertSame(
+            <<<HTML
+            <span title="yii\db\Command::query"><span class="yii-debug-muted">yii\db\</span><wbr><strong>Command::query</strong></span>
+            HTML,
             ProfileCellRenderer::renderCategoryCell(self::makeRow(category: 'yii\\db\\Command::query')),
             'Method pair must render bold as one segment.',
         );
@@ -33,32 +35,26 @@ public function testRenderCategoryCellRendersPlainCategoryWithoutMutedPrefix():
     {
         $cell = ProfileCellRenderer::renderCategoryCell(self::makeRow(category: 'application'));
 
-        self::assertStringContainsString(
-            '<strong>application</strong>',
+        self::assertSame(
+            <<<HTML
+            <span title="application"><strong>application</strong></span>
+            HTML,
             $cell,
             'Plain category must render bold.',
         );
-        self::assertStringNotContainsString(
-            'yii-debug-muted',
-            $cell,
-            'Plain categories must not emit a namespace prefix.',
-        );
     }
 
     public function testRenderCategoryCellSplitsFqcnCategoryIntoMutedNamespaceAndStrongShortName(): void
     {
         $cell = ProfileCellRenderer::renderCategoryCell(self::makeRow(category: 'yii\\db\\Command::query'));
 
-        self::assertStringContainsString(
-            'yii-debug-muted',
+        self::assertSame(
+            <<<HTML
+            <span title="yii\db\Command::query"><span class="yii-debug-muted">yii\db\</span><wbr><strong>Command::query</strong></span>
+            HTML,
             $cell,
             'Namespace prefix must render muted.',
         );
-        self::assertStringContainsString(
-            'title="yii\db\Command::query"',
-            $cell,
-            'Full category must sit in the `title` attribute.',
-        );
     }
 
     public function testRenderDurationCellFormatsDurationToOneDecimalMillisecond(): void
@@ -93,16 +89,20 @@ public function testRenderInfoCellClampsLongStatements(): void
         $long = 'SELECT ' . str_repeat('a', CellMore::THRESHOLD);
         $html = ProfileCellRenderer::renderInfoCell(self::makeRow(category: 'yii\\db\\Command::query', info: $long));
 
-        self::assertStringContainsString(
-            'yii-debug-cell-more',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-cell-more">
+            <div class="yii-debug-cell-more-body">
+            <div class="yii-debug-db-sql">
+            <span class="yii-debug-sql-kw">SELECT</span> aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+            </div>
+            </div><button class="yii-debug-cell-more-toggle" type="button" aria-expanded="false" data-yii-debug-toggle="cell-more">[+] Show more</button>
+            </div>
+            HTML,
             $html,
             'A long statement must collapse behind the clamp.',
         );
-        self::assertStringContainsString(
-            str_repeat('a', CellMore::THRESHOLD),
-            $html,
-            'Clamping must not truncate the statement.',
-        );
+
     }
 
     public function testRenderInfoCellEmitsOneIndentArrowPerLevel(): void
@@ -124,22 +124,25 @@ public function testRenderInfoCellEmitsOneIndentArrowPerLevel(): void
             substr_count($html, '→'),
             'Each indentation arrow must contain the chevron glyph.',
         );
-        self::assertStringContainsString('nested', $html, 'Info text must be visible after the indentation arrows.');
+        self::assertSame(
+            <<<'HTML'
+        <span class="yii-debug-indent">→</span><span class="yii-debug-indent">→</span><span class="yii-debug-indent">→</span>nested
+        HTML,
+            $html,
+            'Info text must be visible after the indentation arrows.',
+        );
     }
 
     public function testRenderInfoCellEscapesInfoText(): void
     {
         $html = ProfileCellRenderer::renderInfoCell(self::makeRow(info: '<script>alert(1)</script>', level: 0));
 
-        self::assertStringContainsString(
-            '&lt;script&gt;',
-            $html,
-            'Info content must be HTML-escaped.',
-        );
-        self::assertStringNotContainsString(
-            '<script>alert',
+        self::assertSame(
+            <<<HTML
+            &lt;script&gt;alert(1)&lt;/script&gt;
+            HTML,
             $html,
-            'Raw script tags must not leak into the output.',
+            'Info content must render as exact HTML-escaped text.',
         );
     }
 
@@ -149,16 +152,15 @@ public function testRenderInfoCellHighlightsSqlForDbCommandBlocks(): void
             self::makeRow(category: 'yii\\db\\Command::query', info: 'SELECT * FROM "user"'),
         );
 
-        self::assertStringContainsString(
-            'yii-debug-db-sql',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-db-sql">
+            <span class="yii-debug-sql-kw">SELECT</span> * <span class="yii-debug-sql-kw">FROM</span> "user"
+            </div>
+            HTML,
             $html,
             'SQL must reuse the queries-grid presentation.',
         );
-        self::assertStringContainsString(
-            'yii-debug-sql-kw',
-            $html,
-            'Keywords must carry their token span.',
-        );
     }
 
     public function testRenderInfoCellHighlightsSqlForYii3DbCommandBlocks(): void
@@ -180,10 +182,12 @@ public function testRenderInfoCellKeepsPlainInfoUnhighlighted(): void
     {
         $html = ProfileCellRenderer::renderInfoCell(self::makeRow(category: 'application', info: 'SELECT me'));
 
-        self::assertStringNotContainsString(
-            'yii-debug-db-sql',
+        self::assertSame(
+            <<<'HTML'
+            SELECT me
+            HTML,
             $html,
-            'Only DB command blocks may highlight.',
+            'Only DB command blocks may render highlighted HTML.',
         );
     }
 
@@ -193,8 +197,12 @@ public function testRenderInfoCellLeavesShortStatementsUnclamped(): void
             self::makeRow(category: 'yii\\db\\Command::query', info: 'SELECT 1'),
         );
 
-        self::assertStringNotContainsString(
-            'yii-debug-cell-more',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-db-sql">
+            <span class="yii-debug-sql-kw">SELECT</span> <span class="yii-debug-sql-num">1</span>
+            </div>
+            HTML,
             $html,
             'Short statements must stay inline.',
         );
@@ -204,24 +212,21 @@ public function testRenderInfoCellOmitsIndentArrowsAtLevelZero(): void
     {
         $html = ProfileCellRenderer::renderInfoCell(self::makeRow(info: 'root', level: 0));
 
-        self::assertStringNotContainsString(
-            'yii-debug-indent',
-            $html,
-            "Level '0' must not produce indentation arrows.",
-        );
-        self::assertStringContainsString(
-            'root',
+        self::assertSame(
+            <<<HTML
+            root
+            HTML,
             $html,
-            "Info text must be visible at level '0'.",
+            "Level '0' must render the exact text without indentation arrows.",
         );
     }
 
     public function testRenderTimeCellExposesFullTimestampInTitleAttribute(): void
     {
-        $expected = date('Y-m-d H:i:s', 1_700_000_000) . '.789';
-
-        self::assertStringContainsString(
-            "title=\"{$expected}\"",
+        self::assertSame(
+            <<<HTML
+            <span title="2023-11-14 22:13:20.789">22:13:20.789</span>
+            HTML,
             ProfileCellRenderer::renderTimeCell(self::makeRow(timestamp: 1_700_000_000_789.0)),
             'Full timestamp must sit in the `title` attribute.',
         );
@@ -229,12 +234,12 @@ public function testRenderTimeCellExposesFullTimestampInTitleAttribute(): void
 
     public function testRenderTimeCellFormatsMillisecondTimestampAsHmsWithMillis(): void
     {
-        $expected = date('H:i:s', 1_700_000_000) . '.789';
-
         $html = ProfileCellRenderer::renderTimeCell(self::makeRow(timestamp: 1_700_000_000_789.0));
 
-        self::assertStringContainsString(
-            ">{$expected}</span>",
+        self::assertSame(
+            <<<HTML
+            <span title="2023-11-14 22:13:20.789">22:13:20.789</span>
+            HTML,
             $html,
             "Visible text must format as 'H:i:s.mmm'.",
         );
@@ -244,8 +249,10 @@ public function testRenderTimeCellKeepsMillisecondsBelowTheNextBoundary(): void
     {
         $html = ProfileCellRenderer::renderTimeCell(self::makeRow(timestamp: 1_500.5));
 
-        self::assertStringContainsString(
-            '>' . date('H:i:s', 1) . '.500</span>',
+        self::assertSame(
+            <<<HTML
+            <span title="1970-01-01 00:00:01.500">00:00:01.500</span>
+            HTML,
             $html,
             'Sub-millisecond fractions must not advance the rendered millisecond value.',
         );
@@ -253,14 +260,14 @@ public function testRenderTimeCellKeepsMillisecondsBelowTheNextBoundary(): void
 
     public function testRenderTimeCellPadsMillisecondsWithLeadingZeros(): void
     {
-        $expected = date('H:i:s', 1_700_000_000) . '.005';
-
         $html = ProfileCellRenderer::renderTimeCell(
             self::makeRow(timestamp: 1_700_000_000_005.0),
         );
 
-        self::assertStringContainsString(
-            ">{$expected}</span>",
+        self::assertSame(
+            <<<HTML
+            <span title="2023-11-14 22:13:20.005">22:13:20.005</span>
+            HTML,
             $html,
             "Milliseconds below '100' must be zero-padded to three digits.",
         );
diff --git a/tests/Panel/Profile/ProfileRowTest.php b/tests/Panel/Profile/ProfileRowTest.php
index 0cc3675..1643120 100644
--- a/tests/Panel/Profile/ProfileRowTest.php
+++ b/tests/Panel/Profile/ProfileRowTest.php
@@ -41,35 +41,22 @@ public function testFromArrayRoundTripsEveryField(): void
         );
     }
 
-    public function testFromTimingClampsNegativeLevelToZero(): void
+    public function testFromTimingUsesCanonicalFieldsAndScalesToMilliseconds(): void
     {
         $row = ProfileRow::fromTiming(
-            ['timestamp' => 1.0, 'duration' => 0.5, 'level' => -3],
-            0,
-        );
-
-        self::assertNotNull(
-            $row,
-            'A timing with timestamp and duration must produce a row.',
-        );
-        self::assertSame(
-            0,
-            $row->level,
-            "A negative level must clamp to '0'.",
-        );
-    }
-
-    public function testFromTimingNarrowsNumericStringsAndScalesToMilliseconds(): void
-    {
-        $row = ProfileRow::fromTiming(
-            ['timestamp' => '2.5', 'duration' => '0.125', 'level' => '2', 'memory' => '2048', 'memoryDiff' => '512'],
+            [
+                'timestamp' => 2.5,
+                'duration' => 0.125,
+                'category' => 'database',
+                'info' => 'SELECT 1',
+                'level' => 2,
+                'memory' => 2_048,
+                'memoryDiff' => 512,
+                'trace' => [['file' => 'index.php']],
+            ],
             7,
         );
 
-        self::assertNotNull(
-            $row,
-            'A timing with timestamp and duration must produce a row.',
-        );
         self::assertSame(
             2_500.0,
             $row->timestamp,
@@ -83,66 +70,37 @@ public function testFromTimingNarrowsNumericStringsAndScalesToMilliseconds(): vo
         self::assertSame(
             2,
             $row->level,
-            "Numeric-string level must narrow to 'int'.",
+            'Nesting level must come from the canonical timing.',
         );
         self::assertSame(
             2_048,
             $row->memory,
-            "Numeric-string memory must narrow to 'int'.",
+            'Memory must come from the canonical timing.',
         );
         self::assertSame(
             512,
             $row->memoryDiff,
-            "Numeric-string memory delta must narrow to 'int'.",
+            'Memory delta must come from the canonical timing.',
         );
         self::assertSame(
             7,
             $row->seq,
             'Sequence index is assigned by the caller.',
         );
-    }
-
-    public function testFromTimingReturnsNullForIncompleteTimings(): void
-    {
-        self::assertNull(
-            ProfileRow::fromTiming('not-an-array', 0),
-            "A non-array timing yields 'null'.",
-        );
-        self::assertNull(
-            ProfileRow::fromTiming(['duration' => 1.0], 0),
-            "A missing timestamp yields 'null'.",
-        );
-        self::assertNull(
-            ProfileRow::fromTiming(['timestamp' => 1.0], 0),
-            "A missing duration yields 'null'.",
-        );
-    }
-
-    public function testFromTimingUsesZeroForMissingOptionalNumericFields(): void
-    {
-        $row = ProfileRow::fromTiming(
-            ['timestamp' => 1.0, 'duration' => 0.5],
-            0,
-        );
-
-        self::assertNotNull(
-            $row,
-            'A complete timing must produce a row.',
-        );
         self::assertSame(
-            0,
-            $row->level,
-            'Missing nesting level must default to zero.',
+            'database',
+            $row->category,
+            'Category must come from the canonical timing.',
         );
         self::assertSame(
-            0,
-            $row->memory,
-            'Missing memory must default to zero bytes.',
+            'SELECT 1',
+            $row->info,
+            'Profile token must come from the canonical timing.',
         );
         self::assertSame(
-            0,
-            $row->memoryDiff,
-            'Missing memory delta must default to zero bytes.',
+            [['file' => 'index.php']],
+            $row->trace,
+            'Trace frames must be preserved.',
         );
     }
 
diff --git a/tests/Panel/Profile/ProfileTimingsTest.php b/tests/Panel/Profile/ProfileTimingsTest.php
index 5f0fb1b..2701e05 100644
--- a/tests/Panel/Profile/ProfileTimingsTest.php
+++ b/tests/Panel/Profile/ProfileTimingsTest.php
@@ -27,15 +27,109 @@ public function testCalculatePairsNestedIdenticalTokensWithoutLosingOuterFrame()
             ],
         );
 
-        self::assertCount(2, $timings, 'Both nested frames with the same token must survive pairing.');
+        self::assertCount(
+            2,
+            $timings,
+            'Both nested frames with the same token must survive pairing.',
+        );
+
         $outer = $timings[0] ?? self::fail('Expected the outer repeated-token timing.');
         $inner = $timings[1] ?? self::fail('Expected the inner repeated-token timing.');
 
-        self::assertSame(0, $outer['level'], 'Outer repeated token must retain nesting level zero.');
-        self::assertSame(1, $inner['level'], 'Inner repeated token must retain nesting level one.');
-        self::assertEqualsWithDelta(0.3, $outer['duration'], PHP_FLOAT_EPSILON, 'Outer duration must pair last.');
-        self::assertEqualsWithDelta(0.1, $inner['duration'], PHP_FLOAT_EPSILON, 'Inner duration must pair first.');
-        self::assertSame(40, $outer['memoryDiff'], 'Outer memory delta must use the outer begin frame.');
-        self::assertSame(10, $inner['memoryDiff'], 'Inner memory delta must use the inner begin frame.');
+        self::assertSame(
+            0,
+            $outer['level'],
+            'Outer repeated token must retain nesting level zero.',
+        );
+        self::assertSame(
+            1,
+            $inner['level'],
+            'Inner repeated token must retain nesting level one.',
+        );
+        self::assertEqualsWithDelta(
+            0.3,
+            $outer['duration'],
+            PHP_FLOAT_EPSILON,
+            'Outer duration must pair last.',
+        );
+        self::assertEqualsWithDelta(
+            0.1,
+            $inner['duration'],
+            PHP_FLOAT_EPSILON,
+            'Inner duration must pair first.',
+        );
+        self::assertSame(
+            40,
+            $outer['memoryDiff'],
+            'Outer memory delta must use the outer begin frame.',
+        );
+        self::assertSame(
+            10,
+            $inner['memoryDiff'],
+            'Inner memory delta must use the inner begin frame.',
+        );
+    }
+
+    public function testCalculateResetsNestingAfterEachSequentialPair(): void
+    {
+        self::assertSame(
+            [
+                [
+                    'info' => 'first',
+                    'category' => 'application',
+                    'timestamp' => 1.0,
+                    'trace' => [],
+                    'level' => 0,
+                    'duration' => 0.5,
+                    'memory' => 110,
+                    'memoryDiff' => 10,
+                ],
+                [
+                    'info' => 'second',
+                    'category' => 'database',
+                    'timestamp' => 2.0,
+                    'trace' => [],
+                    'level' => 0,
+                    'duration' => 0.25,
+                    'memory' => 0,
+                    'memoryDiff' => 0,
+                ],
+            ],
+            ProfileTimings::calculate(
+                [
+                    [
+                        'first',
+                        LogLevel::PROFILE_BEGIN,
+                        'application',
+                        1.0,
+                        [],
+                        100,
+                    ],
+                    [
+                        'first',
+                        LogLevel::PROFILE_END,
+                        'application',
+                        1.5,
+                        [],
+                        110,
+                    ],
+                    [
+                        'second',
+                        LogLevel::PROFILE_BEGIN,
+                        'database',
+                        2.0,
+                        [],
+                    ],
+                    [
+                        'second',
+                        LogLevel::PROFILE_END,
+                        'database',
+                        2.25,
+                        [],
+                    ],
+                ],
+            ),
+            'Completed pairs must restore nesting level zero while preserving canonical tuple fields.',
+        );
     }
 }
diff --git a/tests/Panel/Profile/ProfilingSnapshotTest.php b/tests/Panel/Profile/ProfilingSnapshotTest.php
index 3088cbd..61a271b 100644
--- a/tests/Panel/Profile/ProfilingSnapshotTest.php
+++ b/tests/Panel/Profile/ProfilingSnapshotTest.php
@@ -25,19 +25,26 @@ public function testCaptureCompletedNormalizesRowsAndSortsMemorySamples(): void
             [
                 [
                     'token' => 'SELECT 1',
+                    'category' => 'message category',
                     'context' => [
                         'category' => 'Yiisoft\\Db\\Command::query',
                         'beginTime' => 100.05,
+                        'time' => 999.0,
                         'endTime' => 100.06,
                         'duration' => 0.01,
                         'beginMemory' => 2_048,
                         'endMemory' => 3_072,
+                        'memory' => 999,
                         'nestedLevel' => 1,
                         'trace' => [['file' => '/app/index.php', 'line' => 12]],
                     ],
                 ],
                 'malformed',
                 ['token' => 'missing context'],
+                [
+                    'token' => 'missing duration',
+                    'context' => ['beginTime' => 100.0],
+                ],
                 [
                     'token' => 'GET /',
                     'context' => [
@@ -48,7 +55,15 @@ public function testCaptureCompletedNormalizesRowsAndSortsMemorySamples(): void
                         'beginMemory' => 1_024,
                         'endMemory' => 4_096,
                         'memoryDiff' => 3_072,
-                        'nestedLevel' => 0,
+                        'nestedLevel' => -1,
+                    ],
+                ],
+                [
+                    'token' => 'defaults',
+                    'category' => 'fallback category',
+                    'context' => [
+                        'beginTime' => 101.0,
+                        'duration' => 0.01,
                     ],
                 ],
             ],
@@ -81,6 +96,17 @@ public function testCaptureCompletedNormalizesRowsAndSortsMemorySamples(): void
                         'memoryDiff' => 3_072,
                         'trace' => [],
                     ],
+                    [
+                        'timestamp' => 101_000.0,
+                        'duration' => 10.0,
+                        'category' => 'fallback category',
+                        'info' => 'defaults',
+                        'level' => 0,
+                        'seq' => 2,
+                        'memory' => 0,
+                        'memoryDiff' => 0,
+                        'trace' => [],
+                    ],
                 ],
                 'samples' => [
                     ['time' => 100_000.0, 'memory' => 1_024],
@@ -117,6 +143,7 @@ public function testCaptureCompletedSkipsMessagesWithoutUsableTiming(): void
             'Incomplete messages without memory must not produce samples.',
         );
     }
+
     public function testCapturePairsLoggerMessagesAndHydratesTheResult(): void
     {
         $captured = ProfilingSnapshot::capture(
@@ -129,7 +156,6 @@ public function testCapturePairsLoggerMessagesAndHydratesTheResult(): void
                 ['inner', LogLevel::PROFILE_BEGIN, 'database', 1.02, [], 120],
                 ['inner', LogLevel::PROFILE_END, 'database', 1.05, [], 140],
                 ['outer', LogLevel::PROFILE_END, 'application', 1.1, [], 200],
-                'invalid',
             ],
         );
 
@@ -170,6 +196,21 @@ public function testCapturePairsLoggerMessagesAndHydratesTheResult(): void
             array_map(static fn($row): array => $row->jsonSerialize(), $snapshot->entries()),
             'Profile begin/end pairs must retain ordering, nesting, timing, memory, and traces.',
         );
+        self::assertSame(
+            [
+                ['time' => 900.0, 'memory' => 50],
+                ['time' => 1_000.0, 'memory' => 100],
+                ['time' => 1_010.0, 'memory' => 110],
+                ['time' => 1_020.0, 'memory' => 120],
+                ['time' => 1_050.0, 'memory' => 140],
+                ['time' => 1_100.0, 'memory' => 200],
+            ],
+            array_map(
+                static fn(MemorySample $sample): array => ['time' => $sample->time, 'memory' => $sample->memory],
+                $captured->samples(),
+            ),
+            'Logger tuple timestamps and memory values must use the canonical indexes and millisecond conversion.',
+        );
         self::assertSame(
             array_map(
                 static fn(MemorySample $sample): array => ['time' => $sample->time, 'memory' => $sample->memory],
diff --git a/tests/Panel/Queue/JobPayloadInspectorTest.php b/tests/Panel/Queue/JobPayloadInspectorTest.php
index 6ba9675..d8a12c8 100644
--- a/tests/Panel/Queue/JobPayloadInspectorTest.php
+++ b/tests/Panel/Queue/JobPayloadInspectorTest.php
@@ -9,9 +9,9 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * Unit tests for {@see JobPayloadInspector} covering the public-property tree extraction: scalar pass-through,
- * nested array recursion, nested-object expansion with `__class`, the `__truncated` depth fence, resource
- * stringification, and the unreadable/unsupported fallbacks.
+ * Unit tests for {@see JobPayloadInspector} covering the public-property tree extraction: scalar pass-through, nested
+ * array recursion, nested-object expansion with `__class`, the `__truncated` depth fence, resource stringification, and
+ * the unreadable/unsupported fallbacks.
  */
 #[Group('queue')]
 final class JobPayloadInspectorTest extends TestCase
@@ -325,7 +325,11 @@ public function __construct(
 
         $fields = JobPayloadInspector::extract($job);
 
-        self::assertSame($visibleArray, $fields['visibleArray'] ?? null, 'Four nested arrays must remain visible.');
+        self::assertSame(
+            $visibleArray,
+            $fields['visibleArray'] ?? null,
+            'Four nested arrays must remain visible.',
+        );
         self::assertSame(
             ['__truncated' => true],
             self::valueAtPath($fields, ['truncatedArray', 'one', 'two', 'three', 'four', 'five']),
@@ -340,9 +344,19 @@ public function __construct(
             $fields,
             ['truncatedObject', 'child', 'child', 'child', 'child', 'child'],
         );
-        self::assertIsArray($truncated, 'The sixth nested object must produce a structured marker.');
-        self::assertTrue($truncated['__truncated'] ?? false, 'The object depth marker must be true.');
-        self::assertArrayHasKey('__class', $truncated, 'A truncated object must retain its class name.');
+        self::assertIsArray(
+            $truncated,
+            'The sixth nested object must produce a structured marker.',
+        );
+        self::assertTrue(
+            $truncated['__truncated'] ?? false,
+            'The object depth marker must be true.',
+        );
+        self::assertArrayHasKey(
+            '__class',
+            $truncated,
+            'A truncated object must retain its class name.',
+        );
     }
 
     /**
@@ -351,7 +365,10 @@ public function __construct(
     private static function valueAtPath(mixed $value, array $path): mixed
     {
         foreach ($path as $key) {
-            self::assertIsArray($value, "Path segment '{$key}' must be traversable.");
+            self::assertIsArray(
+                $value,
+                "Path segment '{$key}' must be traversable.",
+            );
 
             $value = $value[$key] ?? null;
         }
diff --git a/tests/Panel/Queue/JobRecordTest.php b/tests/Panel/Queue/JobRecordTest.php
index ab012c8..4289eb9 100644
--- a/tests/Panel/Queue/JobRecordTest.php
+++ b/tests/Panel/Queue/JobRecordTest.php
@@ -21,11 +21,24 @@ public function testFromArrayRequiresAndSerializesTheEventType(): void
     {
         $payload = JobRecord::fromCapture(['eventType' => 'exec'])->jsonSerialize();
         $record = JobRecord::fromArray($payload, '$.queue');
+
         $serialized = $record->jsonSerialize();
 
-        self::assertSame('exec', $record->eventType, 'Hydration must read the required event type.');
-        self::assertArrayHasKey('eventType', $serialized, 'Serialization must retain the event type key.');
-        self::assertSame('exec', $serialized['eventType'] ?? null, 'Serialized event type must retain its value.');
+        self::assertSame(
+            'exec',
+            $record->eventType,
+            'Hydration must read the required event type.',
+        );
+        self::assertArrayHasKey(
+            'eventType',
+            $serialized,
+            'Serialization must retain the event type key.',
+        );
+        self::assertSame(
+            'exec',
+            $serialized['eventType'] ?? null,
+            'Serialized event type must retain its value.',
+        );
     }
 
     public function testFromCaptureAcceptsEachKnownEventType(): void
diff --git a/tests/Panel/Queue/QueueCardRendererTest.php b/tests/Panel/Queue/QueueCardRendererTest.php
index 138b244..e65aa11 100644
--- a/tests/Panel/Queue/QueueCardRendererTest.php
+++ b/tests/Panel/Queue/QueueCardRendererTest.php
@@ -25,10 +25,7 @@ public function testRenderAsyncHintListsDistinctAsyncDrivers(): void
                 self::makeRecord(driverName: 'AMQP', isAsync: true),
             ],
         );
-
-        $hint = QueueCardRenderer::renderAsyncHint(
-            $summary,
-        );
+        $hint = QueueCardRenderer::renderAsyncHint($summary);
 
         self::assertNotNull(
             $hint,
@@ -37,21 +34,15 @@ public function testRenderAsyncHintListsDistinctAsyncDrivers(): void
 
         $html = $hint->render();
 
-        self::assertStringContainsString(
-            'AMQP',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-queue-hint">
+            <strong>Async driver: AMQP, Redis.</strong> Push events show here, but jobs run in a separate worker process; see the History sidebar for <strong>CLI</strong> debug snapshots that capture the matching exec/error events.
+            </div>
+            HTML,
             $html,
             'AMQP must appear in the driver list.',
         );
-        self::assertStringContainsString(
-            'Redis',
-            $html,
-            'Redis must appear in the driver list.',
-        );
-        self::assertStringContainsString(
-            'CLI',
-            $html,
-            'Hint must mention the CLI snapshots.',
-        );
     }
 
     public function testRenderAsyncHintReturnsNullWhenAllRecordsAreSync(): void
@@ -75,94 +66,145 @@ public function testRenderItemDriverPillUsesTheDriverClassOrFallbackTooltip(): v
             self::makeRecord(driverName: 'Custom', driverClass: ''),
         )->render();
 
-        self::assertStringContainsString('title="yii\\queue\\redis\\Queue">Redis<', $known, 'Known driver class must be the tooltip.');
-        self::assertStringContainsString('title="Unknown driver">Custom<', $unknown, 'Missing driver class must use the fallback tooltip.');
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\\queue\\redis\\Queue">Redis</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header>
+            </article>
+            HTML,
+            $known,
+            'Known driver class must be the tooltip.',
+        );
+        self::assertSame(
+            <<<'HTML'
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="Unknown driver">Custom</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header>
+            </article>
+            HTML,
+            $unknown,
+            'Missing driver class must use the fallback tooltip.',
+        );
     }
 
     public function testRenderItemEmitsCardWithClassAndStatusPill(): void
     {
         $record = self::makeRecord(jobClass: 'app\\jobs\\HelloJob', eventType: 'push');
 
-        $html = QueueCardRenderer::renderItem($record)
-            ->render();
-
-        self::assertStringContainsString(
-            'class="yii-debug-queue-card"',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header>
+            </article>
+            HTML,
+            QueueCardRenderer::renderItem($record)->render(),
             'Outer wrapper class must be present.',
         );
-        self::assertStringContainsString(
-            'HelloJob',
-            $html,
-            'Short class name must be rendered.'
-        );
-        self::assertStringContainsString(
-            'app\\jobs\\',
-            $html,
-            'Namespace prefix must be rendered.'
-        );
-        self::assertStringContainsString(
-            'Queued',
-            $html,
-            'Push event must show the `Queued` status pill.'
-        );
     }
 
     public function testRenderItemMapsErrorToFailedStatusVariant(): void
     {
-        $html = QueueCardRenderer::renderItem(self::makeRecord(eventType: 'error'))
-            ->render();
-
-        self::assertStringContainsString(
-            'yii-debug-queue-status-failed',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-failed">Failed</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header>
+            </article>
+            HTML,
+            QueueCardRenderer::renderItem(self::makeRecord(eventType: 'error'))->render(),
             "Error event must use the 'failed' status variant.",
         );
-        self::assertStringContainsString(
-            'Failed',
-            $html,
-            "Error event must show the 'Failed' label.",
-        );
     }
 
     public function testRenderItemMapsExecToDoneStatusVariant(): void
     {
-        $html = QueueCardRenderer::renderItem(self::makeRecord(eventType: 'exec'))
-            ->render();
-
-        self::assertStringContainsString(
-            'yii-debug-queue-status-done',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-done">Done</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header>
+            </article>
+            HTML,
+            QueueCardRenderer::renderItem(self::makeRecord(eventType: 'exec'))->render(),
             "Exec event must use the 'done' status variant.",
         );
-        self::assertStringContainsString(
-            'Done',
-            $html,
-            "Exec event must show the 'Done' label.",
-        );
+
     }
 
     public function testRenderItemOmitsComponentIdFromMetaStrip(): void
     {
-        $html = QueueCardRenderer::renderItem(self::makeRecord(componentId: 'queueEmail'))
-            ->render();
-
-        self::assertStringNotContainsString(
-            'data-field="component"',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header>
+            </article>
+            HTML,
+            QueueCardRenderer::renderItem(self::makeRecord(componentId: 'queueEmail'))->render(),
             'Component meta item must be hidden the sidebar/tab strip surfaces it instead.',
         );
-        self::assertStringNotContainsString(
-            'class="yii-debug-queue-meta"',
-            $html,
-            "'componentId' alone must not produce a meta strip.",
-        );
     }
 
     public function testRenderItemOmitsDriverPillWhenDriverNameIsEmpty(): void
     {
-        self::assertStringNotContainsString(
-            'yii-debug-queue-driver',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header>
+            </article>
+            HTML,
             QueueCardRenderer::renderItem(self::makeRecord(driverName: ''))->render(),
             'Empty driver name must hide the driver pill.',
         );
@@ -170,8 +212,20 @@ public function testRenderItemOmitsDriverPillWhenDriverNameIsEmpty(): void
 
     public function testRenderItemOmitsMetaWhenNoOptionalFieldsPresent(): void
     {
-        self::assertStringNotContainsString(
-            'class="yii-debug-queue-meta"',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header>
+            </article>
+            HTML,
             QueueCardRenderer::renderItem(self::makeRecord())->render(),
             'No optional fields must omit the meta strip.',
         );
@@ -179,8 +233,20 @@ public function testRenderItemOmitsMetaWhenNoOptionalFieldsPresent(): void
 
     public function testRenderItemOmitsPayloadBlockWhenFieldsAreEmpty(): void
     {
-        self::assertStringNotContainsString(
-            'yii-debug-queue-payload',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header>
+            </article>
+            HTML,
             QueueCardRenderer::renderItem(self::makeRecord(payloadFields: []))->render(),
             'Empty payload fields must omit the block.',
         );
@@ -188,12 +254,9 @@ public function testRenderItemOmitsPayloadBlockWhenFieldsAreEmpty(): void
 
     public function testRenderItemRendersAvatarHueDeterministicallyFromJobClass(): void
     {
-        $first = QueueCardRenderer::renderItem(self::makeRecord(jobClass: 'app\\jobs\\Hello'))
-            ->render();
-        $second = QueueCardRenderer::renderItem(self::makeRecord(jobClass: 'app\\jobs\\Hello'))
-            ->render();
-        $third = QueueCardRenderer::renderItem(self::makeRecord(jobClass: 'app\\jobs\\World'))
-            ->render();
+        $first = QueueCardRenderer::renderItem(self::makeRecord(jobClass: 'app\\jobs\\Hello'))->render();
+        $second = QueueCardRenderer::renderItem(self::makeRecord(jobClass: 'app\\jobs\\Hello'))->render();
+        $third = QueueCardRenderer::renderItem(self::makeRecord(jobClass: 'app\\jobs\\World'))->render();
 
         self::assertSame(
             self::extractHue($first),
@@ -220,26 +283,35 @@ public function testRenderItemRendersCollapsibleBlockForNestedObjects(): void
             ),
         )->render();
 
-        self::assertStringContainsString(
-            '<details',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header><div class="yii-debug-queue-payload">
+            <div class="yii-debug-queue-tree">
+            <details class="yii-debug-queue-tree-collapse">
+            <summary class="yii-debug-queue-tree-summary">
+            <span class="yii-debug-queue-tree-key">inner</span><span class="yii-debug-queue-tree-type">object</span><span class="yii-debug-queue-tree-class" title="app\models\Inner">app\models\Inner</span>
+            </summary><div class="yii-debug-queue-tree-children">
+            <div class="yii-debug-queue-tree-row">
+            <span class="yii-debug-queue-tree-key">value</span><span class="yii-debug-queue-tree-type">int</span><span class="yii-debug-queue-tree-value yii-debug-queue-tree-value-number">42</span>
+            </div>
+            </div>
+            </details>
+            </div>
+            </div>
+            </article>
+            HTML,
             $html,
             "Nested object must render inside a collapsible '<details>'.",
         );
-        self::assertStringContainsString(
-            'Inner',
-            $html,
-            'Object short class name must be visible.',
-        );
-        self::assertStringContainsString(
-            'class="yii-debug-queue-tree-class" title="app\\models\\Inner">app\\models\\Inner</span>',
-            $html,
-            'Object summary must retain the complete namespace and class name.'
-        );
-        self::assertStringContainsString(
-            '>42<',
-            $html,
-            'Nested int value must be rendered.'
-        );
     }
 
     public function testRenderItemRendersCollapsibleBlockForRegularArray(): void
@@ -256,38 +328,60 @@ public function testRenderItemRendersCollapsibleBlockForRegularArray(): void
             ),
         )->render();
 
-        self::assertStringContainsString(
-            '<details',
-            $html,
-            "Nested array must render inside '<details>'."
-        );
-        self::assertStringContainsString(
-            '>list<',
-            $html,
-            "List arrays must show the 'list' type label.",
-        );
-        self::assertStringContainsString(
-            '(3)',
-            $html,
-            'Array length must be displayed.',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header><div class="yii-debug-queue-payload">
+            <div class="yii-debug-queue-tree">
+            <details class="yii-debug-queue-tree-collapse">
+            <summary class="yii-debug-queue-tree-summary">
+            <span class="yii-debug-queue-tree-key">items</span><span class="yii-debug-queue-tree-type">list</span><span class="yii-debug-queue-tree-meta">(3)</span>
+            </summary><div class="yii-debug-queue-tree-children">
+            <div class="yii-debug-queue-tree-row">
+            <span class="yii-debug-queue-tree-key">0</span><span class="yii-debug-queue-tree-type">string</span><span class="yii-debug-queue-tree-value yii-debug-queue-tree-value-string" title="a">"a"</span>
+            </div><div class="yii-debug-queue-tree-row">
+            <span class="yii-debug-queue-tree-key">1</span><span class="yii-debug-queue-tree-type">string</span><span class="yii-debug-queue-tree-value yii-debug-queue-tree-value-string" title="b">"b"</span>
+            </div><div class="yii-debug-queue-tree-row">
+            <span class="yii-debug-queue-tree-key">2</span><span class="yii-debug-queue-tree-type">string</span><span class="yii-debug-queue-tree-value yii-debug-queue-tree-value-string" title="c">"c"</span>
+            </div>
+            </div>
+            </details>
+            </div>
+            </div>
+            </article>
+            HTML,
+            $html,
+            "Nested array must render inside '<details>'.",
         );
     }
 
     public function testRenderItemRendersDriverPillWithName(): void
     {
-        $html = QueueCardRenderer::renderItem(self::makeRecord(driverName: 'AMQP', isAsync: true))
-            ->render();
-
-        self::assertStringContainsString(
-            'class="yii-debug-queue-driver yii-debug-queue-driver-is-async"',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-async" title="yii\queue\sync\Queue">AMQP</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header>
+            </article>
+            HTML,
+            QueueCardRenderer::renderItem(self::makeRecord(driverName: 'AMQP', isAsync: true))->render(),
             "Async driver must use the 'is-async' modifier.",
         );
-        self::assertStringContainsString(
-            '>AMQP<',
-            $html,
-            'Driver name must be visible.',
-        );
     }
 
     public function testRenderItemRendersErrorBlockOnlyWhenErrorMessagePresent(): void
@@ -302,43 +396,63 @@ public function testRenderItemRendersErrorBlockOnlyWhenErrorMessagePresent(): vo
         $withoutError = QueueCardRenderer::renderItem(self::makeRecord())
             ->render();
 
-        self::assertStringContainsString(
-            'Boom: something failed',
-            $withError,
-            'Error message must be rendered.'
-        );
-        self::assertStringContainsString(
-            'class="yii-debug-queue-error"',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-failed">Failed</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header><div class="yii-debug-queue-error">
+            <strong>Error: </strong>Boom: something failed
+            </div>
+            </article>
+            HTML,
             $withError,
-            'Error block must carry the dedicated class.'
+            'Error message must be rendered.',
         );
-        self::assertStringNotContainsString(
-            'yii-debug-queue-error',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header>
+            </article>
+            HTML,
             $withoutError,
-            'Records without error must omit the block.'
+            'Records without error must omit the block.',
         );
     }
 
     public function testRenderItemRendersFallbackInitialAndHueWhenJobClassIsEmpty(): void
     {
-        $html = QueueCardRenderer::renderItem(self::makeRecord(jobClass: ''))
-            ->render();
-
-        self::assertStringContainsString(
-            '--queue-hue: 210',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 210' aria-hidden="true">?</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            (unknown)
+            </h2>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header>
+            </article>
+            HTML,
+            QueueCardRenderer::renderItem(self::makeRecord(jobClass: ''))->render(),
             "Empty class name must fall back to hue '210'.",
         );
-        self::assertStringContainsString(
-            '>?<',
-            $html,
-            "Empty class name must render '?' as the initial.",
-        );
-        self::assertStringContainsString(
-            '(unknown)',
-            $html,
-            'Empty class name must show `(unknown)` as the title.',
-        );
     }
 
     public function testRenderItemRendersMetaItemsWhenOptionalFieldsPresent(): void
@@ -354,56 +468,25 @@ public function testRenderItemRendersMetaItemsWhenOptionalFieldsPresent(): void
             ),
         )->render();
 
-        self::assertStringContainsString(
-            'data-field="id"',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header><div class="yii-debug-queue-meta">
+            <span class="yii-debug-queue-meta-item" data-field="id"><span class="yii-debug-queue-meta-label">id</span><span class="yii-debug-queue-meta-value">msg-7</span></span><span class="yii-debug-queue-meta-item" data-field="ttr"><span class="yii-debug-queue-meta-label">ttr</span><span class="yii-debug-queue-meta-value">30s</span></span><span class="yii-debug-queue-meta-item" data-field="delay"><span class="yii-debug-queue-meta-label">delay</span><span class="yii-debug-queue-meta-value">5s</span></span><span class="yii-debug-queue-meta-item" data-field="priority"><span class="yii-debug-queue-meta-label">priority</span><span class="yii-debug-queue-meta-value">10</span></span><span class="yii-debug-queue-meta-item" data-field="attempt"><span class="yii-debug-queue-meta-label">attempt</span><span class="yii-debug-queue-meta-value">#2</span></span><span class="yii-debug-queue-meta-item" data-field="duration"><span class="yii-debug-queue-meta-label">duration</span><span class="yii-debug-queue-meta-value">123.0 ms</span></span>
+            </div>
+            </article>
+            HTML,
             $html,
             "'jobId' meta item must be rendered.",
         );
-        self::assertStringContainsString(
-            'msg-7',
-            $html,
-            "'jobId' value must be visible.",
-        );
-        self::assertStringContainsString(
-            'data-field="ttr"',
-            $html,
-            "'ttr' meta item must be rendered.",
-        );
-        self::assertStringContainsString(
-            '30s',
-            $html,
-            "'ttr' value must include the unit.",
-        );
-        self::assertStringContainsString(
-            'data-field="delay"',
-            $html,
-            "'delay' meta item must be rendered.",
-        );
-        self::assertStringContainsString(
-            'data-field="priority"',
-            $html,
-            "'priority' meta item must be rendered.",
-        );
-        self::assertStringContainsString(
-            'data-field="attempt"',
-            $html,
-            "'attempt' meta item must be rendered.",
-        );
-        self::assertStringContainsString(
-            '#2',
-            $html,
-            "'attempt' value must be prefixed with `#`.",
-        );
-        self::assertStringContainsString(
-            'data-field="duration"',
-            $html,
-            "'duration' meta item must be rendered.",
-        );
-        self::assertStringContainsString(
-            '123.0 ms',
-            $html,
-            "'duration' value must format as milliseconds.",
-        );
     }
 
     public function testRenderItemRendersPayloadTreeWhenFieldsPresent(): void
@@ -418,47 +501,51 @@ public function testRenderItemRendersPayloadTreeWhenFieldsPresent(): void
             ),
         )->render();
 
-        self::assertStringContainsString(
-            'class="yii-debug-queue-payload"',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header><div class="yii-debug-queue-payload">
+            <div class="yii-debug-queue-tree">
+            <div class="yii-debug-queue-tree-row">
+            <span class="yii-debug-queue-tree-key">message</span><span class="yii-debug-queue-tree-type">string</span><span class="yii-debug-queue-tree-value yii-debug-queue-tree-value-string" title="first">"first"</span>
+            </div><div class="yii-debug-queue-tree-row">
+            <span class="yii-debug-queue-tree-key">priority</span><span class="yii-debug-queue-tree-type">int</span><span class="yii-debug-queue-tree-value yii-debug-queue-tree-value-number">5</span>
+            </div><div class="yii-debug-queue-tree-row">
+            <span class="yii-debug-queue-tree-key">flag</span><span class="yii-debug-queue-tree-type">bool</span><span class="yii-debug-queue-tree-value yii-debug-queue-tree-value-bool">true</span>
+            </div>
+            </div>
+            </div>
+            </article>
+            HTML,
             $html,
             'Payload block must carry the dedicated class.',
         );
-        self::assertStringContainsString(
-            'class="yii-debug-queue-tree"',
-            $html,
-            'Tree wrapper must be present.',
-        );
-        self::assertStringContainsString(
-            '"first"',
-            $html,
-            'String value must be rendered with quotes.',
-        );
-        self::assertStringContainsString(
-            '>5<',
-            $html,
-            'Numeric value must be rendered.',
-        );
-        self::assertStringContainsString(
-            '>true<',
-            $html,
-            'Boolean value must be rendered.',
-        );
-        self::assertStringContainsString(
-            '>message<',
-            $html,
-            'String key must be visible.',
-        );
-        self::assertStringContainsString(
-            '>priority<',
-            $html,
-            'Numeric key must be visible.',
-        );
     }
 
     public function testRenderItemRendersSyncDriverPillWithSyncModifier(): void
     {
-        self::assertStringContainsString(
-            'yii-debug-queue-driver-is-sync',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header>
+            </article>
+            HTML,
             QueueCardRenderer::renderItem(self::makeRecord(driverName: 'Sync', isAsync: false))->render(),
             "Sync driver must use the 'is-sync' modifier.",
         );
@@ -477,18 +564,35 @@ public function testRenderItemRendersTruncatedMarkerInCollapsibleBlocks(): void
             ),
         )->render();
 
-        self::assertStringContainsString(
-            'yii-debug-queue-tree-truncated',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header><div class="yii-debug-queue-payload">
+            <div class="yii-debug-queue-tree">
+            <details class="yii-debug-queue-tree-collapse">
+            <summary class="yii-debug-queue-tree-summary">
+            <span class="yii-debug-queue-tree-key">items</span><span class="yii-debug-queue-tree-type">array</span><span class="yii-debug-queue-tree-meta">(2)</span><span class="yii-debug-queue-tree-truncated">truncated</span>
+            </summary><div class="yii-debug-queue-tree-children">
+            <div class="yii-debug-queue-tree-row">
+            <span class="yii-debug-queue-tree-key">0</span><span class="yii-debug-queue-tree-type">string</span><span class="yii-debug-queue-tree-value yii-debug-queue-tree-value-string" title="a">"a"</span>
+            </div>
+            </div>
+            </details>
+            </div>
+            </div>
+            </article>
+            HTML,
             $html,
             "Truncated arrays must surface the 'truncated' marker chip.",
         );
-        self::assertStringContainsString(
-            '>truncated<',
-            $html,
-            "Truncated marker must render the literal 'truncated' label.",
-        );
-        self::assertStringContainsString('>items<', $html, 'Truncated summary must retain its field key.');
-        self::assertStringContainsString('>array<', $html, 'Truncated associative array must retain its type.');
     }
 
     public function testRenderItemRendersTypeLabelsForEachScalarKind(): void
@@ -505,21 +609,37 @@ public function testRenderItemRendersTypeLabelsForEachScalarKind(): void
             ),
         )->render();
 
-        self::assertStringContainsString(
-            '>string<',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header><div class="yii-debug-queue-payload">
+            <div class="yii-debug-queue-tree">
+            <div class="yii-debug-queue-tree-row">
+            <span class="yii-debug-queue-tree-key">msg</span><span class="yii-debug-queue-tree-type">string</span><span class="yii-debug-queue-tree-value yii-debug-queue-tree-value-string" title="x">"x"</span>
+            </div><div class="yii-debug-queue-tree-row">
+            <span class="yii-debug-queue-tree-key">count</span><span class="yii-debug-queue-tree-type">int</span><span class="yii-debug-queue-tree-value yii-debug-queue-tree-value-number">10</span>
+            </div><div class="yii-debug-queue-tree-row">
+            <span class="yii-debug-queue-tree-key">ratio</span><span class="yii-debug-queue-tree-type">float</span><span class="yii-debug-queue-tree-value yii-debug-queue-tree-value-number">1.5</span>
+            </div><div class="yii-debug-queue-tree-row">
+            <span class="yii-debug-queue-tree-key">flag</span><span class="yii-debug-queue-tree-type">bool</span><span class="yii-debug-queue-tree-value yii-debug-queue-tree-value-bool">false</span>
+            </div><div class="yii-debug-queue-tree-row">
+            <span class="yii-debug-queue-tree-key">empty</span><span class="yii-debug-queue-tree-type">null</span><span class="yii-debug-queue-tree-value yii-debug-queue-tree-value-null">null</span>
+            </div>
+            </div>
+            </div>
+            </article>
+            HTML,
             $html,
             'String type label must be present.',
         );
-        self::assertStringContainsString(
-            '>int<',
-            $html,
-            'Int type label must be present.',
-        );
-        self::assertStringContainsString(
-            '>float<',
-            $html,
-            'Float type label must be present.',
-        );
         self::assertMatchesRegularExpression(
             '/>count<.*?>int<.*?>10</s',
             $html,
@@ -530,16 +650,6 @@ public function testRenderItemRendersTypeLabelsForEachScalarKind(): void
             $html,
             'Float values must remain paired with the float type label.',
         );
-        self::assertStringContainsString(
-            '>bool<',
-            $html,
-            'Bool type label must be present.',
-        );
-        self::assertStringContainsString(
-            '>null<',
-            $html,
-            "'null' type label must be present.",
-        );
     }
 
     public function testRenderItemRendersUnsupportedRowForNonRenderableValues(): void
@@ -552,22 +662,49 @@ public function testRenderItemRendersUnsupportedRowForNonRenderableValues(): voi
             ),
         )->render();
 
-        self::assertStringContainsString(
-            '(unsupported)',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header><div class="yii-debug-queue-payload">
+            <div class="yii-debug-queue-tree">
+            <div class="yii-debug-queue-tree-row">
+            <span class="yii-debug-queue-tree-key">handle</span><span class="yii-debug-queue-tree-type">unknown</span><span class="yii-debug-queue-tree-value yii-debug-queue-tree-value-unknown">(unsupported)</span>
+            </div>
+            </div>
+            </div>
+            </article>
+            HTML,
             $html,
             "Unsupported value types must render the '(unsupported)' placeholder.",
         );
-        self::assertStringContainsString(
-            '>unknown<',
-            $html,
-            "Unsupported value types must carry the 'unknown' type label.",
-        );
     }
 
     public function testRenderItemSkipsZeroDelayMetaItem(): void
     {
-        self::assertStringNotContainsString(
-            'data-field="delay"',
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header><div class="yii-debug-queue-meta">
+            <span class="yii-debug-queue-meta-item" data-field="id"><span class="yii-debug-queue-meta-label">id</span><span class="yii-debug-queue-meta-value">msg-1</span></span>
+            </div>
+            </article>
+            HTML,
             QueueCardRenderer::renderItem(self::makeRecord(jobId: 'msg-1', delay: 0))->render(),
             'Zero delay must be hidden only positive delays render.',
         );
@@ -577,19 +714,30 @@ public function testRenderItemTruncatesLongStringValuesAndKeepsFullValueInTitle(
     {
         $longValue = str_repeat('x', 200);
 
-        $html = QueueCardRenderer::renderItem(self::makeRecord(payloadFields: ['data' => $longValue]))
-            ->render();
-
-        self::assertStringContainsString(
-            '…',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header><div class="yii-debug-queue-payload">
+            <div class="yii-debug-queue-tree">
+            <div class="yii-debug-queue-tree-row">
+            <span class="yii-debug-queue-tree-key">data</span><span class="yii-debug-queue-tree-type">string</span><span class="yii-debug-queue-tree-value yii-debug-queue-tree-value-string" title="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx">"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx…"</span>
+            </div>
+            </div>
+            </div>
+            </article>
+            HTML,
+            QueueCardRenderer::renderItem(self::makeRecord(payloadFields: ['data' => $longValue]))->render(),
             'Long strings must be truncated with an ellipsis.',
         );
-        self::assertStringContainsString(
-            "title=\"{$longValue}\"",
-            $html,
-            'Full value must round-trip in the title attribute.',
-        );
+
     }
 
     public function testRenderItemTruncatesStringsAtUnicodeCharacterBoundaries(): void
@@ -597,20 +745,73 @@ public function testRenderItemTruncatesStringsAtUnicodeCharacterBoundaries(): vo
         $exactValue = str_repeat('é', 80);
         $longValue = 'É' . str_repeat('é', 80);
 
-        $exact = QueueCardRenderer::renderItem(self::makeRecord(payloadFields: ['data' => $exactValue]))->render();
-        $long = QueueCardRenderer::renderItem(self::makeRecord(payloadFields: ['data' => $longValue]))->render();
-
-        self::assertStringContainsString('>"' . $exactValue . '"<', $exact, 'Exactly 80 characters must not truncate.');
-        self::assertStringNotContainsString('…', $exact, 'The exact string limit must not add an ellipsis.');
-        self::assertStringContainsString('>"É' . str_repeat('é', 79) . '…"<', $long, 'Long Unicode strings must preserve the first 80 characters.');
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header><div class="yii-debug-queue-payload">
+            <div class="yii-debug-queue-tree">
+            <div class="yii-debug-queue-tree-row">
+            <span class="yii-debug-queue-tree-key">data</span><span class="yii-debug-queue-tree-type">string</span><span class="yii-debug-queue-tree-value yii-debug-queue-tree-value-string" title="éééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééé">"éééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééé"</span>
+            </div>
+            </div>
+            </div>
+            </article>
+            HTML,
+            QueueCardRenderer::renderItem(self::makeRecord(payloadFields: ['data' => $exactValue]))->render(),
+            'Exactly 80 characters must not truncate.',
+        );
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 58' aria-hidden="true">H</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            HelloJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header><div class="yii-debug-queue-payload">
+            <div class="yii-debug-queue-tree">
+            <div class="yii-debug-queue-tree-row">
+            <span class="yii-debug-queue-tree-key">data</span><span class="yii-debug-queue-tree-type">string</span><span class="yii-debug-queue-tree-value yii-debug-queue-tree-value-string" title="Ééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééé">"Éééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééé…"</span>
+            </div>
+            </div>
+            </div>
+            </article>
+            HTML,
+            QueueCardRenderer::renderItem(self::makeRecord(payloadFields: ['data' => $longValue]))->render(),
+            'Long Unicode strings must preserve the first 80 characters.',
+        );
     }
 
     public function testRenderItemUsesOneUnicodeCharacterForTheAvatarInitial(): void
     {
-        $html = QueueCardRenderer::renderItem(self::makeRecord(jobClass: 'app\\jobs\\éclairJob'))->render();
-
-        self::assertStringContainsString('aria-hidden="true">É</span>', $html, 'Avatar initial must be one complete Unicode character.');
-        self::assertStringNotContainsString('>Éc<', $html, 'Avatar initial must not include the second character.');
+        self::assertSame(
+            <<<HTML
+            <article class="yii-debug-queue-card">
+            <header class="yii-debug-queue-card-head">
+            <span class="yii-debug-queue-avatar" style='--queue-hue: 182' aria-hidden="true">É</span><div class="yii-debug-queue-headline">
+            <h2 class="yii-debug-queue-class">
+            éclairJob
+            </h2><span class="yii-debug-queue-namespace">app\jobs\</span>
+            </div><div class="yii-debug-queue-meta-pills">
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span><span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span><span class="yii-debug-queue-time">00:00:00</span>
+            </div>
+            </header>
+            </article>
+            HTML,
+            QueueCardRenderer::renderItem(self::makeRecord(jobClass: 'app\\jobs\\éclairJob'))->render(),
+            'Avatar initial must be one complete Unicode character.',
+        );
     }
 
     /**
diff --git a/tests/Panel/Queue/QueueGridRendererTest.php b/tests/Panel/Queue/QueueGridRendererTest.php
index a97095d..b868189 100644
--- a/tests/Panel/Queue/QueueGridRendererTest.php
+++ b/tests/Panel/Queue/QueueGridRendererTest.php
@@ -50,31 +50,23 @@ public function testRenderComponentCellReturnsRawComponentId(): void
 
     public function testRenderDriverCellAddsAsyncModifier(): void
     {
-        $html = QueueGridRenderer::renderDriverCell(
-            self::makeRecord(driverName: 'Redis', isAsync: true),
-        );
-
-        self::assertStringContainsString(
-            'yii-debug-queue-driver-is-async',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-queue-driver yii-debug-queue-driver-is-async" title="yii\queue\sync\Queue">Redis</span>
+            HTML,
+            QueueGridRenderer::renderDriverCell(self::makeRecord(driverName: 'Redis', isAsync: true)),
             "Async drivers must carry the 'is-async' modifier.",
         );
-        self::assertStringContainsString(
-            'Redis',
-            $html,
-            'Driver label must appear in the cell.',
-        );
-        self::assertStringContainsString(
-            'title="yii\\queue\\sync\\Queue"',
-            $html,
-            'Known driver class must be retained in the tooltip.',
-        );
+
+
     }
 
     public function testRenderDriverCellAddsSyncModifierWhenInProcess(): void
     {
-        self::assertStringContainsString(
-            'yii-debug-queue-driver-is-sync',
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="yii\queue\sync\Queue">Sync</span>
+            HTML,
             QueueGridRenderer::renderDriverCell(self::makeRecord(driverName: 'Sync', isAsync: false)),
             "Sync drivers must carry the 'is-sync' modifier.",
         );
@@ -91,8 +83,10 @@ public function testRenderDriverCellReturnsEmptyWhenDriverNameIsMissing(): void
 
     public function testRenderDriverCellUsesFallbackTooltipWhenDriverClassIsMissing(): void
     {
-        self::assertStringContainsString(
-            'title="Unknown driver"',
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-queue-driver yii-debug-queue-driver-is-sync" title="Unknown driver">Custom</span>
+            HTML,
             QueueGridRenderer::renderDriverCell(self::makeRecord(driverName: 'Custom', driverClass: '')),
             'Missing driver class must use the explicit fallback tooltip.',
         );
@@ -132,96 +126,60 @@ public function testRenderIdCellReturnsDashWhenJobIdIsEmpty(): void
 
     public function testRenderIdCellWrapsJobIdInTagLinkSpan(): void
     {
-        $html = QueueGridRenderer::renderIdCell(
-            self::makeRecord(jobId: '69ffbbf2a6830'),
-        );
-
-        self::assertStringContainsString(
-            'class="yii-debug-tag-link"',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-tag-link">69ffbbf2a6830</span>
+            HTML,
+            QueueGridRenderer::renderIdCell(self::makeRecord(jobId: '69ffbbf2a6830')),
             'Id must reuse the History tag-link styling.',
         );
-        self::assertStringContainsString(
-            '69ffbbf2a6830',
-            $html,
-            'Cell must render the raw job id verbatim.',
-        );
+
     }
 
     public function testRenderJobCellSplitsFqcnAndWiresHref(): void
     {
-        $html = QueueGridRenderer::renderJobCell(
-            self::makeRecord(jobClass: 'app\\jobs\\HelloJob'),
-            '/debug/queue?seq=2',
-        );
-
-        self::assertStringContainsString(
-            '<strong>HelloJob</strong>',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-queue-grid-job">
+            <a class="yii-debug-queue-grid-job-link" href="/debug/queue?seq=2" title="app\jobs\HelloJob"><strong>HelloJob</strong></a><span class="yii-debug-queue-grid-job-namespace">app\jobs\</span>
+            </div>
+            HTML,
+            QueueGridRenderer::renderJobCell(
+                self::makeRecord(jobClass: 'app\\jobs\\HelloJob'),
+                '/debug/queue?seq=2',
+            ),
             'Short class name must render in bold inside the link.',
         );
-        self::assertStringContainsString(
-            'title="app\\jobs\\HelloJob"',
-            $html,
-            'Job link tooltip must retain the full class name.',
-        );
-        self::assertStringContainsString(
-            'class="yii-debug-queue-grid-job-namespace">app\\jobs\\</span>',
-            $html,
-            'Namespace prefix must appear under the link.',
-        );
-        self::assertStringContainsString(
-            'href="/debug/queue?seq=2"',
-            $html,
-            'Detail href must be wired to the row link.',
-        );
     }
 
     public function testRenderStatusCellRendersFailedVariantForErrorEvents(): void
     {
-        $html = QueueGridRenderer::renderStatusCell(
-            self::makeRecord(eventType: 'error'),
-        );
-
-        self::assertStringContainsString(
-            'yii-debug-queue-status-failed',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-queue-status yii-debug-queue-status-failed">Failed</span>
+            HTML,
+            QueueGridRenderer::renderStatusCell(self::makeRecord(eventType: 'error')),
             "Error events must produce the 'failed' modifier.",
         );
-        self::assertStringContainsString(
-            'Failed',
-            $html,
-            "Error events must show the 'Failed' label.",
-        );
     }
 
     public function testRenderStatusCellRendersQueuedVariantForPushEvents(): void
     {
-        $html = QueueGridRenderer::renderStatusCell(
-            self::makeRecord(eventType: 'push'),
-        );
-
-        self::assertStringContainsString(
-            'yii-debug-queue-status-queued',
-            $html,
+        self::assertSame(
+            <<<'HTML'
+            <span class="yii-debug-queue-status yii-debug-queue-status-queued">Queued</span>
+            HTML,
+            QueueGridRenderer::renderStatusCell(self::makeRecord(eventType: 'push')),
             "Push events must produce the 'queued' modifier.",
         );
-        self::assertStringContainsString(
-            'Queued',
-            $html,
-            "Push events must show the 'Queued' label.",
-        );
+
     }
 
     public function testRenderTimeCellFormatsMicrotimeAsHmsWithMilliseconds(): void
     {
-        $html = QueueGridRenderer::renderTimeCell(
-            self::makeRecord(time: 1_704_112_496.789),
-        );
-
         self::assertSame(
             date('H:i:s', 1_704_112_496) . '.789',
-            $html,
+            QueueGridRenderer::renderTimeCell(self::makeRecord(time: 1_704_112_496.789)),
             "Time cell must preserve the exact 'HH:MM:SS.mmm' value.",
         );
     }
@@ -251,7 +209,6 @@ public function testRenderTtrCellReturnsDashWhenTtrIsNullOrZero(): void
             QueueGridRenderer::renderTtrCell(self::makeRecord(ttr: null)),
             "Null TTR must yield '—'.",
         );
-
         self::assertSame(
             '—',
             QueueGridRenderer::renderTtrCell(self::makeRecord(ttr: 0)),
diff --git a/tests/Panel/Request/RequestDataNormalizerTest.php b/tests/Panel/Request/RequestDataNormalizerTest.php
index c875a23..f2182a2 100644
--- a/tests/Panel/Request/RequestDataNormalizerTest.php
+++ b/tests/Panel/Request/RequestDataNormalizerTest.php
@@ -10,8 +10,8 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * Unit tests for {@see RequestDataNormalizer} covering captured request data plus the controller summary
- * into the typed {@see \PHPForge\Debug\Panel\Request\RequestView} aggregate (hero header + tab/section list).
+ * Unit tests for {@see RequestDataNormalizer} covering captured request data plus the controller summary into the typed
+ * {@see \PHPForge\Debug\Panel\Request\RequestView} aggregate (hero header + tab/section list).
  */
 #[Group('panel')]
 #[Group('request')]
diff --git a/tests/Panel/Request/RequestSectionRendererTest.php b/tests/Panel/Request/RequestSectionRendererTest.php
index 7d98415..e0c386b 100644
--- a/tests/Panel/Request/RequestSectionRendererTest.php
+++ b/tests/Panel/Request/RequestSectionRendererTest.php
@@ -18,88 +18,100 @@ final class RequestSectionRendererTest extends TestCase
 {
     public function testRenderHeroEmitsFlagChipsForEachActiveFlag(): void
     {
-        $html = RequestSectionRenderer::renderHero(self::makeHero(flags: ['AJAX', 'HTTPS']));
-
-        self::assertStringContainsString(
-            '>AJAX</span>',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <header class="yii-debug-request-hero">
+            <div class="yii-debug-request-hero-line">
+            <span class="yii-debug-request-hero-method yii-debug-verb-get">GET</span><span class="yii-debug-request-hero-url" title="http://example.test/">http://example.test/</span><span class="yii-debug-snapshot-status yii-debug-status-2xx">200</span>
+            </div><div class="yii-debug-request-hero-meta">
+            <span class="yii-debug-snapshot-tag">AJAX</span><span class="yii-debug-snapshot-tag">HTTPS</span>
+            </div>
+            </header>
+            HTML,
+            RequestSectionRenderer::renderHero(self::makeHero(flags: ['AJAX', 'HTTPS'])),
             'AJAX flag must surface in the meta strip.',
         );
-        self::assertStringContainsString(
-            '>HTTPS</span>',
-            $html,
-            'HTTPS flag must surface in the meta strip.',
-        );
+
     }
 
     public function testRenderHeroEmitsMetaSpansForEachNonEmptyMetaPiece(): void
     {
-        $html = RequestSectionRenderer::renderHero(
-            self::makeHero(ip: '127.0.0.1', time: '12:34:56', durationMs: '7.5 ms'),
-        );
-
-        self::assertStringContainsString(
-            '>127.0.0.1</span>',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <header class="yii-debug-request-hero">
+            <div class="yii-debug-request-hero-line">
+            <span class="yii-debug-request-hero-method yii-debug-verb-get">GET</span><span class="yii-debug-request-hero-url" title="http://example.test/">http://example.test/</span><span class="yii-debug-snapshot-status yii-debug-status-2xx">200</span>
+            </div><div class="yii-debug-request-hero-meta">
+            <span>127.0.0.1</span><span>12:34:56</span><span>7.5 ms</span>
+            </div>
+            </header>
+            HTML,
+            RequestSectionRenderer::renderHero(self::makeHero(ip: '127.0.0.1', time: '12:34:56', durationMs: '7.5 ms')),
             'Non-empty ip must surface in the meta strip.',
         );
-        self::assertStringContainsString(
-            '>12:34:56</span>',
-            $html,
-            'Non-empty time must surface in the meta strip.',
-        );
-        self::assertStringContainsString(
-            '>7.5 ms</span>',
-            $html,
-            'Non-empty durationMs must surface in the meta strip.',
-        );
     }
 
     public function testRenderHeroOmitsMethodPillWhenMethodIsEmpty(): void
     {
-        $html = RequestSectionRenderer::renderHero(self::makeHero(method: ''));
-
-        self::assertStringNotContainsString(
-            'yii-debug-request-hero-method',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <header class="yii-debug-request-hero">
+            <div class="yii-debug-request-hero-line">
+            <span class="yii-debug-request-hero-url" title="http://example.test/">http://example.test/</span><span class="yii-debug-snapshot-status yii-debug-status-2xx">200</span>
+            </div><div class="yii-debug-request-hero-meta">
+            </div>
+            </header>
+            HTML,
+            RequestSectionRenderer::renderHero(self::makeHero(method: '')),
             'Empty method must drop the method pill.',
         );
     }
 
     public function testRenderHeroOmitsStatusPillWhenStatusCodeIsZero(): void
     {
-        $html = RequestSectionRenderer::renderHero(self::makeHero(statusCode: 0));
-
-        self::assertStringNotContainsString(
-            'yii-debug-snapshot-status',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <header class="yii-debug-request-hero">
+            <div class="yii-debug-request-hero-line">
+            <span class="yii-debug-request-hero-method yii-debug-verb-get">GET</span><span class="yii-debug-request-hero-url" title="http://example.test/">http://example.test/</span>
+            </div><div class="yii-debug-request-hero-meta">
+            </div>
+            </header>
+            HTML,
+            RequestSectionRenderer::renderHero(self::makeHero(statusCode: 0)),
             'Zero status must drop the status pill.',
         );
     }
 
     public function testRenderHeroRendersStatusPillWithVariantModifier(): void
     {
-        $html = RequestSectionRenderer::renderHero(self::makeHero(statusCode: 500, statusVariant: '5xx'));
-
-        self::assertStringContainsString(
-            'yii-debug-snapshot-status yii-debug-status-5xx',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <header class="yii-debug-request-hero">
+            <div class="yii-debug-request-hero-line">
+            <span class="yii-debug-request-hero-method yii-debug-verb-get">GET</span><span class="yii-debug-request-hero-url" title="http://example.test/">http://example.test/</span><span class="yii-debug-snapshot-status yii-debug-status-5xx">500</span>
+            </div><div class="yii-debug-request-hero-meta">
+            </div>
+            </header>
+            HTML,
+            RequestSectionRenderer::renderHero(self::makeHero(statusCode: 500, statusVariant: '5xx')),
             'Variant must surface as a vocabulary status class.',
         );
-        self::assertStringContainsString(
-            '>500</span>',
-            $html,
-            'Status code value must render inside the pill.',
-        );
+
     }
 
     public function testRenderHeroTintsMethodPillWithVocabularyVerb(): void
     {
-        $html = RequestSectionRenderer::renderHero(self::makeHero(method: 'POST'));
-
-        self::assertStringContainsString(
-            'yii-debug-request-hero-method yii-debug-verb-post',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <header class="yii-debug-request-hero">
+            <div class="yii-debug-request-hero-line">
+            <span class="yii-debug-request-hero-method yii-debug-verb-post">POST</span><span class="yii-debug-request-hero-url" title="http://example.test/">http://example.test/</span><span class="yii-debug-snapshot-status yii-debug-status-2xx">200</span>
+            </div><div class="yii-debug-request-hero-meta">
+            </div>
+            </header>
+            HTML,
+            RequestSectionRenderer::renderHero(self::makeHero(method: 'POST')),
             "POST must wear the 'post' verb class.",
         );
     }
@@ -108,85 +120,103 @@ public function testRenderSectionEmitsFilterInputWhenFilterableAndNonEmpty(): vo
     {
         $section = new RequestSection(caption: 'Server', entries: ['HTTP_HOST' => 'localhost'], filterable: true);
 
-        $html = RequestSectionRenderer::renderSection($section);
-
-        self::assertStringContainsString(
-            'type="search"',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <header class="yii-debug-section-header">
+            <h2>
+            Server
+            </h2><input class="yii-debug-filter-input" type="search" aria-label="Filter Server" data-yii-debug-filter="true" placeholder="Filter…">
+            </header><div class="yii-debug-table-wrap" data-yii-debug-filter-target="true">
+            <table class="yii-debug-table yii-debug-table-mono" style='table-layout: fixed;'>
+            <thead>
+            <tr>
+            <th scope="col">
+            Name
+            </th><th scope="col">
+            Value
+            </th>
+            </tr>
+            </thead><tbody>
+            <tr>
+            <th scope="row">
+            HTTP_HOST
+            </th><td>
+            &#039;localhost&#039;
+            </td>
+            </tr>
+            </tbody>
+            </table>
+            </div>
+            HTML,
+            RequestSectionRenderer::renderSection($section),
             'Filterable section must expose a search input.',
         );
-        self::assertStringContainsString(
-            'data-yii-debug-filter="true"',
-            $html,
-            'Filterable section input must carry the enabled filtering marker.',
-        );
-        self::assertStringContainsString(
-            'data-yii-debug-filter-target="true"',
-            $html,
-            'Filterable table must be the JS filter target.',
-        );
-        self::assertStringContainsString(
-            '<h2>' . "\n" . 'Server' . "\n" . '</h2>',
-            $html,
-            'Section header must render its caption.',
-        );
-        self::assertStringContainsString(
-            "style='table-layout: fixed;'",
-            $html,
-            'Section table must keep its fixed layout.',
-        );
     }
 
     public function testRenderSectionOmitsFilterInputWhenSectionIsEmpty(): void
     {
         $section = new RequestSection(caption: 'Server', entries: [], filterable: true);
 
-        $html = RequestSectionRenderer::renderSection($section);
-
-        self::assertStringNotContainsString(
-            'type="search"',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <header class="yii-debug-section-header">
+            <h2>
+            Server
+            </h2>
+            </header><p class="yii-debug-table-empty">
+            No data
+            </p>
+            HTML,
+            RequestSectionRenderer::renderSection($section),
             'Empty section must not render the filter input.',
         );
-        self::assertStringContainsString(
-            'No data',
-            $html,
-            "Empty section must show the 'No data' placeholder.",
-        );
+
     }
 
     public function testRenderSectionPicksHtmlSpecialCharsEscapingForRowValues(): void
     {
         $section = new RequestSection(caption: 'Headers', entries: ['X-Custom' => "'quoted' <script>alert(1)</script>"]);
 
-        $html = RequestSectionRenderer::renderSection($section);
-
-        self::assertStringNotContainsString(
-            '<script>alert(1)</script>',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <header class="yii-debug-section-header">
+            <h2>
+            Headers
+            </h2>
+            </header><div class="yii-debug-table-wrap">
+            <table class="yii-debug-table yii-debug-table-mono" style='table-layout: fixed;'>
+            <thead>
+            <tr>
+            <th scope="col">
+            Name
+            </th><th scope="col">
+            Value
+            </th>
+            </tr>
+            </thead><tbody>
+            <tr>
+            <th scope="row">
+            X-Custom
+            </th><td>
+            &#039;\&#039;quoted\&#039; &lt;script&gt;alert(1)&lt;/script&gt;&#039;
+            </td>
+            </tr>
+            </tbody>
+            </table>
+            </div>
+            HTML,
+            RequestSectionRenderer::renderSection($section),
             'Raw payload must never reach the rendered HTML.',
         );
-        self::assertStringContainsString(
-            '&lt;script&gt;',
-            $html,
-            'Tag characters must be escaped.',
-        );
-        self::assertStringContainsString(
-            '&#039;',
-            $html,
-            'Single quotes must be escaped by ENT_QUOTES.',
-        );
     }
 
     public function testRenderSectionRendersOneRowPerEntry(): void
     {
         $section = new RequestSection(caption: 'Headers', entries: ['a' => 'A', 'b' => 'B', 'c' => 'C']);
 
-        $html = RequestSectionRenderer::renderSection($section);
-
         self::assertSame(
             3,
-            substr_count($html, '<td>'),
+            substr_count(RequestSectionRenderer::renderSection($section), '<td>'),
             'Each entry must produce exactly one body row.',
         );
     }
@@ -198,23 +228,23 @@ public function testRenderTabsMarksFirstTabActive(): void
             new RequestTab(label: 'Headers', sections: []),
         ];
 
-        $html = RequestSectionRenderer::renderTabs($tabs);
-
-        self::assertStringContainsString(
-            'is-active',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <ul class="yii-debug-tabs" role="tablist" aria-label="Request data">
+            <li class="yii-debug-tab" role="presentation">
+            <a class="yii-debug-tab-link is-active" id="request-tab-0" href="#request-panel-0" role="tab" tabindex="0" aria-controls="request-panel-0" aria-selected="true" data-yii-debug-toggle="tab">Parameters</a>
+            </li><li class="yii-debug-tab" role="presentation">
+            <a class="yii-debug-tab-link" id="request-tab-1" href="#request-panel-1" role="tab" tabindex="-1" aria-controls="request-panel-1" aria-selected="false" data-yii-debug-toggle="tab">Headers</a>
+            </li>
+            </ul><div class="yii-debug-tab-content">
+            <div class="yii-debug-tab-panel is-active" id="request-panel-0" role="tabpanel" aria-labelledby="request-tab-0">
+            </div><div class="yii-debug-tab-panel" id="request-panel-1" role="tabpanel" aria-labelledby="request-tab-1" hidden>
+            </div>
+            </div>
+            HTML,
+            RequestSectionRenderer::renderTabs($tabs),
             "First tab must carry the 'is-active' class.",
         );
-        self::assertStringContainsString(
-            'aria-selected="true"',
-            $html,
-            "First tab anchor must have 'aria-selected=true'.",
-        );
-        self::assertStringContainsString(
-            'aria-selected="false"',
-            $html,
-            "Subsequent tab anchors must have 'aria-selected=false'.",
-        );
     }
 
     public function testRenderTabsRendersNestedSections(): void
@@ -222,21 +252,75 @@ public function testRenderTabsRendersNestedSections(): void
         $tabs = [
             new RequestTab(
                 label: 'Parameters',
-                sections: [new RequestSection(caption: 'Query parameters', entries: ['page' => 1])],
+                sections: [
+                    new RequestSection(caption: 'Query parameters', entries: ['page' => 1]),
+                    new RequestSection(caption: 'Body parameters', entries: ['name' => 'Ada']),
+                ],
             ),
         ];
 
-        $html = RequestSectionRenderer::renderTabs($tabs);
-
         self::assertSame(
-            1,
-            substr_count($html, 'Query parameters'),
-            'A nested section must render exactly once.',
-        );
-        self::assertSame(
-            1,
-            substr_count($html, 'page'),
-            'A nested section row must render exactly once.',
+            <<<'HTML'
+            <ul class="yii-debug-tabs" role="tablist" aria-label="Request data">
+            <li class="yii-debug-tab" role="presentation">
+            <a class="yii-debug-tab-link is-active" id="request-tab-0" href="#request-panel-0" role="tab" tabindex="0" aria-controls="request-panel-0" aria-selected="true" data-yii-debug-toggle="tab">Parameters</a>
+            </li>
+            </ul><div class="yii-debug-tab-content">
+            <div class="yii-debug-tab-panel is-active" id="request-panel-0" role="tabpanel" aria-labelledby="request-tab-0">
+            <header class="yii-debug-section-header">
+            <h2>
+            Query parameters
+            </h2>
+            </header><div class="yii-debug-table-wrap">
+            <table class="yii-debug-table yii-debug-table-mono" style='table-layout: fixed;'>
+            <thead>
+            <tr>
+            <th scope="col">
+            Name
+            </th><th scope="col">
+            Value
+            </th>
+            </tr>
+            </thead><tbody>
+            <tr>
+            <th scope="row">
+            page
+            </th><td>
+            1
+            </td>
+            </tr>
+            </tbody>
+            </table>
+            </div><header class="yii-debug-section-header">
+            <h2>
+            Body parameters
+            </h2>
+            </header><div class="yii-debug-table-wrap">
+            <table class="yii-debug-table yii-debug-table-mono" style='table-layout: fixed;'>
+            <thead>
+            <tr>
+            <th scope="col">
+            Name
+            </th><th scope="col">
+            Value
+            </th>
+            </tr>
+            </thead><tbody>
+            <tr>
+            <th scope="row">
+            name
+            </th><td>
+            &#039;Ada&#039;
+            </td>
+            </tr>
+            </tbody>
+            </table>
+            </div>
+            </div>
+            </div>
+            HTML,
+            RequestSectionRenderer::renderTabs($tabs),
+            'Every nested section must be concatenated into the exact tab-panel HTML.',
         );
     }
 
@@ -247,23 +331,25 @@ public function testRenderTabsWiresPanelIdsAndAriaControls(): void
             new RequestTab(label: 'Headers', sections: []),
         ];
 
-        $html = RequestSectionRenderer::renderTabs($tabs);
-
-        self::assertStringContainsString(
-            'href="#request-panel-0"',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <ul class="yii-debug-tabs" role="tablist" aria-label="Request data">
+            <li class="yii-debug-tab" role="presentation">
+            <a class="yii-debug-tab-link is-active" id="request-tab-0" href="#request-panel-0" role="tab" tabindex="0" aria-controls="request-panel-0" aria-selected="true" data-yii-debug-toggle="tab">Parameters</a>
+            </li><li class="yii-debug-tab" role="presentation">
+            <a class="yii-debug-tab-link" id="request-tab-1" href="#request-panel-1" role="tab" tabindex="-1" aria-controls="request-panel-1" aria-selected="false" data-yii-debug-toggle="tab">Headers</a>
+            </li>
+            </ul><div class="yii-debug-tab-content">
+            <div class="yii-debug-tab-panel is-active" id="request-panel-0" role="tabpanel" aria-labelledby="request-tab-0">
+            </div><div class="yii-debug-tab-panel" id="request-panel-1" role="tabpanel" aria-labelledby="request-tab-1" hidden>
+            </div>
+            </div>
+            HTML,
+            RequestSectionRenderer::renderTabs($tabs),
             "First tab 'href' must point to 'request-panel-0'.",
         );
-        self::assertStringContainsString(
-            'aria-controls="request-panel-1"',
-            $html,
-            "Second tab 'aria-controls' must match its panel id.",
-        );
-        self::assertStringContainsString(
-            'id="request-panel-0"',
-            $html,
-            "First panel 'id' must match its tab href.",
-        );
+
+
     }
 
     public function testRequestSectionDefaultsToNonFilterable(): void
diff --git a/tests/Panel/Router/RouterCurrentViewTest.php b/tests/Panel/Router/RouterCurrentViewTest.php
index 05b52e6..8351f60 100644
--- a/tests/Panel/Router/RouterCurrentViewTest.php
+++ b/tests/Panel/Router/RouterCurrentViewTest.php
@@ -10,8 +10,6 @@
 
 /**
  * Unit tests for {@see RouterCurrentView} covering the snapshot-to-view projection and the empty fallback.
- *
- * @since 0.1
  */
 #[Group('panel')]
 #[Group('router')]
@@ -33,23 +31,68 @@ public function testFromSnapshotProjectsTheHydratedSnapshot(): void
 
         $view = RouterCurrentView::fromSnapshot($snapshot);
 
-        self::assertSame('app/controllers/SiteController::actionIndex', $view->action, 'Action must project.');
-        self::assertSame('site/index', $view->route, 'Route must project.');
-        self::assertSame('Route requested: site/index', $view->message, 'Message must project.');
-        self::assertSame(1, $view->count, 'Log count must reflect the entries.');
-        self::assertTrue($view->hasMatch, 'A matching entry must flag the view.');
-        self::assertCount(1, $view->logs, 'Log rows must project.');
+        self::assertSame(
+            'app/controllers/SiteController::actionIndex',
+            $view->action,
+            'Action must project.',
+        );
+        self::assertSame(
+            'site/index',
+            $view->route,
+            'Route must project.',
+        );
+        self::assertSame(
+            'Route requested: site/index',
+            $view->message,
+            'Message must project.',
+        );
+        self::assertSame(
+            1,
+            $view->count,
+            'Log count must reflect the entries.',
+        );
+        self::assertTrue(
+            $view->hasMatch,
+            'A matching entry must flag the view.',
+        );
+        self::assertCount(
+            1,
+            $view->logs,
+            'Log rows must project.',
+        );
     }
 
     public function testFromSnapshotReturnsEmptyViewForNull(): void
     {
         $view = RouterCurrentView::fromSnapshot(null);
 
-        self::assertSame('', $view->action, 'Empty view must carry no action.');
-        self::assertSame('', $view->route, 'Empty view must carry no route.');
-        self::assertNull($view->message, 'Empty view must carry no message.');
-        self::assertSame(0, $view->count, 'Empty view must count zero rules.');
-        self::assertFalse($view->hasMatch, 'Empty view must report no match.');
-        self::assertSame([], $view->logs, 'Empty view must carry no logs.');
+        self::assertSame(
+            '',
+            $view->action,
+            'Empty view must carry no action.',
+        );
+        self::assertSame(
+            '',
+            $view->route,
+            'Empty view must carry no route.',
+        );
+        self::assertNull(
+            $view->message,
+            'Empty view must carry no message.',
+        );
+        self::assertSame(
+            0,
+            $view->count,
+            'Empty view must count zero rules.',
+        );
+        self::assertFalse(
+            $view->hasMatch,
+            'Empty view must report no match.',
+        );
+        self::assertSame(
+            [],
+            $view->logs,
+            'Empty view must carry no logs.',
+        );
     }
 }
diff --git a/tests/Panel/Router/RouterSectionRendererTest.php b/tests/Panel/Router/RouterSectionRendererTest.php
index 20c001a..c6d0228 100644
--- a/tests/Panel/Router/RouterSectionRendererTest.php
+++ b/tests/Panel/Router/RouterSectionRendererTest.php
@@ -39,7 +39,12 @@ public function testRenderTabsComposesFlagsTabsAndSummary(): void
             $current,
             [new RouterRuleRow('home', '/', 'GET', '', '', 'App\Web\HomePage')],
             [new ActionRouteRow('App\Web\HomePage', 'home', '/', 0)],
-            [['label' => 'FastRoute Matcher', 'variant' => 'success']],
+            [
+                [
+                    'label' => 'FastRoute Matcher',
+                    'variant' => 'success',
+                ],
+            ],
         );
 
         self::assertSame(
diff --git a/tests/Panel/SnapshotHydrationTest.php b/tests/Panel/SnapshotHydrationTest.php
index c1de224..1136645 100644
--- a/tests/Panel/SnapshotHydrationTest.php
+++ b/tests/Panel/SnapshotHydrationTest.php
@@ -51,6 +51,7 @@ public function testAssetSnapshotHydratesBundlesAndViteManifest(): void
         ];
 
         $snapshot = AssetSnapshot::fromArray($payload, '$.panels.asset');
+
         $bundle = $snapshot->bundles()[0] ?? self::fail('Expected one hydrated asset bundle.');
 
         self::assertSame(
@@ -109,6 +110,7 @@ public function testDatabaseSnapshotHydratesQueryRows(): void
         ];
 
         $snapshot = DbSnapshot::fromArray($payload, '$.panels.db');
+
         $query = $snapshot->entries()[0] ?? self::fail('Expected one hydrated query row.');
 
         self::assertSame(
@@ -138,6 +140,7 @@ public function testEventSnapshotHydratesEventRows(): void
         ];
 
         $snapshot = EventSnapshot::fromArray($payload, '$.panels.event');
+
         $event = $snapshot->entries()[0] ?? self::fail('Expected one hydrated event row.');
 
         self::assertSame(
diff --git a/tests/Panel/Timeline/TimelineGeometryTest.php b/tests/Panel/Timeline/TimelineGeometryTest.php
index 2b9bd46..a5c9305 100644
--- a/tests/Panel/Timeline/TimelineGeometryTest.php
+++ b/tests/Panel/Timeline/TimelineGeometryTest.php
@@ -19,7 +19,13 @@ final class TimelineGeometryTest extends TestCase
     public function testRulersUseAdaptiveRoundSteps(): void
     {
         self::assertSame(
-            [0 => 0.0, 20 => 20.0, 40 => 40.0, 60 => 60.0, 80 => 80.0],
+            [
+                0 => 0.0,
+                20 => 20.0,
+                40 => 40.0,
+                60 => 60.0,
+                80 => 80.0,
+            ],
             TimelineGeometry::rulers(100.0),
             'A 100 ms request must use uncluttered 20 ms ticks.',
         );
@@ -34,12 +40,26 @@ public function testRulersUseAdaptiveRoundSteps(): void
             'A disabled ruler must not emit ticks.',
         );
         self::assertSame(
-            [0 => 0.0, 5 => 27.77777777777778, 10 => 55.55555555555556, 15 => 83.33333333333334],
+            [0 => 0.0],
+            TimelineGeometry::rulers(100.0, 1),
+            'A one-line ruler target must remain valid and retain the origin.',
+        );
+        self::assertSame(
+            [
+                0 => 0.0,
+                5 => 27.77777777777778,
+                10 => 55.55555555555556,
+                15 => 83.33333333333334,
+            ],
             TimelineGeometry::rulers(18.0),
             'A normalized duration up to five must use five-unit ticks.',
         );
         self::assertSame(
-            [0 => 0.0, 10 => 32.25806451612903, 20 => 64.51612903225806],
+            [
+                0 => 0.0,
+                10 => 32.25806451612903,
+                20 => 64.51612903225806,
+            ],
             TimelineGeometry::rulers(31.0),
             'A normalized duration above five must use ten-unit ticks.',
         );
@@ -48,6 +68,87 @@ public function testRulersUseAdaptiveRoundSteps(): void
             TimelineGeometry::rulers(1.0),
             'A duration shorter than one complete step must keep only the origin.',
         );
+        self::assertSame(
+            [
+                0 => 0.0,
+                1 => 16.666666666666664,
+                2 => 33.33333333333333,
+                3 => 50.0, 4 => 66.66666666666666,
+                5 => 83.33333333333334,
+            ],
+            TimelineGeometry::rulers(6.0),
+            'The default six-line target and normalized-one boundary must use one-unit ticks.',
+        );
+        self::assertSame(
+            [
+                0 => 0.0,
+                2 => 16.666666666666664,
+                4 => 33.33333333333333,
+                6 => 50.0,
+                8 => 66.66666666666666,
+                10 => 83.33333333333334,
+            ],
+            TimelineGeometry::rulers(12.0),
+            'The normalized-two boundary must use two-unit ticks.',
+        );
+        self::assertSame(
+            [
+                0 => 0.0,
+                5 => 16.666666666666664,
+                10 => 33.33333333333333,
+                15 => 50.0,
+                20 => 66.66666666666666,
+                25 => 83.33333333333334,
+            ],
+            TimelineGeometry::rulers(30.0),
+            'The normalized-five boundary must use five-unit ticks.',
+        );
+        self::assertSame(
+            [
+                0 => 0.0,
+                5 => 20.833333333333336,
+                10 => 41.66666666666667,
+                15 => 62.5,
+                20 => 83.33333333333334,
+            ],
+            TimelineGeometry::rulers(24.0),
+            'Ruler magnitude selection must use floor rather than nearest rounding.',
+        );
+        self::assertSame(
+            [0 => 0.0],
+            TimelineGeometry::rulers(1.2),
+            'A tick below the one-quarter end margin must be omitted.',
+        );
+        self::assertSame(
+            [
+                0 => 0.0,
+                1 => 80.0,
+            ],
+            TimelineGeometry::rulers(1.25),
+            'A tick exactly on the one-quarter end margin must be retained.',
+        );
+        self::assertSame(
+            [
+                0 => 0.0,
+                50 => 16.666666666666664,
+                100 => 33.33333333333333,
+                150 => 50.0,
+                200 => 66.66666666666666,
+                250 => 83.33333333333334,
+            ],
+            TimelineGeometry::rulers(300.0),
+            'Five-step scaling must multiply by the magnitude.',
+        );
+        self::assertSame(
+            [
+                0 => 0.0,
+                100 => 27.77777777777778,
+                200 => 55.55555555555556,
+                300 => 83.33333333333334,
+            ],
+            TimelineGeometry::rulers(360.0),
+            'Ten-step scaling must multiply by the magnitude.',
+        );
     }
 
     public function testSpansUseTheSharedRequestGeometry(): void
@@ -85,7 +186,11 @@ public function testSpansUseTheSharedRequestGeometry(): void
         );
         self::assertSame(
             [],
-            TimelineGeometry::spans([], 0.0, 0.0),
+            TimelineGeometry::spans(
+                [new ProfileRow(0.0, 1.0, 'category', 'info', 0, 0, 0, 0, [])],
+                0.0,
+                0.0,
+            ),
             'A zero duration must not produce spans.',
         );
     }
diff --git a/tests/Panel/Timeline/TimelineMemoryRendererTest.php b/tests/Panel/Timeline/TimelineMemoryRendererTest.php
index b6ddbe0..3aeefbf 100644
--- a/tests/Panel/Timeline/TimelineMemoryRendererTest.php
+++ b/tests/Panel/Timeline/TimelineMemoryRendererTest.php
@@ -31,7 +31,7 @@ public function testRenderProducesExactSharedSvg(): void
             </svg>
             HTML,
             TimelineMemoryRenderer::render(
-                [new MemorySample(1_000.0, 50), new MemorySample(1_050.0, 75)],
+                [new MemorySample(1_050.0, 75), new MemorySample(1_000.0, 50)],
                 1_000.0,
                 100.0,
                 100,
@@ -54,5 +54,65 @@ public function testRenderReturnsEmptyStringForInvalidGeometry(): void
             TimelineMemoryRenderer::render([new MemorySample(0.0, 1)], 0.0, 0.0, 1),
             'A zero duration must omit the SVG.',
         );
+        self::assertSame(
+            '',
+            TimelineMemoryRenderer::render([new MemorySample(0.0, 1)], 0.0, 1.0, 0, 100, 20),
+            'Zero peak memory must omit the SVG even when dimensions are valid.',
+        );
+        self::assertSame(
+            '',
+            TimelineMemoryRenderer::render([new MemorySample(0.0, 1)], 0.0, 1.0, 1, 0, 20),
+            'Zero width must omit the SVG even when memory and height are valid.',
+        );
+        self::assertSame(
+            '',
+            TimelineMemoryRenderer::render([new MemorySample(0.0, 1)], 0.0, 1.0, 1, 100, 0),
+            'Zero height must omit the SVG even when memory and width are valid.',
+        );
+    }
+
+    public function testRenderSortsSamplesByTheHorizontalCoordinateOnly(): void
+    {
+        self::assertSame(
+            <<<HTML
+            <svg width="100" height="100" preserveAspectRatio="none" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+            <defs>
+            <linearGradient id="yii-debug-tl-memory-gradient" x1="0" x2="0" y1="1" y2="0">
+            <stop offset="10%" stop-color="currentColor" stop-opacity="0.18"><stop offset="60%" stop-color="currentColor" stop-opacity="0.45"><stop offset="90%" stop-color="currentColor" stop-opacity="0.65"><stop offset="100%" stop-color="currentColor" stop-opacity="0.85">
+            </linearGradient>
+            </defs><g>
+            <polygon points="0 100 0 100 50 -50 99.999 -50 100 100" fill="url(#yii-debug-tl-memory-gradient)"><polyline points="0 100 0 100 50 -50 100 -50" fill="none" stroke="currentColor" stroke-width="1.5">
+            </g>
+            </svg>
+            HTML,
+            TimelineMemoryRenderer::render(
+                [new MemorySample(1_050.0, 150), new MemorySample(1_000.0, 0)],
+                1_000.0,
+                100.0,
+                100,
+                100,
+                100,
+            ),
+            'Memory values must not influence chronological point sorting.',
+        );
+    }
+
+    public function testRenderUsesTheExactDefaultDimensions(): void
+    {
+        self::assertSame(
+            <<<HTML
+            <svg width="1920" height="40" preserveAspectRatio="none" viewBox="0 0 1920 40" xmlns="http://www.w3.org/2000/svg">
+            <defs>
+            <linearGradient id="yii-debug-tl-memory-gradient" x1="0" x2="0" y1="1" y2="0">
+            <stop offset="10%" stop-color="currentColor" stop-opacity="0.18"><stop offset="60%" stop-color="currentColor" stop-opacity="0.45"><stop offset="90%" stop-color="currentColor" stop-opacity="0.65"><stop offset="100%" stop-color="currentColor" stop-opacity="0.85">
+            </linearGradient>
+            </defs><g>
+            <polygon points="0 40 0 0 1919.999 0 1920 40" fill="url(#yii-debug-tl-memory-gradient)"><polyline points="0 40 0 0 1920 0" fill="none" stroke="currentColor" stroke-width="1.5">
+            </g>
+            </svg>
+            HTML,
+            TimelineMemoryRenderer::render([new MemorySample(0.0, 1)], 0.0, 1.0, 1),
+            'Default SVG width and height must remain part of the exact rendering contract.',
+        );
     }
 }
diff --git a/tests/Panel/Timeline/TimelineRendererTest.php b/tests/Panel/Timeline/TimelineRendererTest.php
index 8892947..39f2f22 100644
--- a/tests/Panel/Timeline/TimelineRendererTest.php
+++ b/tests/Panel/Timeline/TimelineRendererTest.php
@@ -8,6 +8,7 @@
 use PHPForge\Debug\Panel\Timeline\{TimelineGeometry, TimelineRenderer};
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
+use ReflectionMethod;
 
 /**
  * Unit tests for {@see TimelineRenderer} preserving the complete cross-adapter Timeline markup contract.
@@ -16,6 +17,29 @@
 #[Group('timeline')]
 final class TimelineRendererTest extends TestCase
 {
+    public function testRenderChartDeclaresExactScalarDefaults(): void
+    {
+        $parameters = (new ReflectionMethod(TimelineRenderer::class, 'renderChart'))->getParameters();
+        $defaults = [];
+
+        foreach ($parameters as $parameter) {
+            if ($parameter->isDefaultValueAvailable()) {
+                $defaults[$parameter->getName()] = $parameter->getDefaultValue();
+            }
+        }
+
+        self::assertSame(
+            0,
+            $defaults['memory'] ?? null,
+            'Peak memory must default to exactly zero bytes.',
+        );
+        self::assertSame(
+            40,
+            $defaults['memoryHeight'] ?? null,
+            'Memory chart height must default to exactly 40 pixels.',
+        );
+    }
+
     public function testRenderChartFormatsSecondsAndOmitsSingleCategoryLegend(): void
     {
         $rows = TimelineGeometry::spans(
@@ -39,6 +63,83 @@ public function testRenderChartFormatsSecondsAndOmitsSingleCategoryLegend(): voi
             'A single category must not render a redundant legend.',
         );
     }
+
+    public function testRenderChartFormatsTickBoundariesExactly(): void
+    {
+        $rows = TimelineGeometry::spans(
+            [new ProfileRow(0.0, 10.0, 'Queue\\Job', 'job', 0, 0, 0, 0, [])],
+            0.0,
+            100.0,
+        );
+
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-tl">
+            <header class="yii-debug-tl-axis">
+            <span class="yii-debug-tl-tick" style='left: 10%;'>1 s</span><span class="yii-debug-tl-tick" style='left: 20%;'>1 s</span><span class="yii-debug-tl-tick" style='left: 30%;'>1.1 s</span>
+            </header><div class="yii-debug-tl-rows" role="list">
+            <div class="yii-debug-tl-row yii-debug-tl-row-queue" title="job
+            10.000 ms · 0.00 MB" role="listitem">
+            <div class="yii-debug-tl-label" style='--depth: 0;'>
+            <span class="yii-debug-tl-dot" aria-hidden="true"></span><span class="yii-debug-tl-name"><span title="Queue\Job"><span class="yii-debug-muted">Queue\</span><wbr><strong>Job</strong></span></span>
+            </div><div class="yii-debug-tl-track">
+            <div class="yii-debug-tl-bar" style='left: 0%; width: 10%;'>
+            <span class="yii-debug-tl-bar-duration">10.0 ms</span>
+            </div>
+            </div>
+            </div>
+            </div>
+            </section>
+            HTML,
+            TimelineRenderer::renderChart($rows, [1_000 => 10.0, 1_049 => 20.0, 1_050 => 30.0]),
+            'Millisecond-to-second boundaries and decimal trimming must render exactly.',
+        );
+    }
+
+    public function testRenderChartIncludesNonAdjacentLegendVariants(): void
+    {
+        $rows = TimelineGeometry::spans(
+            [
+                new ProfileRow(0.0, 10.0, 'Yii3\\Application::handle', 'app', 0, 0, 0, 0, []),
+                new ProfileRow(10.0, 10.0, 'Queue\\Job', 'queue', 0, 1, 0, 0, []),
+            ],
+            0.0,
+            100.0,
+        );
+
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-tl">
+            <header class="yii-debug-tl-axis">
+            </header><div class="yii-debug-tl-legend">
+            <span class="yii-debug-tl-legend-item yii-debug-tl-row-app"><span class="yii-debug-tl-dot" aria-hidden="true"></span><span class="yii-debug-tl-legend-label">Application</span></span><span class="yii-debug-tl-legend-item yii-debug-tl-row-queue"><span class="yii-debug-tl-dot" aria-hidden="true"></span><span class="yii-debug-tl-legend-label">Queue</span></span>
+            </div><div class="yii-debug-tl-rows" role="list">
+            <div class="yii-debug-tl-row yii-debug-tl-row-app" title="app
+            10.000 ms · 0.00 MB" role="listitem">
+            <div class="yii-debug-tl-label" style='--depth: 0;'>
+            <span class="yii-debug-tl-dot" aria-hidden="true"></span><span class="yii-debug-tl-name"><span title="Yii3\Application::handle"><span class="yii-debug-muted">Yii3\</span><wbr><strong>Application::handle</strong></span></span>
+            </div><div class="yii-debug-tl-track">
+            <div class="yii-debug-tl-bar" style='left: 0%; width: 10%;'>
+            <span class="yii-debug-tl-bar-duration">10.0 ms</span>
+            </div>
+            </div>
+            </div><div class="yii-debug-tl-row yii-debug-tl-row-queue" title="queue
+            10.000 ms · 0.00 MB" role="listitem">
+            <div class="yii-debug-tl-label" style='--depth: 0;'>
+            <span class="yii-debug-tl-dot" aria-hidden="true"></span><span class="yii-debug-tl-name"><span title="Queue\Job"><span class="yii-debug-muted">Queue\</span><wbr><strong>Job</strong></span></span>
+            </div><div class="yii-debug-tl-track">
+            <div class="yii-debug-tl-bar" style='left: 10%; width: 10%;'>
+            <span class="yii-debug-tl-bar-duration">10.0 ms</span>
+            </div>
+            </div>
+            </div>
+            </div>
+            </section>
+            HTML,
+            TimelineRenderer::renderChart($rows, []),
+            'Legend traversal must retain variants separated by absent canonical categories.',
+        );
+    }
     public function testRenderChartProducesExactSharedMarkup(): void
     {
         $rows = TimelineGeometry::spans(
@@ -51,7 +152,7 @@ public function testRenderChartProducesExactSharedMarkup(): void
         );
 
         self::assertSame(
-            <<<'HTML'
+            <<<HTML
             <section class="yii-debug-tl">
             <header class="yii-debug-tl-axis">
             <span class="yii-debug-tl-tick" style='left: 0%;'>0 ms</span><span class="yii-debug-tl-tick" style='left: 50%;'>50 ms</span>
@@ -93,10 +194,45 @@ public function testRenderChartProducesExactSharedMarkup(): void
             'A chart without spans must stay empty.',
         );
     }
+
+    public function testRenderChartUsesExactDefaultMemoryValues(): void
+    {
+        $rows = TimelineGeometry::spans(
+            [new ProfileRow(0.0, 10.0, 'Queue\\Job', 'job', 0, 0, 0, 0, [])],
+            0.0,
+            100.0,
+        );
+
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-tl">
+            <header class="yii-debug-tl-axis">
+            </header><div class="yii-debug-tl-rows" role="list">
+            <div class="yii-debug-tl-row yii-debug-tl-row-queue" title="job
+            10.000 ms · 0.00 MB" role="listitem">
+            <div class="yii-debug-tl-label" style='--depth: 0;'>
+            <span class="yii-debug-tl-dot" aria-hidden="true"></span><span class="yii-debug-tl-name"><span title="Queue\Job"><span class="yii-debug-muted">Queue\</span><wbr><strong>Job</strong></span></span>
+            </div><div class="yii-debug-tl-track">
+            <div class="yii-debug-tl-bar" style='left: 0%; width: 10%;'>
+            <span class="yii-debug-tl-bar-duration">10.0 ms</span>
+            </div>
+            </div>
+            </div>
+            </div><footer class="yii-debug-tl-memory">
+            <span class="yii-debug-tl-memory-label">Memory</span><div class="yii-debug-tl-memory-track" style='height: 40px;'>
+            <svg></svg>
+            </div><span class="yii-debug-tl-memory-peak">0.00 MB</span>
+            </footer>
+            </section>
+            HTML,
+            TimelineRenderer::renderChart($rows, [], '<svg></svg>'),
+            'The default memory value and footer height must render exactly.',
+        );
+    }
     public function testRenderFilterFormProducesExactSharedMarkup(): void
     {
         self::assertSame(
-            <<<'HTML'
+            <<<HTML
             <form class="yii-debug-tl-filter" action="/debug/view" method="get">
             <input name="tag" type="hidden" value="request-1"><input name="panel" type="hidden" value="timeline"><div class="yii-debug-tl-field">
             <label for="tl-duration">Min duration (ms)</label><input id="tl-duration" name="Timeline[duration]" type="number" value="5" min="0" placeholder="0" step="0.1">
@@ -118,7 +254,7 @@ public function testRenderFilterFormProducesExactSharedMarkup(): void
     public function testRenderHintAndSummaryProduceExactSharedMarkup(): void
     {
         self::assertSame(
-            <<<'HTML'
+            <<<HTML
             <header class="yii-debug-grid-summary">
             <span><strong>123</strong> ms total</span><span class="yii-debug-grid-summary-sep">·</span><span><strong>2.00 MB</strong> peak memory</span><span class="yii-debug-grid-summary-sep">·</span><span><strong>2</strong> spans</span>
             </header>
diff --git a/tests/Panel/Timeline/TimelineSpanRowTest.php b/tests/Panel/Timeline/TimelineSpanRowTest.php
index 29bfe6e..c5305b5 100644
--- a/tests/Panel/Timeline/TimelineSpanRowTest.php
+++ b/tests/Panel/Timeline/TimelineSpanRowTest.php
@@ -10,8 +10,8 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * Unit tests for {@see TimelineSpanRow} covering the category → CSS-variant mapping, the minimum-width floor and
- * the multi-line tooltip composition.
+ * Unit tests for {@see TimelineSpanRow} covering the category → CSS-variant mapping, the minimum-width floor and the
+ * multi-line tooltip composition.
  */
 #[Group('panel')]
 #[Group('timeline')]
diff --git a/tests/Panel/User/UserDataNormalizerTest.php b/tests/Panel/User/UserDataNormalizerTest.php
index 0d1f489..8c5209f 100644
--- a/tests/Panel/User/UserDataNormalizerTest.php
+++ b/tests/Panel/User/UserDataNormalizerTest.php
@@ -12,9 +12,9 @@
 use function array_map;
 
 /**
- * Unit tests for {@see UserDataNormalizer} covering the narrowing of captured identity data
- * into the typed view-model: hero composition (monogram + status variant), attribute bucketing (Identity / Security /
- * Timestamps / Other), VarDumper-quote stripping, sensitive-key detection and timestamp humanization.
+ * Unit tests for {@see UserDataNormalizer} covering the narrowing of captured identity data into the typed view-model:
+ * hero composition (monogram + status variant), attribute bucketing (Identity / Security /  Timestamps / Other),
+ * VarDumper-quote stripping, sensitive-key detection and timestamp humanization.
  */
 #[Group('panel')]
 #[Group('user')]
@@ -134,7 +134,10 @@ public function testFromIdentityBuildsDefaultLabelsFromDotsAndUnderscores(): voi
 
         $other = $view->sections[1] ?? null;
 
-        self::assertNotNull($other, 'Other attributes section must be present.');
+        self::assertNotNull(
+            $other,
+            'Other attributes section must be present.',
+        );
         self::assertSame(
             ['Preferred Locale Key'],
             array_map(static fn(UserAttribute $attribute): string => $attribute->label, $other->attributes),
@@ -248,14 +251,46 @@ public function testFromIdentityHumanizesTimestampsAcrossEveryRelativeBucket():
             }
         }
 
-        self::assertSame('just now', $relatives['second_59_at'] ?? null, '59 seconds must remain just now.');
-        self::assertSame('1 min ago', $relatives['second_60_at'] ?? null, '60 seconds must become one minute.');
-        self::assertSame('1 min ago', $relatives['second_61_at'] ?? null, '61 seconds must round down to one minute.');
-        self::assertSame('59 min ago', $relatives['second_3599_at'] ?? null, '3599 seconds must round down.');
-        self::assertSame('1 h ago', $relatives['second_3600_at'] ?? null, '3600 seconds must become one hour.');
-        self::assertSame('23 h ago', $relatives['second_86399_at'] ?? null, '86399 seconds must round down.');
-        self::assertSame('1 d ago', $relatives['second_86400_at'] ?? null, '86400 seconds must become one day.');
-        self::assertSame('29 d ago', $relatives['second_2591999_at'] ?? null, 'The last sub-month second must round down.');
+        self::assertSame(
+            'just now',
+            $relatives['second_59_at'] ?? null,
+            '59 seconds must remain just now.',
+        );
+        self::assertSame(
+            '1 min ago',
+            $relatives['second_60_at'] ?? null,
+            '60 seconds must become one minute.',
+        );
+        self::assertSame(
+            '1 min ago',
+            $relatives['second_61_at'] ?? null,
+            '61 seconds must round down to one minute.',
+        );
+        self::assertSame(
+            '59 min ago',
+            $relatives['second_3599_at'] ?? null,
+            '3599 seconds must round down.',
+        );
+        self::assertSame(
+            '1 h ago',
+            $relatives['second_3600_at'] ?? null,
+            '3600 seconds must become one hour.',
+        );
+        self::assertSame(
+            '23 h ago',
+            $relatives['second_86399_at'] ?? null,
+            '86399 seconds must round down.',
+        );
+        self::assertSame(
+            '1 d ago',
+            $relatives['second_86400_at'] ?? null,
+            '86400 seconds must become one day.',
+        );
+        self::assertSame(
+            '29 d ago',
+            $relatives['second_2591999_at'] ?? null,
+            'The last sub-month second must round down.',
+        );
         self::assertSame(
             date('M j, Y · H:i', self::NOW - 2592000),
             $relatives['second_2592000_at'] ?? null,
diff --git a/tests/Panel/User/UserIdentityRendererTest.php b/tests/Panel/User/UserIdentityRendererTest.php
index 59f8485..cbe1cb6 100644
--- a/tests/Panel/User/UserIdentityRendererTest.php
+++ b/tests/Panel/User/UserIdentityRendererTest.php
@@ -47,21 +47,34 @@ public function testRenderEmitsTimestampRelativeAndAbsoluteParts(): void
 
         $html = UserIdentityRenderer::render($view);
 
-        self::assertStringContainsString(
-            '28 d ago',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-user">
+            <header class="yii-debug-user-card">
+            <span class="yii-debug-user-avatar" aria-hidden="true">A</span><div class="yii-debug-user-meta">
+            <h2 class="yii-debug-user-name">
+            admin
+            </h2><div class="yii-debug-user-tags">
+            </div>
+            </div>
+            </header><article class="yii-debug-user-section">
+            <header>
+            <span class="yii-debug-user-section-icon" aria-hidden="true"><svg></svg></span><span>Timestamps</span>
+            </header><dl>
+            <div class="yii-debug-user-row">
+            <dt>
+            Created At
+            </dt><dd>
+            <span class="yii-debug-user-time" title="1640000000"><span class="yii-debug-user-time-rel">28 d ago</span><span class="yii-debug-user-time-abs">Apr 13, 2026 · 14:19</span></span>
+            </dd>
+            </div>
+            </dl>
+            </article>
+            </section>
+            HTML,
             $html,
             'Relative time must surface in the row.',
         );
-        self::assertStringContainsString(
-            'Apr 13, 2026',
-            $html,
-            'Absolute time must surface in the row.',
-        );
-        self::assertStringContainsString(
-            'yii-debug-user-time',
-            $html,
-            'Timestamp rows must carry the time CSS class.',
-        );
     }
 
     public function testRenderEmitsTwoButtonsForSecurityAttributes(): void
@@ -97,21 +110,40 @@ public function testRenderEmitsTwoButtonsForSecurityAttributes(): void
             substr_count($html, '<button'),
             'Each security attribute must render its reveal button.',
         );
-        self::assertStringContainsString(
-            'data-yii-debug-reveal',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-user">
+            <header class="yii-debug-user-card">
+            <span class="yii-debug-user-avatar" aria-hidden="true">A</span><div class="yii-debug-user-meta">
+            <h2 class="yii-debug-user-name">
+            admin
+            </h2><div class="yii-debug-user-tags">
+            </div>
+            </div>
+            </header><article class="yii-debug-user-section">
+            <header>
+            <span class="yii-debug-user-section-icon" aria-hidden="true"><svg></svg></span><span>Security</span>
+            </header><dl>
+            <div class="yii-debug-user-row">
+            <dt>
+            Auth Key
+            </dt><dd>
+            <button class="yii-debug-user-reveal" type="button" aria-label="Reveal Auth Key" data-yii-debug-reveal="true"><span class="yii-debug-user-mask">••••••••••••</span><span class="yii-debug-user-real">abc</span><span class="yii-debug-user-reveal-cta" aria-hidden="true"></span></button>
+            </dd>
+            </div><div class="yii-debug-user-row">
+            <dt>
+            Password Hash
+            </dt><dd>
+            <button class="yii-debug-user-reveal" type="button" aria-label="Reveal Password Hash" data-yii-debug-reveal="true"><span class="yii-debug-user-mask">••••••••••••</span><span class="yii-debug-user-real">def</span><span class="yii-debug-user-reveal-cta" aria-hidden="true"></span></button>
+            </dd>
+            </div>
+            </dl>
+            </article>
+            </section>
+            HTML,
             $html,
             'Reveal buttons must carry the JS hook attribute.',
         );
-        self::assertStringContainsString(
-            'aria-label="Reveal Auth Key"',
-            $html,
-            'The reveal control must expose its complete accessible label.',
-        );
-        self::assertStringContainsString(
-            'data-yii-debug-reveal="true"',
-            $html,
-            'The JS hook must retain its enabled boolean value.',
-        );
     }
 
     public function testRenderHeroEmitsAvatarMonogramAndStatusVariant(): void
@@ -130,31 +162,25 @@ public function testRenderHeroEmitsAvatarMonogramAndStatusVariant(): void
 
         $html = UserIdentityRenderer::render($view);
 
-        self::assertStringContainsString(
-            'A</span>',
+        self::assertSame(
+            <<<HTML
+        <section class="yii-debug-user">
+        <header class="yii-debug-user-card">
+        <span class="yii-debug-user-avatar" aria-hidden="true">A</span><div class="yii-debug-user-meta">
+        <h2 class="yii-debug-user-name">
+        admin
+        </h2><p class="yii-debug-user-handle">
+        admin@example.com
+        </p><div class="yii-debug-user-tags">
+        <span class="yii-debug-user-status yii-debug-user-status-success">Active</span><span class="yii-debug-user-pill">ID #1</span>
+        </div>
+        </div>
+        </header>
+        </section>
+        HTML,
             $html,
             'Monogram must render inside the avatar span.',
         );
-        self::assertStringContainsString(
-            'yii-debug-user-status-success',
-            $html,
-            'Status variant must surface as the CSS modifier.',
-        );
-        self::assertStringContainsString(
-            'admin@example.com',
-            $html,
-            'Email must surface in the handle paragraph.',
-        );
-        self::assertStringContainsString(
-            'yii-debug-user-handle',
-            $html,
-            'Handle paragraph must use the handle CSS class.',
-        );
-        self::assertStringContainsString(
-            'ID #1',
-            $html,
-            'ID pill must surface with the `#` prefix.',
-        );
     }
 
     public function testRenderHeroOmitsEmailWhenMissing(): void
@@ -173,8 +199,19 @@ public function testRenderHeroOmitsEmailWhenMissing(): void
 
         $html = UserIdentityRenderer::render($view);
 
-        self::assertStringNotContainsString(
-            'yii-debug-user-handle',
+        self::assertSame(
+            <<<'HTML'
+        <section class="yii-debug-user">
+        <header class="yii-debug-user-card">
+        <span class="yii-debug-user-avatar" aria-hidden="true">A</span><div class="yii-debug-user-meta">
+        <h2 class="yii-debug-user-name">
+        admin
+        </h2><div class="yii-debug-user-tags">
+        </div>
+        </div>
+        </header>
+        </section>
+        HTML,
             $html,
             'Empty email must drop the handle paragraph entirely.',
         );
@@ -196,8 +233,19 @@ public function testRenderHeroOmitsStatusPillWhenLabelEmpty(): void
 
         $html = UserIdentityRenderer::render($view);
 
-        self::assertStringNotContainsString(
-            'yii-debug-user-status',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-user">
+            <header class="yii-debug-user-card">
+            <span class="yii-debug-user-avatar" aria-hidden="true">A</span><div class="yii-debug-user-meta">
+            <h2 class="yii-debug-user-name">
+            admin
+            </h2><div class="yii-debug-user-tags">
+            </div>
+            </div>
+            </header>
+            </section>
+            HTML,
             $html,
             'Empty status label must drop the status pill.',
         );
@@ -225,16 +273,34 @@ public function testRenderSurfacesEmptyDashForEmptyAttribute(): void
 
         $html = UserIdentityRenderer::render($view);
 
-        self::assertStringContainsString(
-            'yii-debug-user-empty',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-user">
+            <header class="yii-debug-user-card">
+            <span class="yii-debug-user-avatar" aria-hidden="true">A</span><div class="yii-debug-user-meta">
+            <h2 class="yii-debug-user-name">
+            admin
+            </h2><div class="yii-debug-user-tags">
+            </div>
+            </div>
+            </header><article class="yii-debug-user-section">
+            <header>
+            <span class="yii-debug-user-section-icon" aria-hidden="true"><svg></svg></span><span>Security</span>
+            </header><dl>
+            <div class="yii-debug-user-row">
+            <dt>
+            Token
+            </dt><dd>
+            <span class="yii-debug-user-empty">—</span>
+            </dd>
+            </div>
+            </dl>
+            </article>
+            </section>
+            HTML,
             $html,
             'Empty rows must surface the dedicated CSS class.',
         );
-        self::assertStringContainsString(
-            '—',
-            $html,
-            'Empty rows must show the em-dash placeholder.',
-        );
     }
 
     public function testRenderWiresFullPipelineThroughNormalizer(): void
@@ -253,31 +319,73 @@ public function testRenderWiresFullPipelineThroughNormalizer(): void
 
         $html = UserIdentityRenderer::render($view);
 
-        self::assertStringContainsString(
-            'yii-debug-user-name',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-user">
+            <header class="yii-debug-user-card">
+            <span class="yii-debug-user-avatar" aria-hidden="true">A</span><div class="yii-debug-user-meta">
+            <h2 class="yii-debug-user-name">
+            admin
+            </h2><p class="yii-debug-user-handle">
+            admin@example.com
+            </p><div class="yii-debug-user-tags">
+            <span class="yii-debug-user-status yii-debug-user-status-success">Active</span><span class="yii-debug-user-pill">ID #1</span>
+            </div>
+            </div>
+            </header><article class="yii-debug-user-section">
+            <header>
+            <span class="yii-debug-user-section-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="8" r="3.5"/><path d="M5 20c1-4 4-6 7-6s6 2 7 6"/></svg></span><span>Identity</span>
+            </header><dl>
+            <div class="yii-debug-user-row">
+            <dt>
+            Id
+            </dt><dd>
+            <span class="yii-debug-user-value">1</span>
+            </dd>
+            </div><div class="yii-debug-user-row">
+            <dt>
+            Username
+            </dt><dd>
+            <span class="yii-debug-user-value">admin</span>
+            </dd>
+            </div><div class="yii-debug-user-row">
+            <dt>
+            Email
+            </dt><dd>
+            <span class="yii-debug-user-value">admin@example.com</span>
+            </dd>
+            </div>
+            </dl>
+            </article><article class="yii-debug-user-section">
+            <header>
+            <span class="yii-debug-user-section-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><path d="M12 3l8 3v5c0 5-3.5 8.5-8 10-4.5-1.5-8-5-8-10V6z"/><path d="M9.5 12l2 2 3.5-4"/></svg></span><span>Security</span>
+            </header><dl>
+            <div class="yii-debug-user-row">
+            <dt>
+            Auth Key
+            </dt><dd>
+            <button class="yii-debug-user-reveal" type="button" aria-label="Reveal Auth Key" data-yii-debug-reveal="true"><span class="yii-debug-user-mask">••••••••••••</span><span class="yii-debug-user-real">authkey-12345</span><span class="yii-debug-user-reveal-cta" aria-hidden="true"></span></button>
+            </dd>
+            </div>
+            </dl>
+            </article><article class="yii-debug-user-section">
+            <header>
+            <span class="yii-debug-user-section-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="9"/><path d="M12 7v5l3 2"/></svg></span><span>Timestamps</span>
+            </header><dl>
+            <div class="yii-debug-user-row">
+            <dt>
+            Created At
+            </dt><dd>
+            <span class="yii-debug-user-time" title="1640000000"><span class="yii-debug-user-time-rel">Dec 20, 2021 · 11:33</span><span class="yii-debug-user-time-abs">Dec 20, 2021 · 11:33</span></span>
+            </dd>
+            </div>
+            </dl>
+            </article>
+            </section>
+            HTML,
             $html,
             'End-to-end view must surface the user-name heading.',
         );
-        self::assertStringContainsString(
-            'admin',
-            $html,
-            'End-to-end username must reach the rendered DOM.'
-        );
-        self::assertStringContainsString(
-            'yii-debug-user-status-success',
-            $html,
-            'End-to-end status variant must reach the DOM.'
-        );
-        self::assertStringContainsString(
-            'data-yii-debug-reveal',
-            $html,
-            'End-to-end auth_key must trigger the security reveal button.'
-        );
-        self::assertStringContainsString(
-            'yii-debug-user-time',
-            $html,
-            'End-to-end created_at must trigger the timestamp formatter.'
-        );
     }
 
     private function emptyHero(): UserIdentityHero
diff --git a/tests/Panel/User/UserRbacRowTest.php b/tests/Panel/User/UserRbacRowTest.php
index 4904d44..d2a8679 100644
--- a/tests/Panel/User/UserRbacRowTest.php
+++ b/tests/Panel/User/UserRbacRowTest.php
@@ -27,12 +27,36 @@ public function testConstructorExposesAllPropertiesVerbatim(): void
             updatedAt: 1_700_000_001,
         );
 
-        self::assertSame('admin', $row->name, 'Name must be exposed verbatim.');
-        self::assertSame('Administrator', $row->description, 'Description must be exposed verbatim.');
-        self::assertSame('isAdmin', $row->ruleName, 'Rule name must be exposed verbatim.');
-        self::assertSame('{"scope":"all"}', $row->data, 'Data must be exposed verbatim.');
-        self::assertSame(1_700_000_000, $row->createdAt, 'Created-at timestamp must be exposed verbatim.');
-        self::assertSame(1_700_000_001, $row->updatedAt, 'Updated-at timestamp must be exposed verbatim.');
+        self::assertSame(
+            'admin',
+            $row->name,
+            'Name must be exposed verbatim.',
+        );
+        self::assertSame(
+            'Administrator',
+            $row->description,
+            'Description must be exposed verbatim.',
+        );
+        self::assertSame(
+            'isAdmin',
+            $row->ruleName,
+            'Rule name must be exposed verbatim.',
+        );
+        self::assertSame(
+            '{"scope":"all"}',
+            $row->data,
+            'Data must be exposed verbatim.',
+        );
+        self::assertSame(
+            1_700_000_000,
+            $row->createdAt,
+            'Created-at timestamp must be exposed verbatim.',
+        );
+        self::assertSame(
+            1_700_000_001,
+            $row->updatedAt,
+            'Updated-at timestamp must be exposed verbatim.',
+        );
     }
 
     public function testFromArrayCastsNumericStringTimestampsToInt(): void
@@ -45,8 +69,16 @@ public function testFromArrayCastsNumericStringTimestampsToInt(): void
             ],
         );
 
-        self::assertSame(1_700_000_000, $row->createdAt, 'Numeric string must be cast to `int`.');
-        self::assertSame(1_700_000_001, $row->updatedAt, 'Numeric string must be cast to `int`.');
+        self::assertSame(
+            1_700_000_000,
+            $row->createdAt,
+            'Numeric string must be cast to `int`.',
+        );
+        self::assertSame(
+            1_700_000_001,
+            $row->updatedAt,
+            'Numeric string must be cast to `int`.',
+        );
     }
 
     public function testFromArrayCoercesNonStringTextualFieldsToEmptyStrings(): void
@@ -62,22 +94,60 @@ public function testFromArrayCoercesNonStringTextualFieldsToEmptyStrings(): void
             ],
         );
 
-        self::assertSame('', $row->name, 'Non-string name must collapse to an empty `string`.');
-        self::assertSame('', $row->description, 'Non-string description must collapse to an empty `string`.');
-        self::assertSame('', $row->ruleName, 'Non-string rule name must collapse to an empty `string`.');
-        self::assertSame('', $row->data, 'Non-string data must collapse to an empty `string`.');
+        self::assertSame(
+            '',
+            $row->name,
+            'Non-string name must collapse to an empty `string`.',
+        );
+        self::assertSame(
+            '',
+            $row->description,
+            'Non-string description must collapse to an empty `string`.',
+        );
+        self::assertSame(
+            '',
+            $row->ruleName,
+            'Non-string rule name must collapse to an empty `string`.',
+        );
+        self::assertSame(
+            '',
+            $row->data,
+            'Non-string data must collapse to an empty `string`.',
+        );
     }
 
     public function testFromArrayDefaultsMissingKeysToEmptyStringsAndNullTimestamps(): void
     {
         $row = UserRbacRow::fromArray([]);
 
-        self::assertSame('', $row->name, 'Missing name must default to an empty `string`.');
-        self::assertSame('', $row->description, 'Missing description must default to an empty `string`.');
-        self::assertSame('', $row->ruleName, 'Missing rule name must default to an empty `string`.');
-        self::assertSame('', $row->data, 'Missing data must default to an empty `string`.');
-        self::assertNull($row->createdAt, 'Missing created-at must default to `null`.');
-        self::assertNull($row->updatedAt, 'Missing updated-at must default to `null`.');
+        self::assertSame(
+            '',
+            $row->name,
+            'Missing name must default to an empty `string`.',
+        );
+        self::assertSame(
+            '',
+            $row->description,
+            'Missing description must default to an empty `string`.',
+        );
+        self::assertSame(
+            '',
+            $row->ruleName,
+            'Missing rule name must default to an empty `string`.',
+        );
+        self::assertSame(
+            '',
+            $row->data,
+            'Missing data must default to an empty `string`.',
+        );
+        self::assertNull(
+            $row->createdAt,
+            'Missing created-at must default to `null`.',
+        );
+        self::assertNull(
+            $row->updatedAt,
+            'Missing updated-at must default to `null`.',
+        );
     }
 
     public function testFromArrayHydratesAllFieldsFromCompleteRow(): void
@@ -93,12 +163,36 @@ public function testFromArrayHydratesAllFieldsFromCompleteRow(): void
             ],
         );
 
-        self::assertSame('admin', $row->name, 'Name must be hydrated.');
-        self::assertSame('Administrator', $row->description, 'Description must be hydrated.');
-        self::assertSame('isAdmin', $row->ruleName, 'Rule name must be hydrated.');
-        self::assertSame('{"scope":"all"}', $row->data, 'Data must be hydrated.');
-        self::assertSame(1_700_000_000, $row->createdAt, 'Integer created-at must pass through unchanged.');
-        self::assertSame(1_700_000_001, $row->updatedAt, 'Integer updated-at must pass through unchanged.');
+        self::assertSame(
+            'admin',
+            $row->name,
+            'Name must be hydrated.',
+        );
+        self::assertSame(
+            'Administrator',
+            $row->description,
+            'Description must be hydrated.',
+        );
+        self::assertSame(
+            'isAdmin',
+            $row->ruleName,
+            'Rule name must be hydrated.',
+        );
+        self::assertSame(
+            '{"scope":"all"}',
+            $row->data,
+            'Data must be hydrated.',
+        );
+        self::assertSame(
+            1_700_000_000,
+            $row->createdAt,
+            'Integer created-at must pass through unchanged.',
+        );
+        self::assertSame(
+            1_700_000_001,
+            $row->updatedAt,
+            'Integer updated-at must pass through unchanged.',
+        );
     }
 
     public function testFromArrayRejectsNonNumericTimestamps(): void
@@ -110,8 +204,14 @@ public function testFromArrayRejectsNonNumericTimestamps(): void
             ],
         );
 
-        self::assertNull($row->createdAt, 'Non-numeric created-at must collapse to `null`.');
-        self::assertNull($row->updatedAt, 'Non-numeric updated-at must collapse to `null`.');
+        self::assertNull(
+            $row->createdAt,
+            "Non-numeric created-at must collapse to 'null'.",
+        );
+        self::assertNull(
+            $row->updatedAt,
+            "Non-numeric updated-at must collapse to 'null'.",
+        );
     }
 
     public function testFromArrayTruncatesFloatTimestampsToInt(): void
@@ -123,7 +223,15 @@ public function testFromArrayTruncatesFloatTimestampsToInt(): void
             ],
         );
 
-        self::assertSame(1_700_000_000, $row->createdAt, 'Float created-at must be truncated to `int`.');
-        self::assertSame(1_700_000_001, $row->updatedAt, 'Float updated-at must be truncated to `int`.');
+        self::assertSame(
+            1_700_000_000,
+            $row->createdAt,
+            "Float created-at must be truncated to 'int'.",
+        );
+        self::assertSame(
+            1_700_000_001,
+            $row->updatedAt,
+            "Float updated-at must be truncated to 'int'.",
+        );
     }
 }
diff --git a/tests/PhpInfo/PhpInfoDataNormalizerTest.php b/tests/PhpInfo/PhpInfoDataNormalizerTest.php
index 3d28d06..bf2e3f0 100644
--- a/tests/PhpInfo/PhpInfoDataNormalizerTest.php
+++ b/tests/PhpInfo/PhpInfoDataNormalizerTest.php
@@ -21,8 +21,6 @@
  * tile-kind classification (pill / path / token list) and the wrapping of module blocks into deep-linkable sections.
  *
  * {@see PhpInfoDataNormalizerProvider} for test case data providers.
- *
- * @since 0.1
  */
 #[Group('phpinfo')]
 final class PhpInfoDataNormalizerTest extends TestCase
@@ -91,7 +89,10 @@ public function testCaptureBuildsViewFromBufferedPhpInfoOutput(): void
 
         $osTile = $this->findTileByLabel($view, 'OS');
 
-        self::assertNotNull($osTile, 'Capture must surface the runtime OS tile.');
+        self::assertNotNull(
+            $osTile,
+            'Capture must surface the runtime OS tile.',
+        );
         self::assertSame(
             php_uname('s') . ' ' . php_uname('r'),
             $osTile->displayValue,
@@ -178,7 +179,7 @@ public function testFromOutputBuildsHeroSectionWithVersionHeadline(): void
 
     public function testFromOutputClassifiesAndEnhancesModuleTables(): void
     {
-        $body = <<<'HTML'
+        $body = <<<HTML
         <h2>curl</h2>
         <table>
         <tr><td class="e">cURL support</td><td class="v">enabled</td></tr>
@@ -193,36 +194,22 @@ public function testFromOutputClassifiesAndEnhancesModuleTables(): void
 
         $view = PhpInfoDataNormalizer::fromOutput($body, 'x', 'cli', 'Linux', '');
 
-        self::assertStringContainsString(
-            'yii-debug-phpinfo-table-section is-facts',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-curl" data-section="curl"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-curl-heading">curl</h2></header>
+            <div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-facts"><header class="yii-debug-phpinfo-table-section-head"><span>Module information</span><span class="yii-debug-phpinfo-table-section-count">2 values</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Module information" class="yii-debug-table is-facts">
+            <tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">cURL support</th><td class="v"><span class="yii-debug-phpinfo-status-pill" data-variant="success">enabled</span></td></tr>
+            <tr class="yii-debug-phpinfo-fact-subheading"><th colspan="2">Features</th></tr>
+            <tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">HTTP2</th><td class="v"><span class="yii-debug-phpinfo-status-pill" data-variant="success">Yes</span></td></tr>
+            </table></div></div>
+            <div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-directives"><header class="yii-debug-phpinfo-table-section-head"><span>Configuration directives</span><span class="yii-debug-phpinfo-table-section-count">1 directive</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Configuration directives" class="yii-debug-table is-directives">
+            <tr class="h"><th>Directive</th><th>Local Value</th><th>Master Value</th></tr>
+            <tr><th scope="row" class="e">curl.cainfo</th><td class="v"><i>no value</i></td><td class="v"><i>no value</i></td></tr>
+            </table></div></div></section>
+            HTML,
             $view->modulesHtml,
             'Two-column module metadata must use the compact facts presentation.',
         );
-        self::assertStringContainsString(
-            '<span>Module information</span><span class="yii-debug-phpinfo-table-section-count">2 values</span>',
-            $view->modulesHtml,
-            'Facts must expose a descriptive heading and exclude subsection rows from the value count.',
-        );
-        self::assertStringContainsString(
-            'class="yii-debug-phpinfo-status-pill" data-variant="success">enabled</span>',
-            $view->modulesHtml,
-            'Enabled module capabilities must render as success pills.',
-        );
-        self::assertStringContainsString(
-            '<tr class="yii-debug-phpinfo-fact-subheading"><th colspan="2">Features</th></tr>',
-            $view->modulesHtml,
-            'Single-cell labels inside fact tables must become full-width subsection headings.',
-        );
-        self::assertStringContainsString(
-            'yii-debug-phpinfo-table-section is-directives',
-            $view->modulesHtml,
-            'Local/master configuration tables must retain a dense directives presentation.',
-        );
-        self::assertStringContainsString(
-            '<span>Configuration directives</span><span class="yii-debug-phpinfo-table-section-count">1 directive</span>',
-            $view->modulesHtml,
-            'Directive tables must surface an accurate directive count.',
-        );
     }
 
     public function testFromOutputClassifiesDisabledAsMutedPill(): void
@@ -423,7 +410,7 @@ public function testFromOutputCompactsExactlyThreeTrimmedTokens(): void
 
     public function testFromOutputDoesNotRedactOrdinaryModuleDirectives(): void
     {
-        $body = <<<'HTML'
+        $body = <<<HTML
         <h2>session</h2>
         <table>
         <tr class="h"><th>Directive</th><th>Local Value</th><th>Master Value</th></tr>
@@ -433,21 +420,23 @@ public function testFromOutputDoesNotRedactOrdinaryModuleDirectives(): void
 
         $view = PhpInfoDataNormalizer::fromOutput($body, 'x', 'cli', 'Linux', '');
 
-        self::assertStringNotContainsString(
-            'yii-debug-phpinfo-redacted',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-session" data-section="session"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-session-heading">session</h2></header>
+            <div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-directives"><header class="yii-debug-phpinfo-table-section-head"><span>Configuration directives</span><span class="yii-debug-phpinfo-table-section-count">1 directive</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Configuration directives" class="yii-debug-table is-directives">
+            <tr class="h"><th>Directive</th><th>Local Value</th><th>Master Value</th></tr>
+            <tr><th scope="row" class="e">session.cookie_path</th><td class="v">/</td><td class="v">/</td></tr>
+            </table></div></div></section>
+            HTML,
             $view->modulesHtml,
             'Sensitive-name detection must not hide ordinary lowercase PHP directives.',
         );
-        self::assertStringContainsString(
-            '<td class="v">/</td><td class="v">/</td>',
-            $view->modulesHtml,
-            'Ordinary directive values must remain intact.',
-        );
+
     }
 
     public function testFromOutputDoesNotRedactTokenizerSupport(): void
     {
-        $body = <<<'HTML'
+        $body = <<<HTML
         <h2>tokenizer</h2>
         <table><tr><td class="e">Tokenizer Support</td><td class="v">enabled</td></tr></table>
         HTML;
@@ -556,8 +545,11 @@ public function testFromOutputGroupsPhpVariablesBySource(): void
             substr_count($view->modulesHtml, 'data-yii-debug-phpinfo-default-open="true"'),
             'Only the first populated variable group must be expanded initially.',
         );
-        self::assertStringContainsString(
-            '<details class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-data yii-debug-phpinfo-variable-group" data-yii-debug-phpinfo-collapsible="true" data-yii-debug-phpinfo-default-open="true" open><summary',
+        self::assertSame(
+            <<<'HTML'
+            <section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-php-variables" data-section="PHP Variables"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-php-variables-heading">PHP Variables</h2></header>
+            <details class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-data yii-debug-phpinfo-variable-group" data-yii-debug-phpinfo-collapsible="true" data-yii-debug-phpinfo-default-open="true" open><summary class="yii-debug-phpinfo-table-section-head"><span>Request</span><span class="yii-debug-phpinfo-table-section-count">1 row</span></summary><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Request" class="yii-debug-table is-data"><tr class="H"><th>Variable</th><th>Value</th></tr><tr><th scope="row" class="e">$_REQUEST['page']</th><td class="v">1</td></tr></table></div></details><details class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-data yii-debug-phpinfo-variable-group" data-yii-debug-phpinfo-collapsible="true" data-yii-debug-phpinfo-default-open="false"><summary class="yii-debug-phpinfo-table-section-head"><span>Cookies</span><span class="yii-debug-phpinfo-table-section-count">1 row</span></summary><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Cookies" class="yii-debug-table is-data"><tr class="H"><th>Variable</th><th>Value</th></tr><tr><th scope="row" class="e">$_COOKIE['theme']</th><td  class="v"><span class="yii-debug-phpinfo-redacted" aria-label="Sensitive value hidden">redacted</span></td></tr></table></div></details><details class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-data yii-debug-phpinfo-variable-group" data-yii-debug-phpinfo-collapsible="true" data-yii-debug-phpinfo-default-open="false"><summary class="yii-debug-phpinfo-table-section-head"><span>Server</span><span class="yii-debug-phpinfo-table-section-count">1 row</span></summary><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Server" class="yii-debug-table is-data"><tr class="H"><th>Variable</th><th>Value</th></tr><tr><th scope="row" class="e">$_SERVER['REQUEST_METHOD']</th><td class="v">GET</td></tr></table></div></details><details class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-data yii-debug-phpinfo-variable-group" data-yii-debug-phpinfo-collapsible="true" data-yii-debug-phpinfo-default-open="false"><summary class="yii-debug-phpinfo-table-section-head"><span>Environment</span><span class="yii-debug-phpinfo-table-section-count">1 row</span></summary><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Environment" class="yii-debug-table is-data"><tr class="H"><th>Variable</th><th>Value</th></tr><tr><th scope="row" class="e">APP_ENV</th><td class="v">dev</td></tr></table></div></details></section>
+            HTML,
             $view->modulesHtml,
             'The first variable group must use an open details disclosure.',
         );
@@ -576,7 +568,7 @@ public function testFromOutputGroupsPhpVariablesBySource(): void
     public function testFromOutputIgnoresColspanSubheadingsWhenSummarizingAModule(): void
     {
         // `php_info_print_table_colspan_header()` emits a single-cell row inside an otherwise two-column facts table.
-        $body = <<<'HTML'
+        $body = <<<HTML
         <h2>ftp</h2>
         <table>
         <tr><td class="e">FTP support</td><td class="v">enabled</td></tr>
@@ -629,7 +621,7 @@ public function testFromOutputKeepsAbsolutePathVerbatimWhenHomeNotResolved(): vo
 
     public function testFromOutputKeepsLongValueListsInStandaloneModules(): void
     {
-        $body = <<<'HTML'
+        $body = <<<HTML
         <h2>PDO</h2>
         <table>
         <tr><td class="e">PDO support</td><td class="v">enabled</td></tr>
@@ -644,8 +636,14 @@ public function testFromOutputKeepsLongValueListsInStandaloneModules(): void
             $view->compactModules,
             'Capability lists must not be compressed into a small card.',
         );
-        self::assertStringContainsString(
-            'id="phpinfo-pdo"',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-pdo" data-section="PDO"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-pdo-heading">PDO</h2></header>
+            <div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-facts"><header class="yii-debug-phpinfo-table-section-head"><span>Module information</span><span class="yii-debug-phpinfo-table-section-count">2 values</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Module information" class="yii-debug-table is-facts">
+            <tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">PDO support</th><td class="v"><span class="yii-debug-phpinfo-status-pill" data-variant="success">enabled</span></td></tr>
+            <tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">PDO drivers</th><td class="v">mysql, pgsql, sqlite, oci, sqlsrv</td></tr>
+            </table></div></div></section>
+            HTML,
             $view->modulesHtml,
             'PDO driver information must retain its own panel.',
         );
@@ -662,8 +660,10 @@ public function testFromOutputKeepsModuleStandaloneWhenAFactValueIsEmpty(): void
             $view->compactModules,
             'A blank value must block the Overview summary.',
         );
-        self::assertStringContainsString(
-            'id="phpinfo-example"',
+        self::assertSame(
+            <<<'HTML'
+        <section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-example" data-section="example"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-example-heading">example</h2></header><div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-facts"><header class="yii-debug-phpinfo-table-section-head"><span>Module information</span><span class="yii-debug-phpinfo-table-section-count">1 value</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Module information" class="yii-debug-table is-facts"><tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">Statistics</th><td class="v"></td></tr></table></div></div></section>
+        HTML,
             $view->modulesHtml,
             'The module must keep its own section instead.',
         );
@@ -671,7 +671,7 @@ public function testFromOutputKeepsModuleStandaloneWhenAFactValueIsEmpty(): void
 
     public function testFromOutputKeepsOverviewBoundariesAndDropsEmptySections(): void
     {
-        $body = <<<'HTML'
+        $body = <<<HTML
         <tr><td> Build Date </td><td> overview build </td></tr>
         <h2>example</h2>
         <table>
@@ -697,7 +697,7 @@ public function testFromOutputKeepsOverviewBoundariesAndDropsEmptySections(): vo
 
     public function testFromOutputKeepsOverviewHeadingOutOfModuleParsing(): void
     {
-        $body = <<<'HTML'
+        $body = <<<HTML
         <h1>Overview</h1>
         <table>
         <tr><td>Build Date</td><td>overview build</td></tr>
@@ -721,8 +721,16 @@ public function testFromOutputKeepsOverviewHeadingOutOfModuleParsing(): void
             array_map(static fn(PhpInfoTocEntry $entry): string => $entry->title, $view->tocEntries),
             'The overview heading must not create a duplicate module navigation entry.',
         );
-        self::assertStringNotContainsString(
-            'id="phpinfo-overview"',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-example" data-section="example"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-example-heading">example</h2></header>
+            <div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-facts"><header class="yii-debug-phpinfo-table-section-head"><span>Module information</span><span class="yii-debug-phpinfo-table-section-count">4 values</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Module information" class="yii-debug-table is-facts">
+            <tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">First</th><td class="v">one</td></tr>
+            <tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">Second</th><td class="v">two</td></tr>
+            <tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">Third</th><td class="v">three</td></tr>
+            <tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">Fourth</th><td class="v">four</td></tr>
+            </table></div></div></section>
+            HTML,
             $view->modulesHtml,
             'The overview prefix must not be rendered again as a detailed module.',
         );
@@ -746,10 +754,16 @@ public function testFromOutputLabelsDataTablesByTheirLeadingHeader(string $heade
 
         $view = PhpInfoDataNormalizer::fromOutput($body, 'x', 'cli', 'Linux', '');
 
-        self::assertStringContainsString(
-            "<span>{$expectedLabel}</span>",
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-example" data-section="example"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-example-heading">example</h2></header>
+            <div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-data"><header class="yii-debug-phpinfo-table-section-head"><span>{$expectedLabel}</span><span class="yii-debug-phpinfo-table-section-count">1 row</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="{$expectedLabel}" class="yii-debug-table is-data">
+            <tr class="h">{$headers}</tr>
+            <tr><th scope="row" class="e">first</th><td class="v">second</td></tr>
+            </table></div></div></section>
+            HTML,
             $view->modulesHtml,
-            'Head bar must name the data table.',
+            'Data tables must render the exact labeled module markup.',
         );
     }
 
@@ -759,8 +773,10 @@ public function testFromOutputLabelsGenericSingleColumnTablesAsNotes(): void
 
         $view = PhpInfoDataNormalizer::fromOutput($body, 'x', 'cli', 'Linux', '');
 
-        self::assertStringContainsString(
-            '<span>Notes</span><span class="yii-debug-phpinfo-table-section-count">1 note</span>',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-example" data-section="example"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-example-heading">example</h2></header><div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-note"><header class="yii-debug-phpinfo-table-section-head"><span>Notes</span><span class="yii-debug-phpinfo-table-section-count">1 note</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Notes" class="yii-debug-table is-note"><tr><td>License text</td></tr></table></div></div></section>
+            HTML,
             $view->modulesHtml,
             'A single-column table without a native caption must use the Notes label.',
         );
@@ -769,8 +785,10 @@ public function testFromOutputLabelsGenericSingleColumnTablesAsNotes(): void
     public function testFromOutputLeavesConfigureCommandUntouchedWithoutHome(): void
     {
         unset($_SERVER['HOME'], $_SERVER['USERPROFILE']);
+
         putenv('HOME');
         putenv('USERPROFILE');
+
         MockerState::addCondition('PHPForge\Debug\PhpInfo', 'function_exists', [], false, true);
 
         $view = PhpInfoDataNormalizer::fromOutput(
@@ -791,6 +809,7 @@ public function testFromOutputLeavesConfigureCommandUntouchedWithoutHome(): void
     public function testFromOutputMarksLongFactValuesAsWide(): void
     {
         $long = str_repeat('a', 73);
+
         // A fourth fact keeps the module out of the Overview summary, so the rows reach the fact-row normalizer.
         $body = <<<HTML
         <h2>example</h2>
@@ -804,22 +823,27 @@ public function testFromOutputMarksLongFactValuesAsWide(): void
 
         $view = PhpInfoDataNormalizer::fromOutput($body, 'x', 'cli', 'Linux', '');
 
-        self::assertStringContainsString(
-            'class="yii-debug-phpinfo-fact yii-debug-phpinfo-fact-wide"',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-example" data-section="example"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-example-heading">example</h2></header>
+            <div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-facts"><header class="yii-debug-phpinfo-table-section-head"><span>Module information</span><span class="yii-debug-phpinfo-table-section-count">4 values</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Module information" class="yii-debug-table is-facts">
+            <tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">Short</th><td class="v">brief</td></tr>
+            <tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">Another</th><td class="v">value</td></tr>
+            <tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">Third</th><td class="v">value</td></tr>
+            <tr class="yii-debug-phpinfo-fact yii-debug-phpinfo-fact-wide"><th scope="row" class="e">Long</th><td class="v">aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</td></tr>
+            </table></div></div></section>
+            HTML,
             $view->modulesHtml,
             'Values beyond 72 characters must claim the full row.',
         );
-        self::assertStringContainsString(
-            '<tr class="yii-debug-phpinfo-fact">',
-            $view->modulesHtml,
-            'Short values must keep the compact row.',
-        );
+
     }
 
     public function testFromOutputNormalizesFactRowWhitespaceAttributesAndUnicodeWidth(): void
     {
         $unicodeValue = str_repeat('é', 40);
         $boundaryValue = str_repeat('a', 72);
+
         $body = <<<HTML
         <h2>example</h2>
         <table>
@@ -834,41 +858,32 @@ public function testFromOutputNormalizesFactRowWhitespaceAttributesAndUnicodeWid
 
         $view = PhpInfoDataNormalizer::fromOutput($body, 'x', 'cli', 'Linux', '');
 
-        self::assertStringContainsString(
-            '<tr data-source="fixture" class="yii-debug-phpinfo-fact-subheading"><th colspan="2"><strong>Heading</strong></th></tr>',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-example" data-section="example"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-example-heading">example</h2></header>
+            <div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-facts"><header class="yii-debug-phpinfo-table-section-head"><span>Module information</span><span class="yii-debug-phpinfo-table-section-count">5 values</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Module information" class="yii-debug-table is-facts">
+            <tr data-source="fixture" class="yii-debug-phpinfo-fact-subheading"><th colspan="2"><strong>Heading</strong></th></tr>
+            <tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">First</th><td class="v">one</td></tr>
+            <tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">Second</th><td class="other">enabled</td></tr>
+            <tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">Status</th><td class="V"><span class="yii-debug-phpinfo-status-pill" data-variant="success">ENABLED</span></td></tr>
+            <tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">Unicode</th><td class="v">éééééééééééééééééééééééééééééééééééééééé</td></tr>
+            <tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">Boundary</th><td class="v">aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</td></tr>
+            </table></div></div></section>
+            HTML,
             $view->modulesHtml,
             'Fact subheadings must trim content and normalize row attributes without extra whitespace.',
         );
-        self::assertStringNotContainsString(
-            'yii-debug-phpinfo-fact-wide',
-            $view->modulesHtml,
-            'Unicode values and values of exactly 72 characters must remain compact facts.',
-        );
+
         self::assertSame(
             1,
             substr_count($view->modulesHtml, 'yii-debug-phpinfo-status-pill'),
             'Only class-v status cells may become status pills.',
         );
-        self::assertStringContainsString(
-            'data-variant="success">ENABLED</span>',
-            $view->modulesHtml,
-            'Status matching must ignore case and trim visible pill content.',
-        );
-        self::assertStringContainsString(
-            '<td class="other">enabled</td>',
-            $view->modulesHtml,
-            'Non-status table cells must round-trip unchanged.',
-        );
-        self::assertStringContainsString(
-            '<div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-facts"><header',
-            $view->modulesHtml,
-            'Ordinary module tables must use non-collapsible div and header chrome.',
-        );
     }
 
     public function testFromOutputOmitsModulesWithoutContentRows(): void
     {
-        $body = <<<'HTML'
+        $body = <<<HTML
         <h2>Additional Modules</h2>
         <table><tr class="h"><th>Module Name</th></tr></table>
         <h2>Core</h2>
@@ -886,8 +901,15 @@ public function testFromOutputOmitsModulesWithoutContentRows(): void
             array_map(static fn(PhpInfoTocEntry $entry): string => $entry->title, $view->tocEntries),
             'A title-only phpinfo table must not create an empty navigation destination.',
         );
-        self::assertStringNotContainsString(
-            'phpinfo-additional-modules',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-core" data-section="Core"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-core-heading">Core</h2></header>
+            <div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-facts"><header class="yii-debug-phpinfo-table-section-head"><span>Module information</span><span class="yii-debug-phpinfo-table-section-count">3 values</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Module information" class="yii-debug-table is-facts">
+            <tr class="yii-debug-phpinfo-fact"><td>Version</td><td>8.5</td></tr>
+            <tr class="yii-debug-phpinfo-fact"><td>Debug</td><td>disabled</td></tr>
+            <tr class="yii-debug-phpinfo-fact"><td>Thread Safety</td><td>disabled</td></tr>
+            </table></div></div></section>
+            HTML,
             $view->modulesHtml,
             'Empty modules must be omitted from the rendered content.',
         );
@@ -899,7 +921,11 @@ public function testFromOutputOmitsWhitespaceOnlyModuleTables(): void
 
         $view = PhpInfoDataNormalizer::fromOutput($body, 'x', 'cli', 'Linux', '');
 
-        self::assertSame('', $view->modulesHtml, 'Whitespace-only table cells must not create an empty module.');
+        self::assertSame(
+            '',
+            $view->modulesHtml,
+            'Whitespace-only table cells must not create an empty module.',
+        );
         self::assertSame(
             ['Overview'],
             array_map(static fn(PhpInfoTocEntry $entry): string => $entry->title, $view->tocEntries),
@@ -909,7 +935,7 @@ public function testFromOutputOmitsWhitespaceOnlyModuleTables(): void
 
     public function testFromOutputPreservesRedactedRowAttributes(): void
     {
-        $body = <<<'HTML'
+        $body = <<<HTML
         <h2>Environment</h2>
         <table><tr data-source="fixture"><td class="e">DB_PASSWORD</td><td class="v">secret</td></tr></table>
         HTML;
@@ -925,7 +951,7 @@ public function testFromOutputPreservesRedactedRowAttributes(): void
 
     public function testFromOutputProducesTocEntryPerDetailedModuleH2(): void
     {
-        $body = <<<'HTML'
+        $body = <<<HTML
         <h2>apcu</h2>
         <table><tr><td>Version</td><td>5.1.0</td></tr></table>
         <table>
@@ -967,7 +993,7 @@ public function testFromOutputProducesTocEntryPerDetailedModuleH2(): void
 
     public function testFromOutputProducesUniqueSlugsForTocEntries(): void
     {
-        $body = <<<'HTML'
+        $body = <<<HTML
         <h2>apcu</h2>
         <table>
         <tr><td>Version</td><td>5.1</td></tr>
@@ -1036,7 +1062,7 @@ public function testFromOutputQuotesHomePathAndTrimsModuleSlug(): void
 
     public function testFromOutputReadsMultilineCaseInsensitiveHeadersAndCountsOnlyDataRows(): void
     {
-        $body = <<<'HTML'
+        $body = <<<HTML
         <h2>example</h2>
         <table>
         <tr class="H">
@@ -1049,8 +1075,13 @@ public function testFromOutputReadsMultilineCaseInsensitiveHeadersAndCountsOnlyD
 
         $view = PhpInfoDataNormalizer::fromOutput($body, 'x', 'cli', 'Linux', '');
 
-        self::assertStringContainsString(
-            '<span>Other</span><span class="yii-debug-phpinfo-table-section-count">2 rows</span>',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-example" data-section="example"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-example-heading">example</h2></header>
+            <details class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-data yii-debug-phpinfo-variable-group" data-yii-debug-phpinfo-collapsible="true" data-yii-debug-phpinfo-default-open="true" open><summary class="yii-debug-phpinfo-table-section-head"><span>Other</span><span class="yii-debug-phpinfo-table-section-count">2 rows</span></summary><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Other" class="yii-debug-table is-data"><tr class="H">
+            <th>Variable</th><th>Value</th>
+            </tr><tr><th scope="row" class="e"><span class="h">first</span></th><td class="v">one</td></tr><tr><th scope="row" class="e">second</th><td class="v">two</td></tr></table></div></details></section>
+            HTML,
             $view->modulesHtml,
             'Multiline uppercase variable headers must enable grouping and stay out of the data count.',
         );
@@ -1076,61 +1107,19 @@ public function testFromOutputRedactsSensitiveEnvironmentAndRuntimeVariables():
 
         $view = PhpInfoDataNormalizer::fromOutput($body, 'x', 'cli', 'Linux', '');
 
-        self::assertStringNotContainsString(
-            'sensitive-cookie-value',
+        self::assertSame(
+            <<<'HTML'
+            <section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-php-variables" data-section="PHP Variables"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-php-variables-heading">PHP Variables</h2></header>
+            <details class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-data yii-debug-phpinfo-variable-group" data-yii-debug-phpinfo-collapsible="true" data-yii-debug-phpinfo-default-open="true" open><summary class="yii-debug-phpinfo-table-section-head"><span>Cookies</span><span class="yii-debug-phpinfo-table-section-count">1 row</span></summary><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Cookies" class="yii-debug-table is-data"><tr class="h"><th>Variable</th><th>Value</th></tr><tr><th scope="row" class="e">$_COOKIE['XSRF-TOKEN']</th><td  class="v"><span class="yii-debug-phpinfo-redacted" aria-label="Sensitive value hidden">redacted</span></td></tr></table></div></details><details class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-data yii-debug-phpinfo-variable-group" data-yii-debug-phpinfo-collapsible="true" data-yii-debug-phpinfo-default-open="false"><summary class="yii-debug-phpinfo-table-section-head"><span>Server</span><span class="yii-debug-phpinfo-table-section-count">1 row</span></summary><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Server" class="yii-debug-table is-data"><tr class="h"><th>Variable</th><th>Value</th></tr><tr><th scope="row" class="e">$_SERVER['PHP_AUTH_PW']</th><td  class="v"><span class="yii-debug-phpinfo-redacted" aria-label="Sensitive value hidden">redacted</span></td></tr></table></div></details><details class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-data yii-debug-phpinfo-variable-group" data-yii-debug-phpinfo-collapsible="true" data-yii-debug-phpinfo-default-open="false"><summary class="yii-debug-phpinfo-table-section-head"><span>Environment</span><span class="yii-debug-phpinfo-table-section-count">6 rows</span></summary><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Environment" class="yii-debug-table is-data"><tr class="h"><th>Variable</th><th>Value</th></tr><tr><th scope="row" class="e">APP_KEY</th><td  class="v"><span class="yii-debug-phpinfo-redacted" aria-label="Sensitive value hidden">redacted</span></td></tr><tr><th scope="row" class="e">WEBHOOK_SIGNATURE</th><td  class="v"><span class="yii-debug-phpinfo-redacted" aria-label="Sensitive value hidden">redacted</span></td></tr><tr><th scope="row" class="e">PWD</th><td class="v">/srv/app</td></tr><tr><th scope="row" class="e">OLDPWD</th><td class="v">/srv</td></tr><tr><th scope="row" class="e">CHPWD_STATUS</th><td class="v">unchanged</td></tr><tr><th scope="row" class="e">APP_NAME</th><td class="v">Yii application</td></tr></table></div></details><details class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-data yii-debug-phpinfo-variable-group" data-yii-debug-phpinfo-collapsible="true" data-yii-debug-phpinfo-default-open="false"><summary class="yii-debug-phpinfo-table-section-head"><span>Other</span><span class="yii-debug-phpinfo-table-section-count">1 row</span></summary><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Other" class="yii-debug-table is-data"><tr class="h"><th>Variable</th><th>Value</th></tr><tr><th scope="row" class="e">database_url</th><td  class="v"><span class="yii-debug-phpinfo-redacted" aria-label="Sensitive value hidden">redacted</span></td></tr></table></div></details></section>
+            HTML,
             $view->modulesHtml,
             'Cookie values must never reach the rendered phpinfo HTML.',
         );
-        self::assertStringNotContainsString(
-            'sensitive-app-key',
-            $view->modulesHtml,
-            'Credential-like environment values must never reach the rendered phpinfo HTML.',
-        );
-        self::assertStringNotContainsString(
-            'sensitive-basic-auth-value',
-            $view->modulesHtml,
-            'PHP basic-auth credentials must never reach the rendered phpinfo HTML.',
-        );
-        self::assertStringNotContainsString(
-            'sensitive-signature-value',
-            $view->modulesHtml,
-            'Signature values must never reach the rendered phpinfo HTML.',
-        );
-        self::assertStringNotContainsString(
-            'sensitive-database-url',
-            $view->modulesHtml,
-            'Lowercase credential-like variable values must never reach the rendered phpinfo HTML.',
-        );
-        self::assertStringContainsString(
-            'aria-label="Sensitive value hidden">redacted</span>',
-            $view->modulesHtml,
-            'Redacted variables must expose an accessible non-secret placeholder.',
-        );
-        self::assertStringContainsString(
-            '>Yii application</td>',
-            $view->modulesHtml,
-            'Ordinary environment values must remain available.',
-        );
-        self::assertStringContainsString(
-            '>/srv/app</td>',
-            $view->modulesHtml,
-            'The PWD working-directory variable must not be mistaken for a password.',
-        );
-        self::assertStringContainsString(
-            '>/srv</td>',
-            $view->modulesHtml,
-            'The OLDPWD working-directory variable must remain visible.',
-        );
-        self::assertStringContainsString(
-            '>unchanged</td>',
-            $view->modulesHtml,
-            'Environment names containing CHPWD must not be treated as credentials.',
-        );
     }
 
     public function testFromOutputRedactsSensitiveVariablesWhenTableHasNoVariableHeader(): void
     {
-        $body = <<<'HTML'
+        $body = <<<HTML
         <h2>Environment</h2>
         <table>
         <tr><td class="e">DB_PASSWORD</td><td class="v">sensitive-database-password</td></tr>
@@ -1140,30 +1129,38 @@ public function testFromOutputRedactsSensitiveVariablesWhenTableHasNoVariableHea
 
         $view = PhpInfoDataNormalizer::fromOutput($body, 'x', 'cli', 'Linux', '');
 
-        self::assertStringNotContainsString(
-            'sensitive-database-password',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-environment" data-section="Environment"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-environment-heading">Environment</h2></header>
+            <div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-facts"><header class="yii-debug-phpinfo-table-section-head"><span>Module information</span><span class="yii-debug-phpinfo-table-section-count">2 values</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Module information" class="yii-debug-table is-facts">
+            <tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">DB_PASSWORD</th><td  class="v"><span class="yii-debug-phpinfo-redacted" aria-label="Sensitive value hidden">redacted</span></td></tr>
+            <tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">APP_NAME</th><td class="v">Yii application</td></tr>
+            </table></div></div></section>
+            HTML,
             $view->modulesHtml,
             'Redaction must survive the fallback taken when grouping is impossible.',
         );
-        self::assertStringContainsString(
-            'aria-label="Sensitive value hidden">redacted</span>',
-            $view->modulesHtml,
-            'Placeholder must replace the credential.',
-        );
-        self::assertStringContainsString(
-            '>Yii application</td>',
-            $view->modulesHtml,
-            'Ordinary values must stay visible.',
-        );
     }
 
     public function testFromOutputRequiresBothPosixFunctionsForHomeFallback(): void
     {
         unset($_SERVER['HOME'], $_SERVER['USERPROFILE']);
+
         putenv('HOME');
         putenv('USERPROFILE');
-        MockerState::addCondition('PHPForge\Debug\PhpInfo', 'function_exists', ['posix_getpwuid'], true);
-        MockerState::addCondition('PHPForge\Debug\PhpInfo', 'function_exists', ['posix_getuid'], false);
+
+        MockerState::addCondition(
+            'PHPForge\Debug\PhpInfo',
+            'function_exists',
+            ['posix_getpwuid'],
+            true,
+        );
+        MockerState::addCondition(
+            'PHPForge\Debug\PhpInfo',
+            'function_exists',
+            ['posix_getuid'],
+            false,
+        );
 
         PhpInfoDataNormalizer::fromOutput('', 'x', 'cli', 'Linux', '');
 
@@ -1177,10 +1174,22 @@ public function testFromOutputRequiresBothPosixFunctionsForHomeFallback(): void
     public function testFromOutputRequiresPosixPasswordLookupForHomeFallback(): void
     {
         unset($_SERVER['HOME'], $_SERVER['USERPROFILE']);
+
         putenv('HOME');
         putenv('USERPROFILE');
-        MockerState::addCondition('PHPForge\Debug\PhpInfo', 'function_exists', ['posix_getpwuid'], false);
-        MockerState::addCondition('PHPForge\Debug\PhpInfo', 'function_exists', ['posix_getuid'], true);
+
+        MockerState::addCondition(
+            'PHPForge\Debug\PhpInfo',
+            'function_exists',
+            ['posix_getpwuid'],
+            false,
+        );
+        MockerState::addCondition(
+            'PHPForge\Debug\PhpInfo',
+            'function_exists',
+            ['posix_getuid'],
+            true,
+        );
 
         PhpInfoDataNormalizer::fromOutput('', 'x', 'cli', 'Linux', '');
 
@@ -1196,6 +1205,7 @@ public function testFromOutputResolvesHomeDirectoryFromPosixWhenEnvUnset(): void
         $body = '<table><tr><td>Loaded Configuration File</td><td>/tmp/php.ini</td></tr></table>';
 
         unset($_SERVER['HOME'], $_SERVER['USERPROFILE']);
+
         putenv('HOME');
         putenv('USERPROFILE');
 
@@ -1223,7 +1233,7 @@ public function testFromOutputResolvesHomeDirectoryFromPosixWhenEnvUnset(): void
 
     public function testFromOutputSeparatesPhpCreditsFromPhpVariables(): void
     {
-        $body = <<<'HTML'
+        $body = <<<HTML
         <h2>PHP Variables</h2><table><tr><td>Variable</td><td>Value</td></tr></table>
         <h1>PHP Credits</h1><table><tr><td>PHP Group</td><td>Contributors</td></tr></table>
         <h2>PHP License</h2><table><tr><td>License text</td></tr></table>
@@ -1241,8 +1251,12 @@ public function testFromOutputSeparatesPhpCreditsFromPhpVariables(): void
             $titles,
             'The h1-based PHP Credits block must become an independent module instead of extending PHP Variables.',
         );
-        self::assertStringContainsString(
-            'id="phpinfo-php-credits"',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-php-variables" data-section="PHP Variables"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-php-variables-heading">PHP Variables</h2></header><div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-facts"><header class="yii-debug-phpinfo-table-section-head"><span>Module information</span><span class="yii-debug-phpinfo-table-section-count">1 value</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Module information" class="yii-debug-table is-facts"><tr class="yii-debug-phpinfo-fact"><td>Variable</td><td>Value</td></tr></table></div></div>
+            </section><section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-php-credits" data-section="PHP Credits"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-php-credits-heading">PHP Credits</h2></header><div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-facts"><header class="yii-debug-phpinfo-table-section-head"><span>Module information</span><span class="yii-debug-phpinfo-table-section-count">1 value</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Module information" class="yii-debug-table is-facts"><tr class="yii-debug-phpinfo-fact"><td>PHP Group</td><td>Contributors</td></tr></table></div></div>
+            </section><section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-php-license" data-section="PHP License"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-php-license-heading">PHP License</h2></header><div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-note"><header class="yii-debug-phpinfo-table-section-head"><span>Notes</span><span class="yii-debug-phpinfo-table-section-count">1 note</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Notes" class="yii-debug-table is-note"><tr><td>License text</td></tr></table></div></div></section>
+            HTML,
             $view->modulesHtml,
             'PHP Credits must expose its own deep-linkable section.',
         );
@@ -1285,7 +1299,7 @@ public function testFromOutputShortensHomeDirectoryInsideConfigureCommand(): voi
     {
         $_SERVER['HOME'] = '/home/dev';
 
-        $body = <<<'HTML'
+        $body = <<<HTML
         <table><tr><td>Configure Command</td>
         <td>'./configure' '--prefix=/home/dev/.local/php' '--with-config=/opt/home/dev/etc'</td></tr></table>
         HTML;
@@ -1318,7 +1332,10 @@ public function testFromOutputSkipsPhpLogoRows(): void
 
         $section = $view->sections[0] ?? null;
 
-        self::assertNotNull($section, 'Normalized output must expose at least one hero section.');
+        self::assertNotNull(
+            $section,
+            'Normalized output must expose at least one hero section.',
+        );
 
         $heroLabels = [];
 
@@ -1335,7 +1352,7 @@ public function testFromOutputSkipsPhpLogoRows(): void
 
     public function testFromOutputSummarizesSmallFactsOnlyModules(): void
     {
-        $body = <<<'HTML'
+        $body = <<<HTML
         <h2>calendar</h2>
         <table><tr><td class="e">Calendar support</td><td class="v">enabled</td></tr></table>
         <h2>fileinfo</h2>
@@ -1363,16 +1380,19 @@ public function testFromOutputSummarizesSmallFactsOnlyModules(): void
             array_map(static fn(PhpInfoTocEntry $entry): string => $entry->title, $view->tocEntries),
             'Modules with directives must retain a standalone TOC entry.',
         );
-        self::assertStringNotContainsString(
-            'id="phpinfo-calendar"',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-bcmath" data-section="bcmath"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-bcmath-heading">bcmath</h2></header>
+            <div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-facts"><header class="yii-debug-phpinfo-table-section-head"><span>Module information</span><span class="yii-debug-phpinfo-table-section-count">1 value</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Module information" class="yii-debug-table is-facts"><tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">BCMath support</th><td class="v"><span class="yii-debug-phpinfo-status-pill" data-variant="success">enabled</span></td></tr></table></div></div>
+            <div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-directives"><header class="yii-debug-phpinfo-table-section-head"><span>Configuration directives</span><span class="yii-debug-phpinfo-table-section-count">1 directive</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Configuration directives" class="yii-debug-table is-directives">
+            <tr class="h"><th>Directive</th><th>Local Value</th><th>Master Value</th></tr>
+            <tr><th scope="row" class="e">bcmath.scale</th><td class="v">0</td><td class="v">0</td></tr>
+            </table></div></div></section>
+            HTML,
             $view->modulesHtml,
             'Compact modules must not retain a duplicate standalone section.',
         );
-        self::assertStringContainsString(
-            'id="phpinfo-bcmath"',
-            $view->modulesHtml,
-            'Modules with configuration must remain in the detailed modules HTML.',
-        );
+
     }
 
     public function testFromOutputSurfacesPathTokensForStandaloneAbsolutePath(): void
@@ -1406,8 +1426,10 @@ public function testFromOutputTreatsAHeaderOnlyTwoColumnTableAsFacts(): void
 
         $view = PhpInfoDataNormalizer::fromOutput($body, 'x', 'cli', 'Linux', '');
 
-        self::assertStringContainsString(
-            '<span>Module information</span><span class="yii-debug-phpinfo-table-section-count">1 value</span>',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-php-credits" data-section="PHP Credits"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-php-credits-heading">PHP Credits</h2></header><div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-facts"><header class="yii-debug-phpinfo-table-section-head"><span>Module information</span><span class="yii-debug-phpinfo-table-section-count">1 value</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Module information" class="yii-debug-table is-facts"><tr class="yii-debug-phpinfo-fact"><th>Unknown</th><th>Other</th></tr></table></div></div></section>
+            HTML,
             $view->modulesHtml,
             'A two-column header itself carries a fact value when no known data heading is present.',
         );
@@ -1417,6 +1439,7 @@ public function testFromOutputTrimsRuntimeTilesAndKeepsTokenBoundariesUnicodeAwa
     {
         $unicodeToken = str_repeat('é', 20);
         $boundaryToken = str_repeat('a', 32);
+
         $body = <<<HTML
         <table>
         <tr><td>Registered PHP Streams</td><td>single,</td></tr>
@@ -1435,7 +1458,11 @@ public function testFromOutputTrimsRuntimeTilesAndKeepsTokenBoundariesUnicodeAwa
             }
         }
 
-        self::assertSame(['cli', PhpInfoTile::KIND_TEXT], $tiles['SAPI'] ?? null, 'Runtime values must be trimmed.');
+        self::assertSame(
+            ['cli', PhpInfoTile::KIND_TEXT],
+            $tiles['SAPI'] ?? null,
+            'Runtime values must be trimmed.',
+        );
         self::assertSame(
             ['128M', PhpInfoTile::KIND_TEXT],
             $tiles['Memory limit'] ?? null,
@@ -1489,11 +1516,28 @@ public function testFromOutputTrimsTrailingHomeSeparators(): void
     public function testFromOutputUsesAndTrimsPosixHomeFallback(): void
     {
         unset($_SERVER['HOME'], $_SERVER['USERPROFILE']);
+
         putenv('HOME');
         putenv('USERPROFILE');
-        MockerState::addCondition('PHPForge\Debug\PhpInfo', 'function_exists', ['posix_getpwuid'], true);
-        MockerState::addCondition('PHPForge\Debug\PhpInfo', 'function_exists', ['posix_getuid'], true);
-        MockerState::addCondition('PHPForge\Debug\PhpInfo', 'posix_getuid', [], 1000);
+
+        MockerState::addCondition(
+            'PHPForge\Debug\PhpInfo',
+            'function_exists',
+            ['posix_getpwuid'],
+            true,
+        );
+        MockerState::addCondition(
+            'PHPForge\Debug\PhpInfo',
+            'function_exists',
+            ['posix_getuid'],
+            true,
+        );
+        MockerState::addCondition(
+            'PHPForge\Debug\PhpInfo',
+            'posix_getuid',
+            [],
+            1000,
+        );
         MockerState::addCondition(
             'PHPForge\Debug\PhpInfo',
             'posix_getpwuid',
@@ -1518,7 +1562,7 @@ public function testFromOutputUsesAndTrimsPosixHomeFallback(): void
 
     public function testFromOutputUsesNativePhpCreditsTableTitles(): void
     {
-        $body = <<<'HTML'
+        $body = <<<HTML
         <h2>PHP Variables</h2>
         <h1>PHP Credits</h1>
         <table><tr class="h"><th>PHP Group</th></tr><tr><td>Contributors</td></tr></table>
@@ -1530,36 +1574,22 @@ public function testFromOutputUsesNativePhpCreditsTableTitles(): void
 
         $view = PhpInfoDataNormalizer::fromOutput($body, 'x', 'cli', 'Linux', '');
 
-        self::assertStringContainsString(
-            '<span>PHP Group</span>',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-php-credits" data-section="PHP Credits"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-php-credits-heading">PHP Credits</h2></header>
+            <div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-note"><header class="yii-debug-phpinfo-table-section-head"><span>PHP Group</span><span class="yii-debug-phpinfo-table-section-count">1 note</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="PHP Group" class="yii-debug-table is-note"><tr><td>Contributors</td></tr></table></div></div>
+            <div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-facts"><header class="yii-debug-phpinfo-table-section-head"><span>PHP Authors</span><span class="yii-debug-phpinfo-table-section-count">1 value</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="PHP Authors" class="yii-debug-table is-facts">
+            <tr class="yii-debug-phpinfo-fact"><th scope="row" class="e">Zend Engine</th><td class="v">Authors</td></tr>
+            </table></div></div></section>
+            HTML,
             $view->modulesHtml,
             'A one-cell phpinfo heading must become the table card title.',
         );
-        self::assertStringContainsString(
-            '<span>PHP Authors</span>',
-            $view->modulesHtml,
-            'PHP Credits fact tables must retain their native titles.',
-        );
-        self::assertStringNotContainsString(
-            '<span>Notes</span>',
-            $view->modulesHtml,
-            'Native PHP Credits headings must replace the generic Notes label.',
-        );
-        self::assertStringNotContainsString(
-            '<span>Module information</span>',
-            $view->modulesHtml,
-            'Native PHP Credits headings must replace the generic module-information label.',
-        );
-        self::assertStringContainsString(
-            '<span class="yii-debug-phpinfo-table-section-count">1 note</span>',
-            $view->modulesHtml,
-            'The title row must not inflate a note table count.',
-        );
     }
 
     public function testFromOutputWrapsModulesHtmlWithSectionChrome(): void
     {
-        $body = <<<'HTML'
+        $body = <<<HTML
         <h2>apcu</h2>
         <table>
         <tr><td>Version</td><td>5.1</td></tr>
@@ -1576,26 +1606,24 @@ public function testFromOutputWrapsModulesHtmlWithSectionChrome(): void
             '',
         );
 
-        self::assertStringContainsString(
-            'yii-debug-phpinfo-module',
+        self::assertSame(
+            <<<HTML
+            <section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-apcu" data-section="apcu"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-apcu-heading">apcu</h2></header>
+            <div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-facts"><header class="yii-debug-phpinfo-table-section-head"><span>Module information</span><span class="yii-debug-phpinfo-table-section-count">3 values</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Module information" class="yii-debug-table is-facts">
+            <tr class="yii-debug-phpinfo-fact"><td>Version</td><td>5.1</td></tr>
+            <tr class="yii-debug-phpinfo-fact"><td>Debug</td><td>disabled</td></tr>
+            <tr class="yii-debug-phpinfo-fact"><td>MMAP</td><td>enabled</td></tr>
+            </table></div></div></section>
+            HTML,
             $view->modulesHtml,
             'Modules HTML must wrap blocks with the module class.',
         );
-        self::assertStringContainsString(
-            'yii-debug-table-wrap',
-            $view->modulesHtml,
-            'Modules HTML must wrap tables in the panel chrome.',
-        );
-        self::assertStringContainsString(
-            'id="phpinfo-apcu"',
-            $view->modulesHtml,
-            'Modules HTML must carry the slug id for TOC anchors.',
-        );
     }
 
     public function testResolveHomeDirectoryReturnsEmptyWhenEnvAndPosixUnavailable(): void
     {
         unset($_SERVER['HOME'], $_SERVER['USERPROFILE']);
+
         putenv('HOME');
         putenv('USERPROFILE');
 
diff --git a/tests/PhpInfo/PhpInfoRendererTest.php b/tests/PhpInfo/PhpInfoRendererTest.php
index 72f207b..ce28914 100644
--- a/tests/PhpInfo/PhpInfoRendererTest.php
+++ b/tests/PhpInfo/PhpInfoRendererTest.php
@@ -21,15 +21,17 @@
 /**
  * Unit tests for {@see PhpInfoRenderer} covering the TOC sidebar, the per-section composition (eyebrow + headline +
  * tiles), the tile-kind rendering branches and the Configure Command details disclosure.
- *
- * @since 0.1
  */
 #[Group('phpinfo')]
 final class PhpInfoRendererTest extends TestCase
 {
     public function testModuleGroupBucketPreservesEveryGroupAndPublicResolution(): void
     {
-        self::assertSame('Database', PhpInfoModuleGroup::resolve('PDO'), 'Public resolution must remain callable.');
+        self::assertSame(
+            'Database',
+            PhpInfoModuleGroup::resolve('PDO'),
+            'Public resolution must remain callable.',
+        );
         self::assertSame(
             [
                 'Core & Runtime',
@@ -50,28 +52,59 @@ public function testRenderEmitsTocLinkPerEntry(): void
     {
         $view = $this->emptyView(
             [
-                new PhpInfoTocEntry(title: 'Overview', slug: 'phpinfo-overview'),
-                new PhpInfoTocEntry(title: 'apcu', slug: 'phpinfo-apcu'),
+                new PhpInfoTocEntry(
+                    title: 'Overview',
+                    slug: 'phpinfo-overview',
+                ),
+                new PhpInfoTocEntry(
+                    title: 'apcu',
+                    slug: 'phpinfo-apcu',
+                ),
             ],
         );
 
         $html = PhpInfoRenderer::render($view);
 
-        self::assertStringContainsString(
-            'href="#phpinfo-overview"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-phpinfo-shell">
+            <aside class="yii-debug-phpinfo-toc" aria-label="phpinfo modules">
+            <header class="yii-debug-phpinfo-toc-title">
+            <span>1</span><span>modules</span>
+            </header><ul class="yii-debug-phpinfo-toc-overview">
+            <li>
+            <a class="yii-debug-phpinfo-toc-link is-active" href="#phpinfo-overview" data-toc-target="phpinfo-overview" aria-current="page">Overview</a>
+            </li>
+            </ul><div class="yii-debug-phpinfo-toc-groups">
+            <details class="yii-debug-phpinfo-toc-group" data-yii-debug-phpinfo-toc-group="true">
+            <summary class="yii-debug-phpinfo-toc-group-summary">
+            <span>Core &amp; Runtime</span><span class="yii-debug-phpinfo-toc-group-count" aria-label="1 module">1</span>
+            </summary><ul class="yii-debug-phpinfo-toc-group-list">
+            <li>
+            <a class="yii-debug-phpinfo-toc-link" href="#phpinfo-apcu" data-toc-target="phpinfo-apcu">apcu</a>
+            </li>
+            </ul>
+            </details>
+            </div>
+            </aside><div class="yii-debug-phpinfo-main">
+            <div class="yii-debug-phpinfo-search" role="search" aria-label="PHP configuration">
+            <div class="yii-debug-phpinfo-search-control">
+            <label class="yii-debug-sr-only" for="yii-debug-phpinfo-filter">Filter PHP modules and settings</label><span class="yii-debug-phpinfo-search-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="7"/><path d="m21 21-4.3-4.3"/></svg></span><input class="yii-debug-phpinfo-search-input" id="yii-debug-phpinfo-filter" name="phpinfo-filter" type="search" autocomplete="off" spellcheck="false" aria-controls="yii-debug-phpinfo-results" data-yii-debug-phpinfo-search="true" placeholder="Search modules or settings…"><button class="yii-debug-phpinfo-search-clear" type="button" hidden aria-label="Clear PHP configuration search" data-yii-debug-phpinfo-clear="true">Clear</button>
+            </div><div class="yii-debug-phpinfo-search-feedback">
+            <span class="yii-debug-phpinfo-search-status" aria-live="polite" data-yii-debug-phpinfo-status="true"></span><span class="yii-debug-phpinfo-search-empty" hidden data-yii-debug-phpinfo-empty="true">No modules or settings match this query.</span>
+            </div>
+            </div><div id="yii-debug-phpinfo-results">
+            <section class="yii-debug-phpinfo-section" id="phpinfo-overview" data-section="Overview">
+            <div class="yii-debug-phpinfo-overview-hero">
+            </div>
+            </section>
+            </div>
+            </div>
+            </div>
+            HTML,
             $html,
             'TOC must link to the Overview slug.',
         );
-        self::assertStringContainsString(
-            'href="#phpinfo-apcu"',
-            $html,
-            'TOC must link to every module slug.',
-        );
-        self::assertStringContainsString(
-            'data-toc-target="phpinfo-apcu"',
-            $html,
-            'TOC entries must carry the data-toc-target attribute.',
-        );
     }
 
     public function testRenderGroupsModulesAndFallsBackToOther(): void
@@ -79,11 +112,26 @@ public function testRenderGroupsModulesAndFallsBackToOther(): void
         $html = PhpInfoRenderer::render(
             $this->emptyView(
                 [
-                    new PhpInfoTocEntry(title: 'Overview', slug: 'phpinfo-overview'),
-                    new PhpInfoTocEntry(title: 'Core', slug: 'phpinfo-core'),
-                    new PhpInfoTocEntry(title: 'date', slug: 'phpinfo-date'),
-                    new PhpInfoTocEntry(title: 'PDO', slug: 'phpinfo-pdo'),
-                    new PhpInfoTocEntry(title: 'vendor_extension', slug: 'phpinfo-vendor-extension'),
+                    new PhpInfoTocEntry(
+                        title: 'Overview',
+                        slug: 'phpinfo-overview',
+                    ),
+                    new PhpInfoTocEntry(
+                        title: 'Core',
+                        slug: 'phpinfo-core',
+                    ),
+                    new PhpInfoTocEntry(
+                        title: 'date',
+                        slug: 'phpinfo-date',
+                    ),
+                    new PhpInfoTocEntry(
+                        title: 'PDO',
+                        slug: 'phpinfo-pdo',
+                    ),
+                    new PhpInfoTocEntry(
+                        title: 'vendor_extension',
+                        slug: 'phpinfo-vendor-extension',
+                    ),
                 ],
             ),
         );
@@ -103,21 +151,64 @@ public function testRenderGroupsModulesAndFallsBackToOther(): void
             $html,
             'Unknown extensions must remain accessible in the Other group.',
         );
-        self::assertStringContainsString(
-            'data-yii-debug-phpinfo-toc-group="true"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-phpinfo-shell">
+            <aside class="yii-debug-phpinfo-toc" aria-label="phpinfo modules">
+            <header class="yii-debug-phpinfo-toc-title">
+            <span>4</span><span>modules</span>
+            </header><ul class="yii-debug-phpinfo-toc-overview">
+            <li>
+            <a class="yii-debug-phpinfo-toc-link is-active" href="#phpinfo-overview" data-toc-target="phpinfo-overview" aria-current="page">Overview</a>
+            </li>
+            </ul><div class="yii-debug-phpinfo-toc-groups">
+            <details class="yii-debug-phpinfo-toc-group" data-yii-debug-phpinfo-toc-group="true">
+            <summary class="yii-debug-phpinfo-toc-group-summary">
+            <span>Core &amp; Runtime</span><span class="yii-debug-phpinfo-toc-group-count" aria-label="2 modules">2</span>
+            </summary><ul class="yii-debug-phpinfo-toc-group-list">
+            <li>
+            <a class="yii-debug-phpinfo-toc-link" href="#phpinfo-core" data-toc-target="phpinfo-core">Core</a>
+            </li><li>
+            <a class="yii-debug-phpinfo-toc-link" href="#phpinfo-date" data-toc-target="phpinfo-date">date</a>
+            </li>
+            </ul>
+            </details><details class="yii-debug-phpinfo-toc-group" data-yii-debug-phpinfo-toc-group="true">
+            <summary class="yii-debug-phpinfo-toc-group-summary">
+            <span>Database</span><span class="yii-debug-phpinfo-toc-group-count" aria-label="1 module">1</span>
+            </summary><ul class="yii-debug-phpinfo-toc-group-list">
+            <li>
+            <a class="yii-debug-phpinfo-toc-link" href="#phpinfo-pdo" data-toc-target="phpinfo-pdo">PDO</a>
+            </li>
+            </ul>
+            </details><details class="yii-debug-phpinfo-toc-group" data-yii-debug-phpinfo-toc-group="true">
+            <summary class="yii-debug-phpinfo-toc-group-summary">
+            <span>Other</span><span class="yii-debug-phpinfo-toc-group-count" aria-label="1 module">1</span>
+            </summary><ul class="yii-debug-phpinfo-toc-group-list">
+            <li>
+            <a class="yii-debug-phpinfo-toc-link" href="#phpinfo-vendor-extension" data-toc-target="phpinfo-vendor-extension">vendor_extension</a>
+            </li>
+            </ul>
+            </details>
+            </div>
+            </aside><div class="yii-debug-phpinfo-main">
+            <div class="yii-debug-phpinfo-search" role="search" aria-label="PHP configuration">
+            <div class="yii-debug-phpinfo-search-control">
+            <label class="yii-debug-sr-only" for="yii-debug-phpinfo-filter">Filter PHP modules and settings</label><span class="yii-debug-phpinfo-search-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="7"/><path d="m21 21-4.3-4.3"/></svg></span><input class="yii-debug-phpinfo-search-input" id="yii-debug-phpinfo-filter" name="phpinfo-filter" type="search" autocomplete="off" spellcheck="false" aria-controls="yii-debug-phpinfo-results" data-yii-debug-phpinfo-search="true" placeholder="Search modules or settings…"><button class="yii-debug-phpinfo-search-clear" type="button" hidden aria-label="Clear PHP configuration search" data-yii-debug-phpinfo-clear="true">Clear</button>
+            </div><div class="yii-debug-phpinfo-search-feedback">
+            <span class="yii-debug-phpinfo-search-status" aria-live="polite" data-yii-debug-phpinfo-status="true"></span><span class="yii-debug-phpinfo-search-empty" hidden data-yii-debug-phpinfo-empty="true">No modules or settings match this query.</span>
+            </div>
+            </div><div id="yii-debug-phpinfo-results">
+            <section class="yii-debug-phpinfo-section" id="phpinfo-overview" data-section="Overview">
+            <div class="yii-debug-phpinfo-overview-hero">
+            </div>
+            </section>
+            </div>
+            </div>
+            </div>
+            HTML,
             $html,
             'Every module group must expose the JavaScript synchronization hook.',
         );
-        self::assertStringContainsString(
-            'aria-label="2 modules"',
-            $html,
-            'A group with two entries must use the pluralized accessible count.',
-        );
-        self::assertStringContainsString(
-            'aria-label="1 module"',
-            $html,
-            'A group with one entry must use the singular accessible count.',
-        );
     }
 
     public function testRenderMarksLongOverviewValuesAsWide(): void
@@ -144,8 +235,43 @@ public function testRenderMarksLongOverviewValuesAsWide(): void
             ),
         );
 
-        self::assertStringContainsString(
-            'class="yii-debug-phpinfo-overview-hero-metric is-wide"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-phpinfo-shell">
+            <aside class="yii-debug-phpinfo-toc" aria-label="phpinfo modules">
+            <header class="yii-debug-phpinfo-toc-title">
+            <span>0</span><span>modules</span>
+            </header><div class="yii-debug-phpinfo-toc-groups">
+            </div>
+            </aside><div class="yii-debug-phpinfo-main">
+            <div class="yii-debug-phpinfo-search" role="search" aria-label="PHP configuration">
+            <div class="yii-debug-phpinfo-search-control">
+            <label class="yii-debug-sr-only" for="yii-debug-phpinfo-filter">Filter PHP modules and settings</label><span class="yii-debug-phpinfo-search-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="7"/><path d="m21 21-4.3-4.3"/></svg></span><input class="yii-debug-phpinfo-search-input" id="yii-debug-phpinfo-filter" name="phpinfo-filter" type="search" autocomplete="off" spellcheck="false" aria-controls="yii-debug-phpinfo-results" data-yii-debug-phpinfo-search="true" placeholder="Search modules or settings…"><button class="yii-debug-phpinfo-search-clear" type="button" hidden aria-label="Clear PHP configuration search" data-yii-debug-phpinfo-clear="true">Clear</button>
+            </div><div class="yii-debug-phpinfo-search-feedback">
+            <span class="yii-debug-phpinfo-search-status" aria-live="polite" data-yii-debug-phpinfo-status="true"></span><span class="yii-debug-phpinfo-search-empty" hidden data-yii-debug-phpinfo-empty="true">No modules or settings match this query.</span>
+            </div>
+            </div><div id="yii-debug-phpinfo-results">
+            <section class="yii-debug-phpinfo-section" id="phpinfo-overview" data-section="Overview">
+            <div class="yii-debug-phpinfo-overview-hero">
+            <section class="yii-debug-phpinfo-overview-hero-section" aria-label="Build">
+            <header class="yii-debug-phpinfo-overview-block-head">
+            <span class="yii-debug-phpinfo-overview-block-eyebrow">Build</span>
+            </header><dl class="yii-debug-phpinfo-overview-hero-metrics">
+            <div class="yii-debug-phpinfo-overview-hero-metric is-wide">
+            <dt>
+            Build System
+            </dt><dd>
+            <code>A deliberately long build-system value that needs the complete card width</code>
+            </dd>
+            </div>
+            </dl>
+            </section>
+            </div>
+            </section>
+            </div>
+            </div>
+            </div>
+            HTML,
             $html,
             'Long technical values must span the overview card instead of wrapping inside a narrow grid cell.',
         );
@@ -156,42 +282,58 @@ public function testRenderMarksOverviewAsInitialTocSelection(): void
         $html = PhpInfoRenderer::render(
             $this->emptyView(
                 [
-                    new PhpInfoTocEntry(title: 'Overview', slug: 'phpinfo-overview'),
-                    new PhpInfoTocEntry(title: 'Core', slug: 'phpinfo-core'),
+                    new PhpInfoTocEntry(
+                        title: 'Overview',
+                        slug: 'phpinfo-overview',
+                    ),
+                    new PhpInfoTocEntry(
+                        title: 'Core',
+                        slug: 'phpinfo-core',
+                    ),
                 ],
             ),
         );
 
-        self::assertStringContainsString(
-            'class="yii-debug-phpinfo-toc-link is-active"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-phpinfo-shell">
+            <aside class="yii-debug-phpinfo-toc" aria-label="phpinfo modules">
+            <header class="yii-debug-phpinfo-toc-title">
+            <span>1</span><span>modules</span>
+            </header><ul class="yii-debug-phpinfo-toc-overview">
+            <li>
+            <a class="yii-debug-phpinfo-toc-link is-active" href="#phpinfo-overview" data-toc-target="phpinfo-overview" aria-current="page">Overview</a>
+            </li>
+            </ul><div class="yii-debug-phpinfo-toc-groups">
+            <details class="yii-debug-phpinfo-toc-group" data-yii-debug-phpinfo-toc-group="true">
+            <summary class="yii-debug-phpinfo-toc-group-summary">
+            <span>Core &amp; Runtime</span><span class="yii-debug-phpinfo-toc-group-count" aria-label="1 module">1</span>
+            </summary><ul class="yii-debug-phpinfo-toc-group-list">
+            <li>
+            <a class="yii-debug-phpinfo-toc-link" href="#phpinfo-core" data-toc-target="phpinfo-core">Core</a>
+            </li>
+            </ul>
+            </details>
+            </div>
+            </aside><div class="yii-debug-phpinfo-main">
+            <div class="yii-debug-phpinfo-search" role="search" aria-label="PHP configuration">
+            <div class="yii-debug-phpinfo-search-control">
+            <label class="yii-debug-sr-only" for="yii-debug-phpinfo-filter">Filter PHP modules and settings</label><span class="yii-debug-phpinfo-search-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="7"/><path d="m21 21-4.3-4.3"/></svg></span><input class="yii-debug-phpinfo-search-input" id="yii-debug-phpinfo-filter" name="phpinfo-filter" type="search" autocomplete="off" spellcheck="false" aria-controls="yii-debug-phpinfo-results" data-yii-debug-phpinfo-search="true" placeholder="Search modules or settings…"><button class="yii-debug-phpinfo-search-clear" type="button" hidden aria-label="Clear PHP configuration search" data-yii-debug-phpinfo-clear="true">Clear</button>
+            </div><div class="yii-debug-phpinfo-search-feedback">
+            <span class="yii-debug-phpinfo-search-status" aria-live="polite" data-yii-debug-phpinfo-status="true"></span><span class="yii-debug-phpinfo-search-empty" hidden data-yii-debug-phpinfo-empty="true">No modules or settings match this query.</span>
+            </div>
+            </div><div id="yii-debug-phpinfo-results">
+            <section class="yii-debug-phpinfo-section" id="phpinfo-overview" data-section="Overview">
+            <div class="yii-debug-phpinfo-overview-hero">
+            </div>
+            </section>
+            </div>
+            </div>
+            </div>
+            HTML,
             $html,
             'Overview must render as the initial selected view before JavaScript initializes.',
         );
-        self::assertStringContainsString(
-            'aria-current="page"',
-            $html,
-            'The initial TOC selection must be exposed to assistive technology.',
-        );
-        self::assertStringContainsString(
-            '<span>1</span><span>modules</span>',
-            $html,
-            'The TOC counter must exclude the Overview entry.',
-        );
-        self::assertStringContainsString(
-            '<a class="yii-debug-phpinfo-toc-link is-active" href="#phpinfo-overview" data-toc-target="phpinfo-overview" aria-current="page">Overview</a>',
-            $html,
-            'Only Overview must carry active styling and aria-current.',
-        );
-        self::assertStringContainsString(
-            '<a class="yii-debug-phpinfo-toc-link" href="#phpinfo-core" data-toc-target="phpinfo-core">Core</a>',
-            $html,
-            'Ordinary module links must remain inactive.',
-        );
-        self::assertStringNotContainsString(
-            'in Overview',
-            $html,
-            'The TOC must omit the Overview note when no modules were summarized.',
-        );
     }
 
     public function testRenderModulesHtmlPassesThroughVerbatim(): void
@@ -206,8 +348,30 @@ public function testRenderModulesHtmlPassesThroughVerbatim(): void
 
         $html = PhpInfoRenderer::render($view);
 
-        self::assertStringContainsString(
-            '<section id="phpinfo-apcu">module-body</section>',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-phpinfo-shell">
+            <aside class="yii-debug-phpinfo-toc" aria-label="phpinfo modules">
+            <header class="yii-debug-phpinfo-toc-title">
+            <span>0</span><span>modules</span>
+            </header><div class="yii-debug-phpinfo-toc-groups">
+            </div>
+            </aside><div class="yii-debug-phpinfo-main">
+            <div class="yii-debug-phpinfo-search" role="search" aria-label="PHP configuration">
+            <div class="yii-debug-phpinfo-search-control">
+            <label class="yii-debug-sr-only" for="yii-debug-phpinfo-filter">Filter PHP modules and settings</label><span class="yii-debug-phpinfo-search-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="7"/><path d="m21 21-4.3-4.3"/></svg></span><input class="yii-debug-phpinfo-search-input" id="yii-debug-phpinfo-filter" name="phpinfo-filter" type="search" autocomplete="off" spellcheck="false" aria-controls="yii-debug-phpinfo-results" data-yii-debug-phpinfo-search="true" placeholder="Search modules or settings…"><button class="yii-debug-phpinfo-search-clear" type="button" hidden aria-label="Clear PHP configuration search" data-yii-debug-phpinfo-clear="true">Clear</button>
+            </div><div class="yii-debug-phpinfo-search-feedback">
+            <span class="yii-debug-phpinfo-search-status" aria-live="polite" data-yii-debug-phpinfo-status="true"></span><span class="yii-debug-phpinfo-search-empty" hidden data-yii-debug-phpinfo-empty="true">No modules or settings match this query.</span>
+            </div>
+            </div><div id="yii-debug-phpinfo-results">
+            <section class="yii-debug-phpinfo-section" id="phpinfo-overview" data-section="Overview">
+            <div class="yii-debug-phpinfo-overview-hero">
+            </div>
+            </section><section id="phpinfo-apcu">module-body</section>
+            </div>
+            </div>
+            </div>
+            HTML,
             $html,
             'Modules HTML must round-trip verbatim into the main column.',
         );
@@ -225,62 +389,90 @@ public function testRenderRendersConfigureCommandWhenPresent(): void
 
         $html = PhpInfoRenderer::render($view);
 
-        self::assertStringContainsString(
-            'Configure Command',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-phpinfo-shell">
+            <aside class="yii-debug-phpinfo-toc" aria-label="phpinfo modules">
+            <header class="yii-debug-phpinfo-toc-title">
+            <span>0</span><span>modules</span>
+            </header><div class="yii-debug-phpinfo-toc-groups">
+            </div>
+            </aside><div class="yii-debug-phpinfo-main">
+            <div class="yii-debug-phpinfo-search" role="search" aria-label="PHP configuration">
+            <div class="yii-debug-phpinfo-search-control">
+            <label class="yii-debug-sr-only" for="yii-debug-phpinfo-filter">Filter PHP modules and settings</label><span class="yii-debug-phpinfo-search-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="7"/><path d="m21 21-4.3-4.3"/></svg></span><input class="yii-debug-phpinfo-search-input" id="yii-debug-phpinfo-filter" name="phpinfo-filter" type="search" autocomplete="off" spellcheck="false" aria-controls="yii-debug-phpinfo-results" data-yii-debug-phpinfo-search="true" placeholder="Search modules or settings…"><button class="yii-debug-phpinfo-search-clear" type="button" hidden aria-label="Clear PHP configuration search" data-yii-debug-phpinfo-clear="true">Clear</button>
+            </div><div class="yii-debug-phpinfo-search-feedback">
+            <span class="yii-debug-phpinfo-search-status" aria-live="polite" data-yii-debug-phpinfo-status="true"></span><span class="yii-debug-phpinfo-search-empty" hidden data-yii-debug-phpinfo-empty="true">No modules or settings match this query.</span>
+            </div>
+            </div><div id="yii-debug-phpinfo-results">
+            <section class="yii-debug-phpinfo-section" id="phpinfo-overview" data-section="Overview">
+            <div class="yii-debug-phpinfo-overview-hero">
+            </div><details class="yii-debug-disclosure">
+            <summary class="yii-debug-disclosure-summary">
+            <span class="yii-debug-disclosure-title">Configure Command</span><span class="yii-debug-disclosure-hint" aria-hidden="true"><span data-yii-debug-hint="collapsed">click to expand</span><span data-yii-debug-hint="expanded">click to collapse</span></span>
+            </summary><div class="yii-debug-disclosure-body">
+            <pre>
+            ./configure --foo
+            </pre>
+            </div>
+            </details>
+            </section>
+            </div>
+            </div>
+            </div>
+            HTML,
             $html,
             'Configure Command details must surface.',
         );
-        self::assertStringContainsString(
-            './configure --foo',
-            $html,
-            'Configure command body must surface inside the disclosure.',
-        );
+
     }
 
     public function testRenderSearchInputCarriesFilterHooks(): void
     {
         $html = PhpInfoRenderer::render($this->emptyView([]));
 
-        self::assertStringContainsString(
-            'data-yii-debug-phpinfo-search="true"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-phpinfo-shell">
+            <aside class="yii-debug-phpinfo-toc" aria-label="phpinfo modules">
+            <header class="yii-debug-phpinfo-toc-title">
+            <span>0</span><span>modules</span>
+            </header><div class="yii-debug-phpinfo-toc-groups">
+            </div>
+            </aside><div class="yii-debug-phpinfo-main">
+            <div class="yii-debug-phpinfo-search" role="search" aria-label="PHP configuration">
+            <div class="yii-debug-phpinfo-search-control">
+            <label class="yii-debug-sr-only" for="yii-debug-phpinfo-filter">Filter PHP modules and settings</label><span class="yii-debug-phpinfo-search-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="7"/><path d="m21 21-4.3-4.3"/></svg></span><input class="yii-debug-phpinfo-search-input" id="yii-debug-phpinfo-filter" name="phpinfo-filter" type="search" autocomplete="off" spellcheck="false" aria-controls="yii-debug-phpinfo-results" data-yii-debug-phpinfo-search="true" placeholder="Search modules or settings…"><button class="yii-debug-phpinfo-search-clear" type="button" hidden aria-label="Clear PHP configuration search" data-yii-debug-phpinfo-clear="true">Clear</button>
+            </div><div class="yii-debug-phpinfo-search-feedback">
+            <span class="yii-debug-phpinfo-search-status" aria-live="polite" data-yii-debug-phpinfo-status="true"></span><span class="yii-debug-phpinfo-search-empty" hidden data-yii-debug-phpinfo-empty="true">No modules or settings match this query.</span>
+            </div>
+            </div><div id="yii-debug-phpinfo-results">
+            <section class="yii-debug-phpinfo-section" id="phpinfo-overview" data-section="Overview">
+            <div class="yii-debug-phpinfo-overview-hero">
+            </div>
+            </section>
+            </div>
+            </div>
+            </div>
+            HTML,
             $html,
             'Search input must enable the filter JS hook explicitly.',
         );
-        self::assertStringContainsString(
-            'data-yii-debug-phpinfo-empty="true"',
-            $html,
-            'Empty-state hint must enable the JS hook explicitly.',
-        );
-        self::assertStringContainsString(
-            'data-yii-debug-phpinfo-clear="true"',
-            $html,
-            'Search must expose an explicit clear action.',
-        );
+
+
         self::assertMatchesRegularExpression(
             '~<button class="yii-debug-phpinfo-search-clear"[^>]*\shidden(?:\s|>)~',
             $html,
             'The clear action must remain hidden until the search has content.',
         );
-        self::assertStringContainsString(
-            'data-yii-debug-phpinfo-status="true"',
-            $html,
-            'Search must expose a live result-count hook.',
-        );
-        self::assertStringContainsString(
-            '<span class="yii-debug-phpinfo-search-empty" hidden data-yii-debug-phpinfo-empty="true">',
-            $html,
-            'Empty-state hint must remain hidden until filtering finds no matches.',
-        );
-        self::assertStringContainsString(
-            'aria-controls="yii-debug-phpinfo-results"',
-            $html,
-            'Search must identify the result region it controls.',
-        );
     }
 
     public function testRenderSectionRendersEyebrowHeader(): void
     {
-        $section = new PhpInfoSection(eyebrow: 'Runtime', tiles: []);
+        $section = new PhpInfoSection(
+            eyebrow: 'Runtime',
+            tiles: [],
+        );
         $view = new PhpInfoView(
             sections: [$section],
             tocEntries: [],
@@ -291,8 +483,36 @@ public function testRenderSectionRendersEyebrowHeader(): void
 
         $html = PhpInfoRenderer::render($view);
 
-        self::assertStringContainsString(
-            '<span class="yii-debug-phpinfo-overview-block-eyebrow">Runtime</span>',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-phpinfo-shell">
+            <aside class="yii-debug-phpinfo-toc" aria-label="phpinfo modules">
+            <header class="yii-debug-phpinfo-toc-title">
+            <span>0</span><span>modules</span>
+            </header><div class="yii-debug-phpinfo-toc-groups">
+            </div>
+            </aside><div class="yii-debug-phpinfo-main">
+            <div class="yii-debug-phpinfo-search" role="search" aria-label="PHP configuration">
+            <div class="yii-debug-phpinfo-search-control">
+            <label class="yii-debug-sr-only" for="yii-debug-phpinfo-filter">Filter PHP modules and settings</label><span class="yii-debug-phpinfo-search-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="7"/><path d="m21 21-4.3-4.3"/></svg></span><input class="yii-debug-phpinfo-search-input" id="yii-debug-phpinfo-filter" name="phpinfo-filter" type="search" autocomplete="off" spellcheck="false" aria-controls="yii-debug-phpinfo-results" data-yii-debug-phpinfo-search="true" placeholder="Search modules or settings…"><button class="yii-debug-phpinfo-search-clear" type="button" hidden aria-label="Clear PHP configuration search" data-yii-debug-phpinfo-clear="true">Clear</button>
+            </div><div class="yii-debug-phpinfo-search-feedback">
+            <span class="yii-debug-phpinfo-search-status" aria-live="polite" data-yii-debug-phpinfo-status="true"></span><span class="yii-debug-phpinfo-search-empty" hidden data-yii-debug-phpinfo-empty="true">No modules or settings match this query.</span>
+            </div>
+            </div><div id="yii-debug-phpinfo-results">
+            <section class="yii-debug-phpinfo-section" id="phpinfo-overview" data-section="Overview">
+            <div class="yii-debug-phpinfo-overview-hero">
+            <section class="yii-debug-phpinfo-overview-hero-section" aria-label="Runtime">
+            <header class="yii-debug-phpinfo-overview-block-head">
+            <span class="yii-debug-phpinfo-overview-block-eyebrow">Runtime</span>
+            </header><dl class="yii-debug-phpinfo-overview-hero-metrics">
+            </dl>
+            </section>
+            </div>
+            </section>
+            </div>
+            </div>
+            </div>
+            HTML,
             $html,
             'Every overview section must retain its eyebrow header.',
         );
@@ -321,16 +541,47 @@ public function testRenderSectionWithMutedPillTile(): void
         );
         $html = PhpInfoRenderer::render($view);
 
-        self::assertStringContainsString(
-            'yii-debug-phpinfo-overview-pill',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-phpinfo-shell">
+            <aside class="yii-debug-phpinfo-toc" aria-label="phpinfo modules">
+            <header class="yii-debug-phpinfo-toc-title">
+            <span>0</span><span>modules</span>
+            </header><div class="yii-debug-phpinfo-toc-groups">
+            </div>
+            </aside><div class="yii-debug-phpinfo-main">
+            <div class="yii-debug-phpinfo-search" role="search" aria-label="PHP configuration">
+            <div class="yii-debug-phpinfo-search-control">
+            <label class="yii-debug-sr-only" for="yii-debug-phpinfo-filter">Filter PHP modules and settings</label><span class="yii-debug-phpinfo-search-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="7"/><path d="m21 21-4.3-4.3"/></svg></span><input class="yii-debug-phpinfo-search-input" id="yii-debug-phpinfo-filter" name="phpinfo-filter" type="search" autocomplete="off" spellcheck="false" aria-controls="yii-debug-phpinfo-results" data-yii-debug-phpinfo-search="true" placeholder="Search modules or settings…"><button class="yii-debug-phpinfo-search-clear" type="button" hidden aria-label="Clear PHP configuration search" data-yii-debug-phpinfo-clear="true">Clear</button>
+            </div><div class="yii-debug-phpinfo-search-feedback">
+            <span class="yii-debug-phpinfo-search-status" aria-live="polite" data-yii-debug-phpinfo-status="true"></span><span class="yii-debug-phpinfo-search-empty" hidden data-yii-debug-phpinfo-empty="true">No modules or settings match this query.</span>
+            </div>
+            </div><div id="yii-debug-phpinfo-results">
+            <section class="yii-debug-phpinfo-section" id="phpinfo-overview" data-section="Overview">
+            <div class="yii-debug-phpinfo-overview-hero">
+            <section class="yii-debug-phpinfo-overview-hero-section" aria-label="Capabilities">
+            <header class="yii-debug-phpinfo-overview-block-head">
+            <span class="yii-debug-phpinfo-overview-block-eyebrow">Capabilities</span>
+            </header><dl class="yii-debug-phpinfo-overview-hero-metrics">
+            <div class="yii-debug-phpinfo-overview-hero-metric">
+            <dt>
+            Debug Build
+            </dt><dd>
+            <span class="yii-debug-phpinfo-overview-pill" data-variant="muted">no</span>
+            </dd>
+            </div>
+            </dl>
+            </section>
+            </div>
+            </section>
+            </div>
+            </div>
+            </div>
+            HTML,
             $html,
             'Muted pill must carry the pill CSS class.',
         );
-        self::assertStringContainsString(
-            'data-variant="muted"',
-            $html,
-            'Muted pill must carry the muted variant attribute.',
-        );
+
     }
 
     public function testRenderSectionWithPathListTokens(): void
@@ -345,8 +596,10 @@ public function testRenderSectionWithPathListTokens(): void
                 new PhpInfoToken(label: 'b.ini', title: '/etc/b.ini'),
             ],
         );
-
-        $section = new PhpInfoSection(eyebrow: 'Configuration', tiles: [$tile]);
+        $section = new PhpInfoSection(
+            eyebrow: 'Configuration',
+            tiles: [$tile],
+        );
         $view = new PhpInfoView(
             sections: [$section],
             tocEntries: [],
@@ -356,21 +609,48 @@ public function testRenderSectionWithPathListTokens(): void
         );
         $html = PhpInfoRenderer::render($view);
 
-        self::assertStringContainsString(
-            '>a.ini<',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-phpinfo-shell">
+            <aside class="yii-debug-phpinfo-toc" aria-label="phpinfo modules">
+            <header class="yii-debug-phpinfo-toc-title">
+            <span>0</span><span>modules</span>
+            </header><div class="yii-debug-phpinfo-toc-groups">
+            </div>
+            </aside><div class="yii-debug-phpinfo-main">
+            <div class="yii-debug-phpinfo-search" role="search" aria-label="PHP configuration">
+            <div class="yii-debug-phpinfo-search-control">
+            <label class="yii-debug-sr-only" for="yii-debug-phpinfo-filter">Filter PHP modules and settings</label><span class="yii-debug-phpinfo-search-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="7"/><path d="m21 21-4.3-4.3"/></svg></span><input class="yii-debug-phpinfo-search-input" id="yii-debug-phpinfo-filter" name="phpinfo-filter" type="search" autocomplete="off" spellcheck="false" aria-controls="yii-debug-phpinfo-results" data-yii-debug-phpinfo-search="true" placeholder="Search modules or settings…"><button class="yii-debug-phpinfo-search-clear" type="button" hidden aria-label="Clear PHP configuration search" data-yii-debug-phpinfo-clear="true">Clear</button>
+            </div><div class="yii-debug-phpinfo-search-feedback">
+            <span class="yii-debug-phpinfo-search-status" aria-live="polite" data-yii-debug-phpinfo-status="true"></span><span class="yii-debug-phpinfo-search-empty" hidden data-yii-debug-phpinfo-empty="true">No modules or settings match this query.</span>
+            </div>
+            </div><div id="yii-debug-phpinfo-results">
+            <section class="yii-debug-phpinfo-section" id="phpinfo-overview" data-section="Overview">
+            <div class="yii-debug-phpinfo-overview-hero">
+            <section class="yii-debug-phpinfo-overview-hero-section" aria-label="Configuration">
+            <header class="yii-debug-phpinfo-overview-block-head">
+            <span class="yii-debug-phpinfo-overview-block-eyebrow">Configuration</span>
+            </header><dl class="yii-debug-phpinfo-overview-hero-metrics">
+            <div class="yii-debug-phpinfo-overview-hero-metric is-wide">
+            <dt>
+            Additional .ini files parsed
+            </dt><dd>
+            <span class="yii-debug-phpinfo-overview-files"><code class="yii-debug-phpinfo-overview-token" title="/etc/a.ini">a.ini</code><code class="yii-debug-phpinfo-overview-token" title="/etc/b.ini">b.ini</code></span>
+            </dd>
+            </div>
+            </dl>
+            </section>
+            </div>
+            </section>
+            </div>
+            </div>
+            </div>
+            HTML,
             $html,
             'First token basename must render inside a code chip.',
         );
-        self::assertStringContainsString(
-            'title="/etc/a.ini"',
-            $html,
-            'First token full path must surface in the title attribute.',
-        );
-        self::assertStringContainsString(
-            'yii-debug-phpinfo-overview-token',
-            $html,
-            'Tokens must carry the token CSS class.',
-        );
+
+
     }
 
     public function testRenderSectionWithPathTileRendersCodeWithFullPathTitle(): void
@@ -381,8 +661,10 @@ public function testRenderSectionWithPathTileRendersCodeWithFullPathTitle(): voi
             rawValue: '/etc/php/8.5/cli/php.ini',
             kind: PhpInfoTile::KIND_PATH,
         );
-
-        $section = new PhpInfoSection(eyebrow: 'Configuration', tiles: [$tile]);
+        $section = new PhpInfoSection(
+            eyebrow: 'Configuration',
+            tiles: [$tile],
+        );
         $view = new PhpInfoView(
             sections: [$section],
             tocEntries: [],
@@ -390,23 +672,47 @@ public function testRenderSectionWithPathTileRendersCodeWithFullPathTitle(): voi
             modulesHtml: '',
             configureCommand: '',
         );
-        $html = PhpInfoRenderer::render($view);
 
-        self::assertStringContainsString(
-            '<code',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-phpinfo-shell">
+            <aside class="yii-debug-phpinfo-toc" aria-label="phpinfo modules">
+            <header class="yii-debug-phpinfo-toc-title">
+            <span>0</span><span>modules</span>
+            </header><div class="yii-debug-phpinfo-toc-groups">
+            </div>
+            </aside><div class="yii-debug-phpinfo-main">
+            <div class="yii-debug-phpinfo-search" role="search" aria-label="PHP configuration">
+            <div class="yii-debug-phpinfo-search-control">
+            <label class="yii-debug-sr-only" for="yii-debug-phpinfo-filter">Filter PHP modules and settings</label><span class="yii-debug-phpinfo-search-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="7"/><path d="m21 21-4.3-4.3"/></svg></span><input class="yii-debug-phpinfo-search-input" id="yii-debug-phpinfo-filter" name="phpinfo-filter" type="search" autocomplete="off" spellcheck="false" aria-controls="yii-debug-phpinfo-results" data-yii-debug-phpinfo-search="true" placeholder="Search modules or settings…"><button class="yii-debug-phpinfo-search-clear" type="button" hidden aria-label="Clear PHP configuration search" data-yii-debug-phpinfo-clear="true">Clear</button>
+            </div><div class="yii-debug-phpinfo-search-feedback">
+            <span class="yii-debug-phpinfo-search-status" aria-live="polite" data-yii-debug-phpinfo-status="true"></span><span class="yii-debug-phpinfo-search-empty" hidden data-yii-debug-phpinfo-empty="true">No modules or settings match this query.</span>
+            </div>
+            </div><div id="yii-debug-phpinfo-results">
+            <section class="yii-debug-phpinfo-section" id="phpinfo-overview" data-section="Overview">
+            <div class="yii-debug-phpinfo-overview-hero">
+            <section class="yii-debug-phpinfo-overview-hero-section" aria-label="Configuration">
+            <header class="yii-debug-phpinfo-overview-block-head">
+            <span class="yii-debug-phpinfo-overview-block-eyebrow">Configuration</span>
+            </header><dl class="yii-debug-phpinfo-overview-hero-metrics">
+            <div class="yii-debug-phpinfo-overview-hero-metric is-wide">
+            <dt>
+            Loaded Configuration File
+            </dt><dd>
+            <code title="/etc/php/8.5/cli/php.ini">php.ini</code>
+            </dd>
+            </div>
+            </dl>
+            </section>
+            </div>
+            </section>
+            </div>
+            </div>
+            </div>
+            HTML,
+            PhpInfoRenderer::render($view),
             'KIND_PATH must render inside a `<code>` element.',
         );
-        self::assertStringContainsString(
-            'title="/etc/php/8.5/cli/php.ini"',
-            $html,
-            'KIND_PATH must surface the raw path in the title attribute.',
-        );
-        self::assertStringContainsString(
-            '>php.ini<',
-            $html,
-            'KIND_PATH must show the basename in the visible content.',
-        );
     }
 
     public function testRenderSectionWithSuccessPillTile(): void
@@ -422,7 +728,6 @@ public function testRenderSectionWithSuccessPillTile(): void
                 ),
             ],
         );
-
         $view = new PhpInfoView(
             sections: [$section],
             tocEntries: [],
@@ -430,22 +735,77 @@ public function testRenderSectionWithSuccessPillTile(): void
             modulesHtml: '',
             configureCommand: '',
         );
-        $html = PhpInfoRenderer::render($view);
 
-        self::assertStringContainsString(
-            'data-variant="success"',
-            $html,
+
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-phpinfo-shell">
+            <aside class="yii-debug-phpinfo-toc" aria-label="phpinfo modules">
+            <header class="yii-debug-phpinfo-toc-title">
+            <span>0</span><span>modules</span>
+            </header><div class="yii-debug-phpinfo-toc-groups">
+            </div>
+            </aside><div class="yii-debug-phpinfo-main">
+            <div class="yii-debug-phpinfo-search" role="search" aria-label="PHP configuration">
+            <div class="yii-debug-phpinfo-search-control">
+            <label class="yii-debug-sr-only" for="yii-debug-phpinfo-filter">Filter PHP modules and settings</label><span class="yii-debug-phpinfo-search-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="7"/><path d="m21 21-4.3-4.3"/></svg></span><input class="yii-debug-phpinfo-search-input" id="yii-debug-phpinfo-filter" name="phpinfo-filter" type="search" autocomplete="off" spellcheck="false" aria-controls="yii-debug-phpinfo-results" data-yii-debug-phpinfo-search="true" placeholder="Search modules or settings…"><button class="yii-debug-phpinfo-search-clear" type="button" hidden aria-label="Clear PHP configuration search" data-yii-debug-phpinfo-clear="true">Clear</button>
+            </div><div class="yii-debug-phpinfo-search-feedback">
+            <span class="yii-debug-phpinfo-search-status" aria-live="polite" data-yii-debug-phpinfo-status="true"></span><span class="yii-debug-phpinfo-search-empty" hidden data-yii-debug-phpinfo-empty="true">No modules or settings match this query.</span>
+            </div>
+            </div><div id="yii-debug-phpinfo-results">
+            <section class="yii-debug-phpinfo-section" id="phpinfo-overview" data-section="Overview">
+            <div class="yii-debug-phpinfo-overview-hero">
+            <section class="yii-debug-phpinfo-overview-hero-section" aria-label="Capabilities">
+            <header class="yii-debug-phpinfo-overview-block-head">
+            <span class="yii-debug-phpinfo-overview-block-eyebrow">Capabilities</span>
+            </header><dl class="yii-debug-phpinfo-overview-hero-metrics">
+            <div class="yii-debug-phpinfo-overview-hero-metric">
+            <dt>
+            IPv6 Support
+            </dt><dd>
+            <span class="yii-debug-phpinfo-overview-pill" data-variant="success">enabled</span>
+            </dd>
+            </div>
+            </dl>
+            </section>
+            </div>
+            </section>
+            </div>
+            </div>
+            </div>
+            HTML,
+            PhpInfoRenderer::render($view),
             'Success pill must carry the success variant attribute.',
         );
     }
 
     public function testRenderSkipsConfigureCommandWhenEmpty(): void
     {
-        $html = PhpInfoRenderer::render($this->emptyView([]));
-
-        self::assertStringNotContainsString(
-            'Configure Command',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-phpinfo-shell">
+            <aside class="yii-debug-phpinfo-toc" aria-label="phpinfo modules">
+            <header class="yii-debug-phpinfo-toc-title">
+            <span>0</span><span>modules</span>
+            </header><div class="yii-debug-phpinfo-toc-groups">
+            </div>
+            </aside><div class="yii-debug-phpinfo-main">
+            <div class="yii-debug-phpinfo-search" role="search" aria-label="PHP configuration">
+            <div class="yii-debug-phpinfo-search-control">
+            <label class="yii-debug-sr-only" for="yii-debug-phpinfo-filter">Filter PHP modules and settings</label><span class="yii-debug-phpinfo-search-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="7"/><path d="m21 21-4.3-4.3"/></svg></span><input class="yii-debug-phpinfo-search-input" id="yii-debug-phpinfo-filter" name="phpinfo-filter" type="search" autocomplete="off" spellcheck="false" aria-controls="yii-debug-phpinfo-results" data-yii-debug-phpinfo-search="true" placeholder="Search modules or settings…"><button class="yii-debug-phpinfo-search-clear" type="button" hidden aria-label="Clear PHP configuration search" data-yii-debug-phpinfo-clear="true">Clear</button>
+            </div><div class="yii-debug-phpinfo-search-feedback">
+            <span class="yii-debug-phpinfo-search-status" aria-live="polite" data-yii-debug-phpinfo-status="true"></span><span class="yii-debug-phpinfo-search-empty" hidden data-yii-debug-phpinfo-empty="true">No modules or settings match this query.</span>
+            </div>
+            </div><div id="yii-debug-phpinfo-results">
+            <section class="yii-debug-phpinfo-section" id="phpinfo-overview" data-section="Overview">
+            <div class="yii-debug-phpinfo-overview-hero">
+            </div>
+            </section>
+            </div>
+            </div>
+            </div>
+            HTML,
+            PhpInfoRenderer::render($this->emptyView([])),
             'Empty Configure Command must drop the disclosure.',
         );
     }
@@ -476,63 +836,59 @@ public function testRenderSummarizesCompactModulesInOverview(): void
             configureCommand: '',
         );
 
-        $html = PhpInfoRenderer::render($view);
-
-        self::assertStringContainsString(
-            'Loaded extensions',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-phpinfo-shell">
+            <aside class="yii-debug-phpinfo-toc" aria-label="phpinfo modules">
+            <header class="yii-debug-phpinfo-toc-title">
+            <span>2</span><span>modules</span><span class="yii-debug-phpinfo-toc-title-note">1 in Overview</span>
+            </header><ul class="yii-debug-phpinfo-toc-overview">
+            <li>
+            <a class="yii-debug-phpinfo-toc-link is-active" href="#phpinfo-overview" data-toc-target="phpinfo-overview" aria-current="page">Overview</a>
+            </li>
+            </ul><div class="yii-debug-phpinfo-toc-groups">
+            <details class="yii-debug-phpinfo-toc-group" data-yii-debug-phpinfo-toc-group="true">
+            <summary class="yii-debug-phpinfo-toc-group-summary">
+            <span>Core &amp; Runtime</span><span class="yii-debug-phpinfo-toc-group-count" aria-label="1 module">1</span>
+            </summary><ul class="yii-debug-phpinfo-toc-group-list">
+            <li>
+            <a class="yii-debug-phpinfo-toc-link" href="#phpinfo-core" data-toc-target="phpinfo-core">Core</a>
+            </li>
+            </ul>
+            </details>
+            </div>
+            </aside><div class="yii-debug-phpinfo-main">
+            <div class="yii-debug-phpinfo-search" role="search" aria-label="PHP configuration">
+            <div class="yii-debug-phpinfo-search-control">
+            <label class="yii-debug-sr-only" for="yii-debug-phpinfo-filter">Filter PHP modules and settings</label><span class="yii-debug-phpinfo-search-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="7"/><path d="m21 21-4.3-4.3"/></svg></span><input class="yii-debug-phpinfo-search-input" id="yii-debug-phpinfo-filter" name="phpinfo-filter" type="search" autocomplete="off" spellcheck="false" aria-controls="yii-debug-phpinfo-results" data-yii-debug-phpinfo-search="true" placeholder="Search modules or settings…"><button class="yii-debug-phpinfo-search-clear" type="button" hidden aria-label="Clear PHP configuration search" data-yii-debug-phpinfo-clear="true">Clear</button>
+            </div><div class="yii-debug-phpinfo-search-feedback">
+            <span class="yii-debug-phpinfo-search-status" aria-live="polite" data-yii-debug-phpinfo-status="true"></span><span class="yii-debug-phpinfo-search-empty" hidden data-yii-debug-phpinfo-empty="true">No modules or settings match this query.</span>
+            </div>
+            </div><div id="yii-debug-phpinfo-results">
+            <section class="yii-debug-phpinfo-section" id="phpinfo-overview" data-section="Overview">
+            <div class="yii-debug-phpinfo-overview-hero">
+            <details class="yii-debug-disclosure yii-debug-phpinfo-extensions" aria-label="Loaded extensions" data-yii-debug-phpinfo-extensions="true">
+            <summary class="yii-debug-disclosure-summary">
+            <span class="yii-debug-disclosure-title">Loaded extensions</span><span class="yii-debug-disclosure-hint" aria-hidden="true"><span data-yii-debug-hint="collapsed">click to expand</span><span data-yii-debug-hint="expanded">click to collapse</span></span>
+            </summary><div class="yii-debug-phpinfo-extension-groups">
+            <section class="yii-debug-phpinfo-extension-group" aria-label="System &amp; Compression">
+            <header class="yii-debug-phpinfo-extension-group-head">
+            <span>System &amp; Compression</span><span class="yii-debug-phpinfo-extension-group-count" data-yii-debug-phpinfo-extension-group-count="true" data-yii-debug-phpinfo-total="1">1</span>
+            </header><div class="yii-debug-ext-strip">
+            <span class="yii-debug-ext-pill is-on" id="phpinfo-calendar" title="Calendar support: enabled" data-section="calendar" data-yii-debug-phpinfo-compact-module="true"><span class="yii-debug-ext-pill-dot" aria-hidden="true"></span><span class="yii-debug-ext-pill-label">calendar</span><span class="yii-debug-ext-pill-state">on</span><span class="yii-debug-sr-only">Calendar support: enabled</span></span>
+            </div>
+            </section>
+            </div>
+            </details>
+            </div>
+            </section><section id="phpinfo-core">Core</section>
+            </div>
+            </div>
+            </div>
+            HTML,
+            PhpInfoRenderer::render($view),
             'Facts-only modules must surface in the Overview.',
         );
-        self::assertStringContainsString(
-            'id="phpinfo-calendar"',
-            $html,
-            'Summarized modules must retain their original deep-link anchor.',
-        );
-        self::assertStringContainsString(
-            'data-yii-debug-phpinfo-compact-module="true"',
-            $html,
-            'Summarized modules must expose the search hook.',
-        );
-        self::assertStringContainsString(
-            'data-yii-debug-phpinfo-extensions="true"',
-            $html,
-            'Summarized modules must live in an identifiable disclosure.',
-        );
-        self::assertStringContainsString(
-            'data-yii-debug-phpinfo-extension-group-count="true"',
-            $html,
-            'Extension group counts must expose the enabled synchronization marker.',
-        );
-        self::assertStringContainsString(
-            'class="yii-debug-ext-pill is-on"',
-            $html,
-            'Summaries must reuse the Config panel pill, enabled variant.',
-        );
-        self::assertStringContainsString(
-            '<span class="yii-debug-ext-pill-state">on</span>',
-            $html,
-            'A module without a version must fall back to the on/off state.',
-        );
-        self::assertStringContainsString(
-            '<span class="yii-debug-sr-only">Calendar support: enabled</span>',
-            $html,
-            'Facts the pill cannot show must stay reachable and searchable.',
-        );
-        self::assertStringNotContainsString(
-            'href="#phpinfo-calendar"',
-            $html,
-            'Summarized modules must not keep an almost-empty sidebar destination.',
-        );
-        self::assertStringContainsString(
-            '<span>2</span><span>modules</span>',
-            $html,
-            'The sidebar total must include detailed and summarized modules.',
-        );
-        self::assertStringContainsString(
-            '1 in Overview',
-            $html,
-            'The sidebar must explain where summarized modules moved.',
-        );
     }
 
     public function testRenderSurfacesVersionAndDisabledStateInCompactPills(): void
@@ -582,28 +938,56 @@ public function testRenderSurfacesVersionAndDisabledStateInCompactPills(): void
             configureCommand: '',
         );
 
-        $html = PhpInfoRenderer::render($view);
-
-        self::assertStringContainsString(
-            '<span class="yii-debug-ext-pill-state">3.53.3</span>',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-phpinfo-shell">
+            <aside class="yii-debug-phpinfo-toc" aria-label="phpinfo modules">
+            <header class="yii-debug-phpinfo-toc-title">
+            <span>2</span><span>modules</span><span class="yii-debug-phpinfo-toc-title-note">2 in Overview</span>
+            </header><ul class="yii-debug-phpinfo-toc-overview">
+            <li>
+            <a class="yii-debug-phpinfo-toc-link is-active" href="#phpinfo-overview" data-toc-target="phpinfo-overview" aria-current="page">Overview</a>
+            </li>
+            </ul><div class="yii-debug-phpinfo-toc-groups">
+            </div>
+            </aside><div class="yii-debug-phpinfo-main">
+            <div class="yii-debug-phpinfo-search" role="search" aria-label="PHP configuration">
+            <div class="yii-debug-phpinfo-search-control">
+            <label class="yii-debug-sr-only" for="yii-debug-phpinfo-filter">Filter PHP modules and settings</label><span class="yii-debug-phpinfo-search-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="7"/><path d="m21 21-4.3-4.3"/></svg></span><input class="yii-debug-phpinfo-search-input" id="yii-debug-phpinfo-filter" name="phpinfo-filter" type="search" autocomplete="off" spellcheck="false" aria-controls="yii-debug-phpinfo-results" data-yii-debug-phpinfo-search="true" placeholder="Search modules or settings…"><button class="yii-debug-phpinfo-search-clear" type="button" hidden aria-label="Clear PHP configuration search" data-yii-debug-phpinfo-clear="true">Clear</button>
+            </div><div class="yii-debug-phpinfo-search-feedback">
+            <span class="yii-debug-phpinfo-search-status" aria-live="polite" data-yii-debug-phpinfo-status="true"></span><span class="yii-debug-phpinfo-search-empty" hidden data-yii-debug-phpinfo-empty="true">No modules or settings match this query.</span>
+            </div>
+            </div><div id="yii-debug-phpinfo-results">
+            <section class="yii-debug-phpinfo-section" id="phpinfo-overview" data-section="Overview">
+            <div class="yii-debug-phpinfo-overview-hero">
+            <details class="yii-debug-disclosure yii-debug-phpinfo-extensions" aria-label="Loaded extensions" data-yii-debug-phpinfo-extensions="true">
+            <summary class="yii-debug-disclosure-summary">
+            <span class="yii-debug-disclosure-title">Loaded extensions</span><span class="yii-debug-disclosure-hint" aria-hidden="true"><span data-yii-debug-hint="collapsed">click to expand</span><span data-yii-debug-hint="expanded">click to collapse</span></span>
+            </summary><div class="yii-debug-phpinfo-extension-groups">
+            <section class="yii-debug-phpinfo-extension-group" aria-label="Database">
+            <header class="yii-debug-phpinfo-extension-group-head">
+            <span>Database</span><span class="yii-debug-phpinfo-extension-group-count" data-yii-debug-phpinfo-extension-group-count="true" data-yii-debug-phpinfo-total="1">1</span>
+            </header><div class="yii-debug-ext-strip">
+            <span class="yii-debug-ext-pill is-on" id="phpinfo-pdo-sqlite" title="PDO Driver for SQLite 3.x: enabled · SQLite Library: 3.53.3" data-section="pdo_sqlite" data-yii-debug-phpinfo-compact-module="true"><span class="yii-debug-ext-pill-dot" aria-hidden="true"></span><span class="yii-debug-ext-pill-label">pdo_sqlite</span><span class="yii-debug-ext-pill-state">3.53.3</span><span class="yii-debug-sr-only">PDO Driver for SQLite 3.x: enabled · SQLite Library: 3.53.3</span></span>
+            </div>
+            </section><section class="yii-debug-phpinfo-extension-group" aria-label="System &amp; Compression">
+            <header class="yii-debug-phpinfo-extension-group-head">
+            <span>System &amp; Compression</span><span class="yii-debug-phpinfo-extension-group-count" data-yii-debug-phpinfo-extension-group-count="true" data-yii-debug-phpinfo-total="1">1</span>
+            </header><div class="yii-debug-ext-strip">
+            <span class="yii-debug-ext-pill is-off" id="phpinfo-sysvshm" title="sysvshm support: disabled · Version: 1.2.3" data-section="sysvshm" data-yii-debug-phpinfo-compact-module="true"><span class="yii-debug-ext-pill-dot" aria-hidden="true"></span><span class="yii-debug-ext-pill-label">sysvshm</span><span class="yii-debug-ext-pill-state">1.2.3</span><span class="yii-debug-sr-only">sysvshm support: disabled · Version: 1.2.3</span></span>
+            </div>
+            </section>
+            </div>
+            </details>
+            </div>
+            </section>
+            </div>
+            </div>
+            </div>
+            HTML,
+            PhpInfoRenderer::render($view),
             'The state slot must prefer the version over a redundant on.',
         );
-        self::assertStringContainsString(
-            'class="yii-debug-ext-pill is-off"',
-            $html,
-            'A module reporting only a muted fact must render as `is-off`.',
-        );
-        self::assertStringContainsString(
-            '<span class="yii-debug-ext-pill-state">1.2.3</span>',
-            $html,
-            'A disabled module must still surface a version reported after its muted status.',
-        );
-        self::assertStringContainsString(
-            'title="PDO Driver for SQLite 3.x: enabled · SQLite Library: 3.53.3"',
-            $html,
-            'Every fact must survive in the tooltip.',
-        );
     }
 
     public function testRenderUsesUnicodeAwareStrictWideTileBoundary(): void
@@ -617,6 +1001,7 @@ public function testRenderUsesUnicodeAwareStrictWideTileBoundary(): void
                 new PhpInfoTile('Path', '/x', '/x', PhpInfoTile::KIND_PATH),
             ],
         );
+
         $html = PhpInfoRenderer::render(new PhpInfoView([$section], [], [], '', ''));
 
         foreach (['Boundary', 'Unicode', 'Short'] as $label) {
@@ -635,7 +1020,7 @@ public function testRenderUsesUnicodeAwareStrictWideTileBoundary(): void
 
     public function testRenderViaNormalizerSnapshotProducesExpectedAnchors(): void
     {
-        $body = <<<'HTML'
+        $body = <<<HTML
         <h2>apcu</h2>
         <table>
         <tr><td>Version</td><td>5.1</td></tr>
@@ -644,24 +1029,88 @@ public function testRenderViaNormalizerSnapshotProducesExpectedAnchors(): void
         </table>
         HTML;
 
-        $view = PhpInfoDataNormalizer::fromOutput($body, '8.5.3', 'cli', 'Linux', '128M');
-        $html = PhpInfoRenderer::render($view);
+        $view = PhpInfoDataNormalizer::fromOutput(
+            $body,
+            '8.5.3',
+            'cli',
+            'Linux',
+            '128M',
+        );
 
-        self::assertStringContainsString(
-            'id="phpinfo-overview"',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-phpinfo-shell">
+            <aside class="yii-debug-phpinfo-toc" aria-label="phpinfo modules">
+            <header class="yii-debug-phpinfo-toc-title">
+            <span>1</span><span>modules</span>
+            </header><ul class="yii-debug-phpinfo-toc-overview">
+            <li>
+            <a class="yii-debug-phpinfo-toc-link is-active" href="#phpinfo-overview" data-toc-target="phpinfo-overview" aria-current="page">Overview</a>
+            </li>
+            </ul><div class="yii-debug-phpinfo-toc-groups">
+            <details class="yii-debug-phpinfo-toc-group" data-yii-debug-phpinfo-toc-group="true">
+            <summary class="yii-debug-phpinfo-toc-group-summary">
+            <span>Core &amp; Runtime</span><span class="yii-debug-phpinfo-toc-group-count" aria-label="1 module">1</span>
+            </summary><ul class="yii-debug-phpinfo-toc-group-list">
+            <li>
+            <a class="yii-debug-phpinfo-toc-link" href="#phpinfo-apcu" data-toc-target="phpinfo-apcu">apcu</a>
+            </li>
+            </ul>
+            </details>
+            </div>
+            </aside><div class="yii-debug-phpinfo-main">
+            <div class="yii-debug-phpinfo-search" role="search" aria-label="PHP configuration">
+            <div class="yii-debug-phpinfo-search-control">
+            <label class="yii-debug-sr-only" for="yii-debug-phpinfo-filter">Filter PHP modules and settings</label><span class="yii-debug-phpinfo-search-icon" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="7"/><path d="m21 21-4.3-4.3"/></svg></span><input class="yii-debug-phpinfo-search-input" id="yii-debug-phpinfo-filter" name="phpinfo-filter" type="search" autocomplete="off" spellcheck="false" aria-controls="yii-debug-phpinfo-results" data-yii-debug-phpinfo-search="true" placeholder="Search modules or settings…"><button class="yii-debug-phpinfo-search-clear" type="button" hidden aria-label="Clear PHP configuration search" data-yii-debug-phpinfo-clear="true">Clear</button>
+            </div><div class="yii-debug-phpinfo-search-feedback">
+            <span class="yii-debug-phpinfo-search-status" aria-live="polite" data-yii-debug-phpinfo-status="true"></span><span class="yii-debug-phpinfo-search-empty" hidden data-yii-debug-phpinfo-empty="true">No modules or settings match this query.</span>
+            </div>
+            </div><div id="yii-debug-phpinfo-results">
+            <section class="yii-debug-phpinfo-section" id="phpinfo-overview" data-section="Overview">
+            <div class="yii-debug-phpinfo-overview-hero">
+            <section class="yii-debug-phpinfo-overview-hero-section" aria-label="PHP version">
+            <header class="yii-debug-phpinfo-overview-block-head">
+            <span class="yii-debug-phpinfo-overview-block-eyebrow">PHP version</span>
+            </header><div class="yii-debug-phpinfo-overview-hero-headline">
+            <strong class="yii-debug-phpinfo-overview-hero-version">8.5.3</strong><span class="yii-debug-phpinfo-overview-hero-mark" aria-hidden="true">php</span>
+            </div><dl class="yii-debug-phpinfo-overview-hero-metrics">
+            <div class="yii-debug-phpinfo-overview-hero-metric">
+            <dt>
+            SAPI
+            </dt><dd>
+            <code>cli</code>
+            </dd>
+            </div><div class="yii-debug-phpinfo-overview-hero-metric">
+            <dt>
+            OS
+            </dt><dd>
+            <code>Linux</code>
+            </dd>
+            </div><div class="yii-debug-phpinfo-overview-hero-metric">
+            <dt>
+            Memory limit
+            </dt><dd>
+            <code>128M</code>
+            </dd>
+            </div>
+            </dl>
+            </section>
+            </div>
+            </section><section class="yii-debug-phpinfo-section yii-debug-phpinfo-module" id="phpinfo-apcu" data-section="apcu"><header class="yii-debug-phpinfo-module-head"><h2 id="phpinfo-apcu-heading">apcu</h2></header>
+            <div class="yii-debug-table-wrap yii-debug-phpinfo-table-section is-facts"><header class="yii-debug-phpinfo-table-section-head"><span>Module information</span><span class="yii-debug-phpinfo-table-section-count">3 values</span></header><div class="yii-debug-phpinfo-table-scroll"><table aria-label="Module information" class="yii-debug-table is-facts">
+            <tr class="yii-debug-phpinfo-fact"><td>Version</td><td>5.1</td></tr>
+            <tr class="yii-debug-phpinfo-fact"><td>Debug</td><td>disabled</td></tr>
+            <tr class="yii-debug-phpinfo-fact"><td>MMAP</td><td>enabled</td></tr>
+            </table></div></div></section>
+            </div>
+            </div>
+            </div>
+            HTML,
+            PhpInfoRenderer::render($view),
             'Overview anchor must surface in the rendered shell.',
         );
-        self::assertStringContainsString(
-            'id="phpinfo-apcu"',
-            $html,
-            'Module anchor must surface in the rendered shell.',
-        );
-        self::assertStringContainsString(
-            'href="#phpinfo-apcu"',
-            $html,
-            'TOC must link to the module anchor.',
-        );
+
+
     }
 
     /**
diff --git a/tests/Provider/PhpInfoDataNormalizerProvider.php b/tests/Provider/PhpInfoDataNormalizerProvider.php
index 50c1fb4..be0b2ff 100644
--- a/tests/Provider/PhpInfoDataNormalizerProvider.php
+++ b/tests/Provider/PhpInfoDataNormalizerProvider.php
@@ -6,10 +6,6 @@
 
 /**
  * Data provider for {@see \PHPForge\Debug\Tests\PhpInfo\PhpInfoDataNormalizerTest} test cases.
- *
- * Provides the leading header row of a data table paired with the label the head bar must show.
- *
- * @since 0.1
  */
 final class PhpInfoDataNormalizerProvider
 {
diff --git a/tests/Storage/DebugArrayTest.php b/tests/Storage/DebugArrayTest.php
index 64dcf1b..544233e 100644
--- a/tests/Storage/DebugArrayTest.php
+++ b/tests/Storage/DebugArrayTest.php
@@ -10,8 +10,6 @@
 
 /**
  * Unit tests for {@see DebugArray} covering the array-typed facade over {@see DebugValue}.
- *
- * @since 0.1
  */
 #[Group('storage')]
 final class DebugArrayTest extends TestCase
diff --git a/tests/Storage/DebugValueTest.php b/tests/Storage/DebugValueTest.php
index 1d2625d..1baa200 100644
--- a/tests/Storage/DebugValueTest.php
+++ b/tests/Storage/DebugValueTest.php
@@ -465,6 +465,37 @@ public function testCaptureUsesTheCanonicalClosureLabel(): void
         );
     }
 
+    public function testHydrationAcceptsAnEmptyDecodedObjectBeforeValidatingItsShape(): void
+    {
+        $this->expectException(HydrationException::class);
+        $this->expectExceptionMessage(
+            '$.type',
+        );
+
+        DebugValue::fromArray([]);
+    }
+
+    public function testHydrationRejectsTheFirstLevelBeyondTheDepthBudget(): void
+    {
+        $payload = ['type' => 'null'];
+
+        for ($depth = 0; $depth < 11; $depth++) {
+            $payload = [
+                'type' => 'array',
+                'entries' => [
+                    ['keyType' => 'int', 'key' => 0, 'value' => $payload],
+                ],
+            ];
+        }
+
+        $this->expectException(HydrationException::class);
+        $this->expectExceptionMessage(
+            'at most 10 nested levels',
+        );
+
+        DebugValue::fromArray($payload);
+    }
+
     public function testRoundTripPreservesJsonSafeValuesAndLabelsUnsafeValues(): void
     {
         $object = new stdClass();
@@ -586,6 +617,42 @@ public function testThrowHydrationExceptionForAnUnsupportedBinaryEncoding(): voi
         DebugValue::fromArray(['type' => 'binary', 'encoding' => 'hex', 'data' => 'ff']);
     }
 
+    public function testThrowHydrationExceptionForEveryInvalidTaggedFieldKind(): void
+    {
+        $cases = [
+            [['type' => 'bool', 'value' => 1], '$.value'],
+            [
+                [
+                    'type' => 'array',
+                    'entries' => [['keyType' => 1, 'key' => 0, 'value' => ['type' => 'null']]],
+                ],
+                '$.entries[0].keyType',
+            ],
+            [['type' => 'int', 'value' => '1'], '$.value'],
+            [['type' => 'array', 'entries' => ['entry' => []]], '$.entries'],
+            [['type' => 'object', 'value' => 1, 'entries' => [], 'class' => 'Fixture'], '$.value'],
+            [['type' => 'float', 'value' => '1.0'], '$.value'],
+            ['invalid', '$'],
+            [['type' => 'null', 0 => 'unexpected'], '$'],
+            [['type' => 'string', 'value' => 1], '$.value'],
+            [['type' => 1], '$.type'],
+            [['type' => 'bool'], '$.value'],
+        ];
+
+        foreach ($cases as [$payload, $path]) {
+            try {
+                DebugValue::fromArray($payload);
+                self::fail("Expected invalid tagged payload at {$path} to fail hydration.");
+            } catch (HydrationException $exception) {
+                self::assertStringContainsString(
+                    $path,
+                    $exception->getMessage(),
+                    "Invalid tagged payload must identify {$path}.",
+                );
+            }
+        }
+    }
+
     public function testThrowHydrationExceptionForFieldsThatDoNotBelongToTheTaggedType(): void
     {
         $this->expectException(HydrationException::class);
diff --git a/tests/Storage/ExceptionSnapshotTest.php b/tests/Storage/ExceptionSnapshotTest.php
index 5b5692a..757f9e1 100644
--- a/tests/Storage/ExceptionSnapshotTest.php
+++ b/tests/Storage/ExceptionSnapshotTest.php
@@ -19,7 +19,9 @@ final class ExceptionSnapshotTest extends TestCase
     public function testThrowableCaptureRedactsMessagesAndOmitsTraceArguments(): void
     {
         $throwable = $this->exceptionContainingSecret('do-not-persist');
+
         $snapshot = ExceptionSnapshot::fromThrowable($throwable);
+
         $serialized = json_encode($snapshot, JSON_THROW_ON_ERROR);
 
         self::assertStringNotContainsString(
diff --git a/tests/Storage/SnapshotStoreTest.php b/tests/Storage/SnapshotStoreTest.php
index 4e225c4..9defb27 100644
--- a/tests/Storage/SnapshotStoreTest.php
+++ b/tests/Storage/SnapshotStoreTest.php
@@ -88,7 +88,12 @@ public function testClearThrowsWhenAStoredFileCannotBeRemoved(): void
     public function testCommittedTransactionJournalKeepsCommittedData(): void
     {
         $store = $this->store();
-        $store->writeSnapshot(new DebugSnapshot($this->summary('current', 1.0), [], []), 10);
+
+        $store->writeSnapshot(
+            new DebugSnapshot($this->summary('current', 1.0), [], []),
+            10,
+        );
+
         file_put_contents(
             "{$this->path}/.debug-transaction.json",
             json_encode(
@@ -103,7 +108,10 @@ public function testCommittedTransactionJournalKeepsCommittedData(): void
             ),
         );
 
-        self::assertNotNull($store->readSnapshot('current'), 'Committed transaction data must remain visible.');
+        self::assertNotNull(
+            $store->readSnapshot('current'),
+            'Committed transaction data must remain visible.',
+        );
         self::assertFileDoesNotExist(
             "{$this->path}/.debug-transaction.json",
             'Committed journal must be cleaned during recovery.',
@@ -113,17 +121,28 @@ public function testCommittedTransactionJournalKeepsCommittedData(): void
     public function testEmptyManifestRebuildsValidSnapshotHistory(): void
     {
         $store = $this->store();
-        $store->writeSnapshot(new DebugSnapshot($this->summary('older', 1.0), [], []), 10);
+
+        $store->writeSnapshot(
+            new DebugSnapshot($this->summary('older', 1.0), [], []),
+            10,
+        );
+
         file_put_contents("{$this->path}/index.json", '');
 
-        $store->writeSnapshot(new DebugSnapshot($this->summary('newer', 2.0), [], []), 10);
+        $store->writeSnapshot(
+            new DebugSnapshot($this->summary('newer', 2.0), [], []),
+            10,
+        );
 
         self::assertSame(
             ['newer', 'older'],
             array_keys($store->loadManifest()),
             'An empty index file must rebuild from valid snapshot envelopes instead of erasing history.',
         );
-        self::assertNotNull($store->readSnapshot('older'), 'A valid snapshot must survive empty-index recovery.');
+        self::assertNotNull(
+            $store->readSnapshot('older'),
+            'A valid snapshot must survive empty-index recovery.',
+        );
     }
 
 
@@ -224,18 +243,32 @@ public function testInvalidJsonIsRejectedWithoutExecutingPayloads(): void
     public function testInvalidManifestRebuildsValidSnapshotHistory(): void
     {
         $store = $this->store();
-        $store->writeSnapshot(new DebugSnapshot($this->summary('oldest', 1.0), [], []), 10);
-        $store->writeSnapshot(new DebugSnapshot($this->summary('older', 2.0), [], []), 10);
+
+        $store->writeSnapshot(
+            new DebugSnapshot($this->summary('oldest', 1.0), [], []),
+            10,
+        );
+        $store->writeSnapshot(
+            new DebugSnapshot($this->summary('older', 2.0), [], []),
+            10,
+        );
+
         file_put_contents("{$this->path}/index.json", '{invalid');
 
-        $store->writeSnapshot(new DebugSnapshot($this->summary('newer', 3.0), [], []), 10);
+        $store->writeSnapshot(
+            new DebugSnapshot($this->summary('newer', 3.0), [], []),
+            10,
+        );
 
         self::assertSame(
             ['newer', 'older', 'oldest'],
             array_keys($store->loadManifest()),
             'A corrupt index must be rebuilt from valid snapshot envelopes before appending new history.',
         );
-        self::assertNotNull($store->readSnapshot('older'), 'A valid snapshot must survive index recovery.');
+        self::assertNotNull(
+            $store->readSnapshot('older'),
+            'A valid snapshot must survive index recovery.',
+        );
     }
 
     public function testInvalidManifestResetsStaleSnapshots(): void
@@ -270,26 +303,59 @@ public function testInvalidManifestResetsStaleSnapshots(): void
     public function testInvalidManifestSkipsInvalidAndEmptySnapshotFiles(): void
     {
         $store = $this->store();
-        $store->writeSnapshot(new DebugSnapshot($this->summary('valid', 1.0), [], []), 10);
+
+        $store->writeSnapshot(
+            new DebugSnapshot($this->summary('valid', 1.0), [], []),
+            10,
+        );
+
         file_put_contents("{$this->path}/index.json", '{invalid');
         file_put_contents("{$this->path}/7.json", '{}');
         file_put_contents("{$this->path}/empty.json", '');
 
-        $store->writeSnapshot(new DebugSnapshot($this->summary('newer', 2.0), [], []), 10);
+        $store->writeSnapshot(
+            new DebugSnapshot($this->summary('newer', 2.0), [], []),
+            10,
+        );
 
-        self::assertSame(['newer', 'valid'], array_keys($store->loadManifest()), 'Only valid envelopes may rebuild.');
-        self::assertFileDoesNotExist("{$this->path}/7.json", 'Invalid tag file must be removed during reconciliation.');
-        self::assertFileDoesNotExist("{$this->path}/empty.json", 'Empty snapshot must be removed during reconciliation.');
+        self::assertSame(
+            [
+                'newer',
+                'valid',
+            ],
+            array_keys($store->loadManifest()),
+            'Only valid envelopes may rebuild.',
+        );
+        self::assertFileDoesNotExist(
+            "{$this->path}/7.json",
+            'Invalid tag file must be removed during reconciliation.',
+        );
+        self::assertFileDoesNotExist(
+            "{$this->path}/empty.json",
+            'Empty snapshot must be removed during reconciliation.',
+        );
     }
 
     public function testInvalidTransactionJournalMakesReadsFailClosed(): void
     {
         $store = $this->store();
-        $store->writeSnapshot(new DebugSnapshot($this->summary('current', 1.0), [], []), 10);
+
+        $store->writeSnapshot(
+            new DebugSnapshot($this->summary('current', 1.0), [], []),
+            10,
+        );
+
         file_put_contents("{$this->path}/.debug-transaction.json", '{invalid');
 
-        self::assertNull($store->readSnapshot('current'), 'Malformed transaction state must fail closed.');
-        self::assertSame([], $store->loadManifest(), 'Malformed transaction state must not expose a partial manifest.');
+        self::assertNull(
+            $store->readSnapshot('current'),
+            'Malformed transaction state must fail closed.',
+        );
+        self::assertSame(
+            [],
+            $store->loadManifest(),
+            'Malformed transaction state must not expose a partial manifest.',
+        );
     }
 
     public function testInvalidTransactionJournalShapeAndStateFailClosed(): void
@@ -301,7 +367,12 @@ public function testInvalidTransactionJournalShapeAndStateFailClosed(): void
             "{$this->path}/.debug-transaction.json",
             json_encode(['version' => 99], JSON_THROW_ON_ERROR),
         );
-        self::assertSame([], $this->store()->loadManifest(), 'Invalid journal shape must fail closed.');
+
+        self::assertSame(
+            [],
+            $this->store()->loadManifest(),
+            'Invalid journal shape must fail closed.',
+        );
 
         file_put_contents(
             "{$this->path}/.debug-transaction.json",
@@ -316,7 +387,12 @@ public function testInvalidTransactionJournalShapeAndStateFailClosed(): void
                 JSON_THROW_ON_ERROR,
             ),
         );
-        self::assertSame([], $this->store()->loadManifest(), 'Unknown journal state must fail closed.');
+
+        self::assertSame(
+            [],
+            $this->store()->loadManifest(),
+            'Unknown journal state must fail closed.',
+        );
     }
 
     public function testLoadManifestReturnsNothingWhenTheLockFileCannotBeOpened(): void
@@ -377,17 +453,34 @@ public function testManifestReadResultDistinguishesEmptyStoreFromCorruptManifest
 
         $empty = $store->loadManifestResult();
 
-        self::assertSame([], $empty->entries, 'A store that does not exist yet must have no entries.');
-        self::assertNull($empty->error, 'A store that does not exist yet must not be reported as a read failure.');
+        self::assertSame(
+            [],
+            $empty->entries,
+            'A store that does not exist yet must have no entries.',
+        );
+        self::assertNull(
+            $empty->error,
+            'A store that does not exist yet must not be reported as a read failure.',
+        );
 
         mkdir($this->path, recursive: true);
         file_put_contents("{$this->path}/index.json", '{invalid');
 
         $corrupt = $store->loadManifestResult();
 
-        self::assertSame([], $corrupt->entries, 'A corrupt manifest must remain fail-closed.');
-        self::assertNotNull($corrupt->error, 'A corrupt manifest must expose a diagnostic through the additive API.');
-        self::assertNotNull($corrupt->error->getPrevious(), 'The decoding failure must remain available for logging.');
+        self::assertSame(
+            [],
+            $corrupt->entries,
+            'A corrupt manifest must remain fail-closed.',
+        );
+        self::assertNotNull(
+            $corrupt->error,
+            'A corrupt manifest must expose a diagnostic through the additive API.',
+        );
+        self::assertNotNull(
+            $corrupt->error->getPrevious(),
+            'The decoding failure must remain available for logging.',
+        );
     }
 
     public function testManifestReadResultReportsEmptyAndUnreadableManifestFiles(): void
@@ -452,6 +545,7 @@ public function testPreparedFirstWriteTransactionRemovesPartialFiles(): void
     {
         mkdir($this->path, recursive: true);
         touch("{$this->path}/index.lock");
+
         file_put_contents(
             "{$this->path}/current.json",
             json_encode(new DebugSnapshot($this->summary('current', 1.0), [], []), JSON_THROW_ON_ERROR),
@@ -470,16 +564,31 @@ public function testPreparedFirstWriteTransactionRemovesPartialFiles(): void
             ),
         );
 
-        self::assertNull($this->store()->readSnapshot('current'), 'Interrupted first write must roll back to no data.');
-        self::assertFileDoesNotExist("{$this->path}/current.json", 'Partial first snapshot must be removed.');
-        self::assertFileDoesNotExist("{$this->path}/index.json", 'Partial first manifest must be removed.');
+        self::assertNull(
+            $this->store()->readSnapshot('current'),
+            'Interrupted first write must roll back to no data.',
+        );
+        self::assertFileDoesNotExist(
+            "{$this->path}/current.json",
+            'Partial first snapshot must be removed.',
+        );
+        self::assertFileDoesNotExist(
+            "{$this->path}/index.json",
+            'Partial first manifest must be removed.',
+        );
     }
 
     public function testPreparedTransactionIsRolledBackBeforeRead(): void
     {
         $store = $this->store();
+
         $oldSnapshot = new DebugSnapshot($this->summary('current', 1.0), ['panel' => ['value' => 'old']], []);
-        $store->writeSnapshot($oldSnapshot, 10);
+
+        $store->writeSnapshot(
+            $oldSnapshot,
+            10,
+        );
+
         $snapshotBefore = file_get_contents("{$this->path}/current.json");
         $manifestBefore = file_get_contents("{$this->path}/index.json");
 
@@ -509,8 +618,15 @@ public function testPreparedTransactionIsRolledBackBeforeRead(): void
 
         $recovered = $store->readSnapshot('current');
 
-        self::assertNotNull($recovered, 'Prepared transaction must recover the previous snapshot.');
-        self::assertSame(['value' => 'old'], $recovered->panels['panel'] ?? null, 'Recovery must restore old detail.');
+        self::assertNotNull(
+            $recovered,
+            'Prepared transaction must recover the previous snapshot.',
+        );
+        self::assertSame(
+            ['value' => 'old'],
+            $recovered->panels['panel'] ?? null,
+            'Recovery must restore old detail.',
+        );
         self::assertFileDoesNotExist(
             "{$this->path}/.debug-transaction.json",
             'Successful recovery must remove the prepared journal.',
@@ -521,6 +637,7 @@ public function testPreparedTransactionKeepsJournalWhenRollbackDeletionFails():
     {
         mkdir($this->path, recursive: true);
         touch("{$this->path}/index.lock");
+
         file_put_contents(
             "{$this->path}/current.json",
             json_encode(new DebugSnapshot($this->summary('current', 1.0), [], []), JSON_THROW_ON_ERROR),
@@ -563,7 +680,12 @@ public function testPreparedTransactionKeepsJournalWhenRollbackDeletionFails():
     public function testReadRejectsSnapshotWhoseEnvelopeTagDoesNotMatchFilename(): void
     {
         $store = $this->store();
-        $store->writeSnapshot(new DebugSnapshot($this->summary('source', 1.0), [], []), 10);
+
+        $store->writeSnapshot(
+            new DebugSnapshot($this->summary('source', 1.0), [], []),
+            10,
+        );
+
         copy("{$this->path}/source.json", "{$this->path}/renamed.json");
 
         self::assertNull(
@@ -637,10 +759,18 @@ public function testRemovesOrphanSnapshotsMissingFromTheManifest(): void
     public function testRetriesOrphanSnapshotCleanupAfterEverySuccessfulCommit(): void
     {
         $store = $this->store();
-        $store->writeSnapshot(new DebugSnapshot($this->summary('kept', 1.0), [], []), 10);
+
+        $store->writeSnapshot(
+            new DebugSnapshot($this->summary('kept', 1.0), [], []),
+            10,
+        );
+
         file_put_contents("{$this->path}/orphan.json", '{}');
 
-        $store->writeSnapshot(new DebugSnapshot($this->summary('newer', 2.0), [], []), 10);
+        $store->writeSnapshot(
+            new DebugSnapshot($this->summary('newer', 2.0), [], []),
+            10,
+        );
 
         self::assertFileDoesNotExist(
             "{$this->path}/orphan.json",
@@ -727,12 +857,21 @@ public function testSnapshotReadResultDistinguishesMissingInvalidAndCorruptSnaps
 
         $missing = $store->readSnapshotResult('missing');
 
-        self::assertNull($missing->snapshot, 'A missing snapshot must have no value.');
-        self::assertNull($missing->error, 'A missing snapshot in an empty store must not be a read error.');
+        self::assertNull(
+            $missing->snapshot,
+            'A missing snapshot must have no value.',
+        );
+        self::assertNull(
+            $missing->error,
+            'A missing snapshot in an empty store must not be a read error.',
+        );
 
         $invalid = $store->readSnapshotResult('../outside');
 
-        self::assertNull($invalid->snapshot, 'An invalid tag must have no value.');
+        self::assertNull(
+            $invalid->snapshot,
+            'An invalid tag must have no value.',
+        );
         self::assertSame(
             'Invalid debug snapshot tag: ../outside',
             $invalid->error?->getMessage(),
@@ -744,9 +883,18 @@ public function testSnapshotReadResultDistinguishesMissingInvalidAndCorruptSnaps
 
         $corrupt = $store->readSnapshotResult('corrupt');
 
-        self::assertNull($corrupt->snapshot, 'A corrupt snapshot must remain fail-closed.');
-        self::assertNotNull($corrupt->error, 'A corrupt snapshot must expose a diagnostic.');
-        self::assertNotNull($corrupt->error->getPrevious(), 'The hydration failure must remain available for logging.');
+        self::assertNull(
+            $corrupt->snapshot,
+            'A corrupt snapshot must remain fail-closed.',
+        );
+        self::assertNotNull(
+            $corrupt->error,
+            'A corrupt snapshot must expose a diagnostic.',
+        );
+        self::assertNotNull(
+            $corrupt->error->getPrevious(),
+            'The hydration failure must remain available for logging.',
+        );
     }
 
     public function testSnapshotReadResultReportsEmptyMismatchAndUnreadableFiles(): void
@@ -765,6 +913,7 @@ public function testSnapshotReadResultReportsEmptyMismatchAndUnreadableFiles():
         );
 
         $snapshot = new DebugSnapshot($this->summary('source', 1.0), [], []);
+
         file_put_contents("{$this->path}/renamed.json", json_encode($snapshot, JSON_THROW_ON_ERROR));
 
         self::assertSame(
@@ -818,12 +967,23 @@ public function testSnapshotReadResultReportsInvalidPathAndLockFailure(): void
     public function testSnapshotReadResultReturnsPersistedSnapshotWithoutAnError(): void
     {
         $store = $this->store();
-        $store->writeSnapshot(new DebugSnapshot($this->summary('current', 1.0), [], []), 10);
+
+        $store->writeSnapshot(
+            new DebugSnapshot($this->summary('current', 1.0), [], []),
+            10,
+        );
 
         $result = $store->readSnapshotResult('current');
 
-        self::assertSame('current', $result->snapshot?->summary->tag, 'A valid snapshot must remain available.');
-        self::assertNull($result->error, 'A valid snapshot must not produce a read diagnostic.');
+        self::assertSame(
+            'current',
+            $result->snapshot?->summary->tag,
+            'A valid snapshot must remain available.',
+        );
+        self::assertNull(
+            $result->error,
+            'A valid snapshot must not produce a read diagnostic.',
+        );
     }
 
     /**
@@ -965,7 +1125,9 @@ public function testThrowStorageExceptionWhenDirectoryModeCannotBeApplied(): voi
         );
 
         $this->expectException(StorageException::class);
-        $this->expectExceptionMessage('Unable to apply debug data directory mode');
+        $this->expectExceptionMessage(
+            'Unable to apply debug data directory mode',
+        );
 
         (new SnapshotStore($this->path, 0o700, 0o600))->writeSnapshot(
             new DebugSnapshot($this->summary('current', 1.0), [], []),
@@ -986,7 +1148,9 @@ public function testThrowStorageExceptionWhenFileModeCannotBeApplied(): void
         );
 
         $this->expectException(StorageException::class);
-        $this->expectExceptionMessage('Unable to apply debug data file mode');
+        $this->expectExceptionMessage(
+            'Unable to apply debug data file mode',
+        );
 
         (new SnapshotStore($this->path, 0o700, 0o600))->writeSnapshot(
             new DebugSnapshot($this->summary('current', 1.0), [], []),
@@ -1243,7 +1407,12 @@ public function testWriteAppliesConfiguredFileMode(): void
     public function testWritePreservesPrimaryFailureWhenImmediateRollbackAlsoFails(): void
     {
         $store = $this->store();
-        $store->writeSnapshot(new DebugSnapshot($this->summary('current', 1.0), [], []), 10);
+
+        $store->writeSnapshot(
+            new DebugSnapshot($this->summary('current', 1.0), [], []),
+            10,
+        );
+
         $temporaryFileCalls = 0;
 
         MockerState::addCondition(
@@ -1258,9 +1427,14 @@ static function (string $directory, string $prefix) use (&$temporaryFileCalls):
         );
 
         $this->expectException(StorageException::class);
-        $this->expectExceptionMessage('Unable to write temporary debug data file');
+        $this->expectExceptionMessage(
+            'Unable to write temporary debug data file',
+        );
 
-        $store->writeSnapshot(new DebugSnapshot($this->summary('current', 2.0), [], []), 10);
+        $store->writeSnapshot(
+            new DebugSnapshot($this->summary('current', 2.0), [], []),
+            10,
+        );
     }
 
     public function testWriteRejectsUnreadableExistingTransactionTarget(): void
@@ -1270,27 +1444,46 @@ public function testWriteRejectsUnreadableExistingTransactionTarget(): void
         }
 
         $store = $this->store();
-        $store->writeSnapshot(new DebugSnapshot($this->summary('current', 1.0), [], []), 10);
+
+        $store->writeSnapshot(
+            new DebugSnapshot($this->summary('current', 1.0), [], []),
+            10,
+        );
+
         chmod("{$this->path}/current.json", 0o000);
 
         $this->expectException(StorageException::class);
-        $this->expectExceptionMessage('Unable to read debug data file');
+        $this->expectExceptionMessage(
+            'Unable to read debug data file',
+        );
 
-        $store->writeSnapshot(new DebugSnapshot($this->summary('current', 2.0), [], []), 10);
+        $store->writeSnapshot(
+            new DebugSnapshot($this->summary('current', 2.0), [], []),
+            10,
+        );
     }
 
     public function testWriteRejectsUnreadableManifest(): void
     {
         if (PHP_OS_FAMILY === 'Windows') {
-            self::markTestSkipped('POSIX read permissions are not portable to Windows.');
+            self::markTestSkipped(
+                'POSIX read permissions are not portable to Windows.',
+            );
         }
 
         $store = $this->store();
-        $store->writeSnapshot(new DebugSnapshot($this->summary('current', 1.0), [], []), 10);
+
+        $store->writeSnapshot(
+            new DebugSnapshot($this->summary('current', 1.0), [], []),
+            10,
+        );
+
         chmod("{$this->path}/index.json", 0o000);
 
         $this->expectException(StorageException::class);
-        $this->expectExceptionMessage('Unable to read debug manifest');
+        $this->expectExceptionMessage(
+            'Unable to read debug manifest',
+        );
 
         try {
             $store->writeSnapshot(new DebugSnapshot($this->summary('newer', 2.0), [], []), 10);
diff --git a/tests/Support/CoverageGate.php b/tests/Support/CoverageGate.php
deleted file mode 100644
index c2b854f..0000000
--- a/tests/Support/CoverageGate.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace PHPForge\Debug\Tests\Support;
-
-use DOMDocument;
-use DOMElement;
-use DOMXPath;
-
-use function array_map;
-use function array_slice;
-use function dirname;
-use function escapeshellarg;
-use function file_exists;
-use function fprintf;
-use function fwrite;
-use function implode;
-use function is_array;
-use function is_string;
-use function passthru;
-use function sprintf;
-use function str_starts_with;
-use function strlen;
-use function substr;
-
-use const LIBXML_NONET;
-use const PHP_BINARY;
-use const STDERR;
-use const STDOUT;
-
-final class CoverageGate
-{
-    private const COVERAGE_OPTION = '--coverage-clover=';
-
-    public static function run(mixed $arguments): int
-    {
-        $arguments = self::cliArguments($arguments);
-
-        if ($arguments === null) {
-            fwrite(STDERR, "The coverage gate received invalid command arguments.\n");
-
-            return 2;
-        }
-
-        $coverageFile = self::coverageFile($arguments);
-
-        if ($coverageFile === null) {
-            fwrite(STDERR, "The coverage gate requires --coverage-clover=<file>.\n");
-
-            return 2;
-        }
-
-        $command = [PHP_BINARY, dirname(__DIR__, 2) . '/vendor/bin/phpunit', ...array_slice($arguments, 1)];
-
-        passthru(implode(' ', array_map(escapeshellarg(...), $command)), $exitCode);
-
-        if ($exitCode !== 0) {
-            return $exitCode;
-        }
-
-        return self::verify($coverageFile);
-    }
-
-    /**
-     * @return list<string>|null
-     */
-    private static function cliArguments(mixed $arguments): array|null
-    {
-        if (!is_array($arguments)) {
-            return null;
-        }
-
-        $result = [];
-
-        foreach ($arguments as $argument) {
-            if (!is_string($argument)) {
-                return null;
-            }
-
-            $result[] = $argument;
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param list<string> $arguments
-     * @return non-empty-string|null
-     */
-    private static function coverageFile(array $arguments): string|null
-    {
-        foreach ($arguments as $argument) {
-            if (str_starts_with($argument, self::COVERAGE_OPTION)) {
-                $coverageFile = substr($argument, strlen(self::COVERAGE_OPTION));
-
-                return $coverageFile !== '' ? $coverageFile : null;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * @return array{classes: int, methods: int, coveredMethods: int, lines: int, coveredLines: int}
-     */
-    private static function metrics(DOMElement $metrics): array
-    {
-        return [
-            'classes' => (int) $metrics->getAttribute('classes'),
-            'methods' => (int) $metrics->getAttribute('methods'),
-            'coveredMethods' => (int) $metrics->getAttribute('coveredmethods'),
-            'lines' => (int) $metrics->getAttribute('statements'),
-            'coveredLines' => (int) $metrics->getAttribute('coveredstatements'),
-        ];
-    }
-
-    /**
-     * @param non-empty-string $coverageFile
-     */
-    private static function verify(string $coverageFile): int
-    {
-        if (!file_exists($coverageFile)) {
-            fprintf(STDERR, "Coverage report %s was not generated.\n", $coverageFile);
-
-            return 2;
-        }
-
-        $document = new DOMDocument();
-
-        if (!$document->load($coverageFile, LIBXML_NONET)) {
-            fprintf(STDERR, "Coverage report %s is not valid XML.\n", $coverageFile);
-
-            return 2;
-        }
-
-        $nodes = (new DOMXPath($document))->query('/coverage/project/metrics');
-        $metrics = $nodes === false ? null : $nodes->item(0);
-
-        if (!$metrics instanceof DOMElement) {
-            fprintf(STDERR, "Coverage report %s has no project metrics.\n", $coverageFile);
-
-            return 2;
-        }
-
-        $totals = self::metrics($metrics);
-        $complete = $totals['classes'] > 0
-            && $totals['methods'] > 0
-            && $totals['lines'] > 0
-            && $totals['methods'] === $totals['coveredMethods']
-            && $totals['lines'] === $totals['coveredLines'];
-        $coveredClasses = $complete ? $totals['classes'] : 0;
-
-        fwrite(
-            $complete ? STDOUT : STDERR,
-            sprintf(
-                "Coverage gate: %d/%d classes, %d/%d methods, %d/%d lines.\n",
-                $coveredClasses,
-                $totals['classes'],
-                $totals['coveredMethods'],
-                $totals['methods'],
-                $totals['coveredLines'],
-                $totals['lines'],
-            ),
-        );
-
-        return $complete ? 0 : 1;
-    }
-}
diff --git a/tests/Theme/ThemeResolverTest.php b/tests/Theme/ThemeResolverTest.php
index c09a20b..a92c964 100644
--- a/tests/Theme/ThemeResolverTest.php
+++ b/tests/Theme/ThemeResolverTest.php
@@ -10,15 +10,17 @@
 
 /**
  * Unit tests for {@see ThemeResolver} covering the cookie-over-query precedence and the light fallback.
- *
- * @since 0.1
  */
 #[Group('theme')]
 final class ThemeResolverTest extends TestCase
 {
     public function testResolveDefaultsToLightWithoutAnySignal(): void
     {
-        self::assertSame('light', ThemeResolver::resolve([], []), 'No signal must resolve to light.');
+        self::assertSame(
+            'light',
+            ThemeResolver::resolve([], []),
+            'No signal must resolve to light.',
+        );
     }
 
     public function testResolveIgnoresNonStringAndUnknownValues(): void
diff --git a/tests/Toolbar/ToolbarDataTest.php b/tests/Toolbar/ToolbarDataTest.php
index de7b475..1e01906 100644
--- a/tests/Toolbar/ToolbarDataTest.php
+++ b/tests/Toolbar/ToolbarDataTest.php
@@ -12,8 +12,6 @@
 
 /**
  * Unit tests for {@see ToolbarData} serializing portable toolbar panels and metrics.
- *
- * @since 0.1
  */
 #[Group('toolbar')]
 final class ToolbarDataTest extends TestCase
diff --git a/tests/View/Grid/ActiveFilterBannerTest.php b/tests/View/Grid/ActiveFilterBannerTest.php
index 8149c60..c6a7c00 100644
--- a/tests/View/Grid/ActiveFilterBannerTest.php
+++ b/tests/View/Grid/ActiveFilterBannerTest.php
@@ -14,8 +14,6 @@
 /**
  * Unit tests for {@see ActiveFilterBanner} covering the removable filter pills, the "Clear all" action, and the
  * empty-state short-circuit.
- *
- * @since 0.1
  */
 #[Group('view')]
 #[Group('grid')]
@@ -28,16 +26,16 @@ public function testRenderBuildsRemovalUrlsThroughTheCallback(): void
             static fn(array $without): string => '/debug?without=' . implode(',', $without),
         );
 
-        self::assertStringContainsString(
-            'href="/debug?without=statusCode"',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-active-filters" role="group" aria-label="Active filters">
+            <span class="yii-debug-active-filters-label">2 filters active</span><span class="yii-debug-active-filters-list"><a class="yii-debug-active-filter-pill" href="/debug?without=statusCode" title="Remove this filter"><span class="yii-debug-active-filter-attr">statusCode</span><span class="yii-debug-active-filter-sep">:</span><span class="yii-debug-active-filter-value">404</span><span class="yii-debug-active-filter-x" aria-hidden="true">×</span></a><a class="yii-debug-active-filter-pill" href="/debug?without=url" title="Remove this filter"><span class="yii-debug-active-filter-attr">url</span><span class="yii-debug-active-filter-sep">:</span><span class="yii-debug-active-filter-value">admin</span><span class="yii-debug-active-filter-x" aria-hidden="true">×</span></a></span><a class="yii-debug-active-filters-clear" href="/debug?without=statusCode,url" title="Clear all filters and show every row">Clear all</a>
+            </div>
+            HTML,
             $html,
             'Pill link must drop only its own attribute.',
         );
-        self::assertStringContainsString(
-            'href="/debug?without=statusCode,url"',
-            $html,
-            'Clear-all link must drop every active attribute.',
-        );
+
     }
 
     public function testRenderEmitsOnePillPerActiveFilter(): void
@@ -47,12 +45,20 @@ public function testRenderEmitsOnePillPerActiveFilter(): void
             static fn(array $without): string => '/debug',
         );
 
-        self::assertSame(2, substr_count($html, 'yii-debug-active-filter-pill'), 'One pill per active filter.');
-        self::assertStringContainsString('2 filters active', $html, 'Plural count label must surface.');
-        self::assertStringContainsString('statusCode', $html, 'Attribute names must surface inside the pills.');
-        self::assertStringContainsString('404', $html, 'Filter values must surface inside the pills.');
-        self::assertStringContainsString('Clear all', $html, 'The clear-all action must render.');
-        self::assertStringContainsString('aria-label="Active filters"', $html, 'Group must carry its accessible name.');
+        self::assertSame(
+            2,
+            substr_count($html, 'yii-debug-active-filter-pill'),
+            'One pill per active filter.',
+        );
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-active-filters" role="group" aria-label="Active filters">
+            <span class="yii-debug-active-filters-label">2 filters active</span><span class="yii-debug-active-filters-list"><a class="yii-debug-active-filter-pill" href="/debug" title="Remove this filter"><span class="yii-debug-active-filter-attr">statusCode</span><span class="yii-debug-active-filter-sep">:</span><span class="yii-debug-active-filter-value">404</span><span class="yii-debug-active-filter-x" aria-hidden="true">×</span></a><a class="yii-debug-active-filter-pill" href="/debug" title="Remove this filter"><span class="yii-debug-active-filter-attr">url</span><span class="yii-debug-active-filter-sep">:</span><span class="yii-debug-active-filter-value">admin</span><span class="yii-debug-active-filter-x" aria-hidden="true">×</span></a></span><a class="yii-debug-active-filters-clear" href="/debug" title="Clear all filters and show every row">Clear all</a>
+            </div>
+            HTML,
+            $html,
+            'Plural count label must surface.',
+        );
     }
 
     public function testRenderReturnsEmptyStringWhenNoFiltersAreActive(): void
@@ -66,8 +72,12 @@ public function testRenderReturnsEmptyStringWhenNoFiltersAreActive(): void
 
     public function testRenderUsesSingularLabelForOneFilter(): void
     {
-        self::assertStringContainsString(
-            '1 filter active',
+        self::assertSame(
+            <<<HTML
+            <div class="yii-debug-active-filters" role="group" aria-label="Active filters">
+            <span class="yii-debug-active-filters-label">1 filter active</span><span class="yii-debug-active-filters-list"><a class="yii-debug-active-filter-pill" href="/debug" title="Remove this filter"><span class="yii-debug-active-filter-attr">url</span><span class="yii-debug-active-filter-sep">:</span><span class="yii-debug-active-filter-value">admin</span><span class="yii-debug-active-filter-x" aria-hidden="true">×</span></a></span><a class="yii-debug-active-filters-clear" href="/debug" title="Clear all filters and show every row">Clear all</a>
+            </div>
+            HTML,
             ActiveFilterBanner::render(['url' => 'admin'], static fn(array $without): string => '/debug'),
             'Single filter must use the singular label.',
         );
diff --git a/tests/View/Grid/RowClassTest.php b/tests/View/Grid/RowClassTest.php
index be1a965..1ddd5f3 100644
--- a/tests/View/Grid/RowClassTest.php
+++ b/tests/View/Grid/RowClassTest.php
@@ -10,8 +10,6 @@
 
 /**
  * Unit tests for {@see RowClass} covering the status-level to row-class mapping used by the debug grids.
- *
- * @since 0.1
  */
 #[Group('view')]
 #[Group('grid')]
@@ -28,16 +26,44 @@ public function testForAliasesErrorToDanger(): void
 
     public function testForMapsKnownLevelsToRowClasses(): void
     {
-        self::assertSame(['class' => 'yii-debug-row-success'], RowClass::for('success'), 'Success must map.');
-        self::assertSame(['class' => 'yii-debug-row-info'], RowClass::for('info'), 'Info must map.');
-        self::assertSame(['class' => 'yii-debug-row-warning'], RowClass::for('warning'), 'Warning must map.');
-        self::assertSame(['class' => 'yii-debug-row-danger'], RowClass::for('danger'), 'Danger must map.');
+        self::assertSame(
+            ['class' => 'yii-debug-row-success'],
+            RowClass::for('success'),
+            'Success must map.',
+        );
+        self::assertSame(
+            ['class' => 'yii-debug-row-info'],
+            RowClass::for('info'),
+            'Info must map.'
+        );
+        self::assertSame(
+            ['class' => 'yii-debug-row-warning'],
+            RowClass::for('warning'),
+            'Warning must map.',
+        );
+        self::assertSame(
+            ['class' => 'yii-debug-row-danger'],
+            RowClass::for('danger'),
+            'Danger must map.',
+        );
     }
 
     public function testForReturnsEmptyArrayForUnknownOrNullLevels(): void
     {
-        self::assertSame([], RowClass::for(null), '`null` must yield no class.');
-        self::assertSame([], RowClass::for(''), 'Empty string must yield no class.');
-        self::assertSame([], RowClass::for('primary'), 'Unknown levels must yield no class.');
+        self::assertSame(
+            [],
+            RowClass::for(null),
+            "'null' must yield no class.",
+        );
+        self::assertSame(
+            [],
+            RowClass::for(''),
+            'Empty string must yield no class.',
+        );
+        self::assertSame(
+            [],
+            RowClass::for('primary'),
+            'Unknown levels must yield no class.',
+        );
     }
 }
diff --git a/tests/View/History/HistoryCellRendererTest.php b/tests/View/History/HistoryCellRendererTest.php
index 5769083..cb7be95 100644
--- a/tests/View/History/HistoryCellRendererTest.php
+++ b/tests/View/History/HistoryCellRendererTest.php
@@ -14,8 +14,6 @@
 /**
  * Unit tests for {@see HistoryCellRenderer} covering the per-column rendering helpers, the row-attributes builder
  * (`data-yii-debug-*` attributes for the sidebar cursor JS) and the summary header composition.
- *
- * @since 0.1
  */
 #[Group('view')]
 #[Group('history')]
@@ -53,14 +51,21 @@ public function testBuildRowAttributesAddsDataAttributesForCursorJs(): void
             ],
             'Row data-yii-debug-* attributes must mirror the typed row.',
         );
-        self::assertArrayNotHasKey('class', $options, 'Non-critical rows must not carry a row class.');
+        self::assertArrayNotHasKey(
+            'class',
+            $options,
+            'Non-critical rows must not carry a row class.',
+        );
     }
 
     public function testBuildRowAttributesFlagsCriticalStatusCodesWithDangerHighlight(): void
     {
         $options = HistoryCellRenderer::buildRowAttributes(self::row(['statusCode' => 500]), true);
 
-        self::assertIsString($options['class'] ?? null, 'class entry must be a string.');
+        self::assertIsString(
+            $options['class'] ?? null,
+            'class entry must be a string.',
+        );
         self::assertStringContainsString(
             'yii-debug-row-danger',
             $options['class'],
@@ -101,20 +106,23 @@ public function testRenderDurationCellScalesGaugeAgainstPageMaximum(): void
         $html = HistoryCellRenderer::renderDurationCell(self::row(['processingTime' => 0.125]), 0.25);
 
         self::assertSame(
-            '<span class="yii-debug-gauge" style=\'--yii-debug-gauge: 50%;\'>'
-            . '<span class="yii-debug-gauge-value">125 ms</span>'
-            . '<span class="yii-debug-gauge-bar" aria-hidden="true"></span>'
-            . '</span>',
+            <<<HTML
+            <span class="yii-debug-gauge" style='--yii-debug-gauge: 50%;'><span class="yii-debug-gauge-value">125 ms</span><span class="yii-debug-gauge-bar" aria-hidden="true"></span></span>
+            HTML,
             $html,
             'Rail must sit at half the page maximum.',
         );
-        self::assertStringContainsString(
-            '--yii-debug-gauge: 100%;',
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-gauge" style='--yii-debug-gauge: 100%;'><span class="yii-debug-gauge-value">250 ms</span><span class="yii-debug-gauge-bar" aria-hidden="true"></span></span>
+            HTML,
             HistoryCellRenderer::renderDurationCell(self::row(['processingTime' => 0.25]), 0.25),
             'The slowest row must fill its rail.',
         );
-        self::assertStringContainsString(
-            '--yii-debug-gauge: 0%;',
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-gauge" style='--yii-debug-gauge: 0%;'><span class="yii-debug-gauge-value">0 ms</span><span class="yii-debug-gauge-bar" aria-hidden="true"></span></span>
+            HTML,
             HistoryCellRenderer::renderDurationCell(self::row(['processingTime' => 0.0]), 0.25),
             'A zero measurement must show an empty rail.',
         );
@@ -122,10 +130,14 @@ public function testRenderDurationCellScalesGaugeAgainstPageMaximum(): void
 
     public function testRenderDurationCellShowsNotSetWhenMissing(): void
     {
-        $html = HistoryCellRenderer::renderDurationCell(self::row([]), 0.25);
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-not-set">(not set)</span>
+            HTML,
+            HistoryCellRenderer::renderDurationCell(self::row([]), 0.25),
+            'Missing duration must surface the muted placeholder.',
+        );
 
-        self::assertStringContainsString('(not set)', $html, 'Missing duration must surface the muted placeholder.');
-        self::assertStringNotContainsString('yii-debug-gauge', $html, 'Missing duration must not draw a rail.');
     }
 
     public function testRenderMemoryCellFormatsMb(): void
@@ -139,18 +151,26 @@ public function testRenderMemoryCellFormatsMb(): void
 
     public function testRenderMemoryCellScalesGaugeAgainstPageMaximum(): void
     {
-        $html = HistoryCellRenderer::renderMemoryCell(self::row(['peakMemory' => 2097152]), 4194304);
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-gauge" style='--yii-debug-gauge: 50%;'><span class="yii-debug-gauge-value">2.000 MB</span><span class="yii-debug-gauge-bar" aria-hidden="true"></span></span>
+            HTML,
+            HistoryCellRenderer::renderMemoryCell(self::row(['peakMemory' => 2097152]), 4194304),
+            'Rail must sit at half the page maximum.',
+        );
 
-        self::assertStringContainsString('--yii-debug-gauge: 50%;', $html, 'Rail must sit at half the page maximum.');
-        self::assertStringContainsString('2.000 MB', $html, 'Readout must keep its formatted value.');
     }
 
     public function testRenderMemoryCellShowsNotSetWhenMissing(): void
     {
-        $html = HistoryCellRenderer::renderMemoryCell(self::row([]), 4194304);
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-not-set">(not set)</span>
+            HTML,
+            HistoryCellRenderer::renderMemoryCell(self::row([]), 4194304),
+            'Missing peak memory must surface the muted placeholder.',
+        );
 
-        self::assertStringContainsString('(not set)', $html, 'Missing peak memory must surface the muted placeholder.');
-        self::assertStringNotContainsString('yii-debug-gauge', $html, 'Missing peak memory must not draw a rail.');
     }
 
     public function testRenderMethodCellRendersVocabularyColoredText(): void
@@ -160,13 +180,17 @@ public function testRenderMethodCellRendersVocabularyColoredText(): void
             HistoryCellRenderer::renderMethodCell(self::row(['method' => 'GET'])),
             "GET must wear the 'get' verb class.",
         );
-        self::assertStringContainsString(
-            'yii-debug-verb-put',
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-method yii-debug-verb-put">PATCH</span>
+            HTML,
             HistoryCellRenderer::renderMethodCell(self::row(['method' => 'PATCH'])),
             "PATCH must share the 'put' verb hue.",
         );
-        self::assertStringContainsString(
-            'yii-debug-verb-other',
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-method yii-debug-verb-other">COMMAND</span>
+            HTML,
             HistoryCellRenderer::renderMethodCell(self::row(['method' => 'COMMAND'])),
             "COMMAND must fall back to the 'other' verb.",
         );
@@ -185,23 +209,25 @@ public function testRenderSqlCountCellEmitsWarningGlyphWhenCountIsCritical(): vo
     {
         $row = self::row(['tag' => 'flood', 'sqlCount' => 500, 'excessiveCallersCount' => 0]);
 
-        $html = HistoryCellRenderer::renderSqlCountCell($row, '/debug/view?panel=db&tag=flood', true, 100);
-
-        self::assertStringContainsString('⚠', $html, 'Critical counts must surface the warning glyph.');
-        self::assertStringContainsString('Too many queries', $html, 'Warning tooltip must explain the breach.');
-        self::assertStringContainsString(
-            'panel=db&amp;tag=flood',
-            $html,
-            'SQL count must link to the request database panel.',
+        self::assertSame(
+            <<<HTML
+            <a href="/debug/view?panel=db&amp;tag=flood" title="Executed 500 database queries.">500 <span title="Too many queries. Allowed count is 100">⚠</span></a>
+            HTML,
+            HistoryCellRenderer::renderSqlCountCell($row, '/debug/view?panel=db&tag=flood', true, 100),
+            'Critical counts must surface the warning glyph.',
         );
+
+
     }
 
     public function testRenderSqlCountCellPluralizesExcessiveCallersCount(): void
     {
         $row = self::row(['tag' => 'flood', 'sqlCount' => 10, 'excessiveCallersCount' => 4]);
 
-        self::assertStringContainsString(
-            '4 callers are making too many calls.',
+        self::assertSame(
+            <<<HTML
+            <a href="/db" title="Executed 10 database queries.">10 <span title="4 callers are making too many calls.">⚠</span></a>
+            HTML,
             HistoryCellRenderer::renderSqlCountCell($row, '/db', false, 100),
             'Multiple excessive callers must surface the plural tooltip form.',
         );
@@ -211,18 +237,24 @@ public function testRenderSqlCountCellRendersPlainCountWhenNotCritical(): void
     {
         $row = self::row(['tag' => 'low', 'sqlCount' => 3, 'excessiveCallersCount' => 0]);
 
-        $html = HistoryCellRenderer::renderSqlCountCell($row, '/db', false, 100);
+        self::assertSame(
+            <<<HTML
+            <a href="/db" title="Executed 3 database queries.">3</a>
+            HTML,
+            HistoryCellRenderer::renderSqlCountCell($row, '/db', false, 100),
+            'Plain SQL count must surface as the bare integer.',
+        );
 
-        self::assertStringContainsString('>3<', $html, 'Plain SQL count must surface as the bare integer.');
-        self::assertStringNotContainsString('⚠', $html, 'Non-critical counts must NOT carry the warning glyph.');
     }
 
     public function testRenderSqlCountCellSingularizesSingleExcessiveCaller(): void
     {
         $row = self::row(['tag' => 'flood', 'sqlCount' => 10, 'excessiveCallersCount' => 1]);
 
-        self::assertStringContainsString(
-            '1 caller is making too many calls.',
+        self::assertSame(
+            <<<HTML
+            <a href="/db" title="Executed 10 database queries.">10 <span title="1 caller is making too many calls.">⚠</span></a>
+            HTML,
             HistoryCellRenderer::renderSqlCountCell($row, '/db', false, 100),
             'A single excessive caller must surface the singular tooltip form.',
         );
@@ -239,23 +271,31 @@ public function testRenderStatusCellMapsCommandWithZeroToSuccess(): void
 
     public function testRenderStatusCellMapsRangeToStatusClass(): void
     {
-        self::assertStringContainsString(
-            'yii-debug-badge yii-debug-status-2xx',
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-badge yii-debug-status-2xx">200</span>
+            HTML,
             HistoryCellRenderer::renderStatusCell(self::row(['statusCode' => 200])),
             "Status code '200' must map to '2xx'.",
         );
-        self::assertStringContainsString(
-            'yii-debug-status-3xx',
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-badge yii-debug-status-3xx">301</span>
+            HTML,
             HistoryCellRenderer::renderStatusCell(self::row(['statusCode' => 301])),
             "Status code '301' must map to '3xx'.",
         );
-        self::assertStringContainsString(
-            'yii-debug-status-4xx',
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-badge yii-debug-status-4xx">404</span>
+            HTML,
             HistoryCellRenderer::renderStatusCell(self::row(['statusCode' => 404])),
             "Status code '404' must map to '4xx'.",
         );
-        self::assertStringContainsString(
-            'yii-debug-status-5xx',
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-badge yii-debug-status-5xx">500</span>
+            HTML,
             HistoryCellRenderer::renderStatusCell(self::row(['statusCode' => 500])),
             "Status code '500' must map to '5xx'.",
         );
@@ -274,35 +314,21 @@ public function testRenderSummaryEchoesBucketPills(): void
 
         $html = HistoryCellRenderer::renderSummary(
             $summary,
-            ['2xx' => '/debug?Debug%5BstatusCode%5D=200', '4xx' => '/debug?Debug%5BstatusCode%5D=404'],
+            [
+                '2xx' => '/debug?Debug%5BstatusCode%5D=200',
+                '4xx' => '/debug?Debug%5BstatusCode%5D=404',
+            ],
             '<label class="yii-debug-grid-pagesize"><select data-yii-debug-pagesize name="per-page"></select></label>',
         );
 
-        self::assertStringContainsString('captured requests', $html, 'Multiple requests must use the plural label.');
-        self::assertStringContainsString(
-            'yii-debug-grid-summary-stat-2xx',
-            $html,
-            "'2xx' pill must carry the '2xx' status class.",
-        );
-        self::assertStringContainsString(
-            'yii-debug-grid-summary-stat-4xx',
-            $html,
-            "'4xx' pill must carry the '4xx' status class.",
-        );
-        self::assertStringContainsString(
-            'Debug%5BstatusCode%5D=200',
-            $html,
-            "The '2xx' bucket must link to its sample status filter.",
-        );
-        self::assertStringContainsString(
-            'Debug%5BstatusCode%5D=404',
-            $html,
-            "The '4xx' bucket must link to its sample status filter.",
-        );
-        self::assertStringContainsString(
-            'yii-debug-grid-pagesize',
+        self::assertSame(
+            <<<HTML
+            <header class="yii-debug-grid-summary">
+            <span><strong>5</strong> captured requests</span><span class="yii-debug-grid-summary-sep">·</span><a class="yii-debug-grid-summary-stat-2xx" href="/debug?Debug%5BstatusCode%5D=200" title="Filter to 2xx responses (sample 200)"><strong>4</strong> 2xx</a><span class="yii-debug-grid-summary-sep">·</span><a class="yii-debug-grid-summary-stat-4xx" href="/debug?Debug%5BstatusCode%5D=404" title="Filter to 4xx responses (sample 404)"><strong>1</strong> 4xx</a><label class="yii-debug-grid-pagesize"><select data-yii-debug-pagesize name="per-page"></select></label>
+            </header>
+            HTML,
             $html,
-            'History summary must include the shared page-size selector.',
+            'Multiple requests must use the plural label.',
         );
     }
 
@@ -321,42 +347,45 @@ public function testRenderSummaryUsesSingularLabelForOneRequest(): void
     {
         $summary = new HistorySummary(totalRequests: 1, statusBuckets: [], statusCodeFilter: null);
 
-        $html = HistoryCellRenderer::renderSummary($summary, [], '');
-
-        self::assertStringContainsString('captured request', $html, 'One request must use the singular label.');
-        self::assertStringNotContainsString('captured requests', $html, 'One request must not use the plural label.');
+        self::assertSame(
+            <<<HTML
+            <header class="yii-debug-grid-summary">
+            <span><strong>1</strong> captured request</span>
+            </header>
+            HTML,
+            HistoryCellRenderer::renderSummary($summary, [], ''),
+            'One request must use the singular label.',
+        );
     }
 
     public function testRenderTagCellLinksToPanelView(): void
     {
-        $html = HistoryCellRenderer::renderTagCell(self::row(['tag' => 'abc']), '/debug/view?tag=abc');
-
-        self::assertStringContainsString('yii-debug-tag-link', $html, 'Tag link must carry the tag-link CSS class.');
-        self::assertStringContainsString('abc', $html, 'Tag value must surface inside the link.');
-        self::assertStringContainsString('tag=abc', $html, 'Tag cell must link to the matching request view.');
+        self::assertSame(
+            <<<HTML
+            <a class="yii-debug-tag-link" href="/debug/view?tag=abc">abc</a>
+            HTML,
+            HistoryCellRenderer::renderTagCell(self::row(['tag' => 'abc']), '/debug/view?tag=abc'),
+            'Tag link must carry the tag-link CSS class.',
+        );
     }
 
     public function testRenderTimeCellRendersCompactClockWithFullTooltip(): void
     {
-        $html = HistoryCellRenderer::renderTimeCell(self::row(['time' => 1_700_000_000]));
-
-        self::assertStringContainsString('yii-debug-nowrap', $html, 'Time cell must carry the nowrap CSS class.');
-        self::assertStringContainsString(
-            'title="' . date('Y-m-d H:i:s', 1_700_000_000) . '"',
-            $html,
-            'Time cell must carry the full datetime tooltip.',
-        );
-        self::assertStringContainsString(
-            '>' . date('H:i:s', 1_700_000_000) . '<',
-            $html,
-            'Time cell must render the compact clock string.',
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-nowrap" title="2023-11-14 22:13:20">22:13:20</span>
+            HTML,
+            HistoryCellRenderer::renderTimeCell(self::row(['time' => 1_700_000_000])),
+            'Time cell must carry the nowrap CSS class.',
         );
     }
 
     public function testRenderTimeCellShowsNotSetForZeroTimestamp(): void
     {
-        self::assertStringContainsString(
-            '(not set)',
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-not-set">(not set)</span>
+            HTML,
             HistoryCellRenderer::renderTimeCell(self::row(['time' => 0])),
             'Zero timestamps must surface the muted placeholder.',
         );
@@ -364,10 +393,14 @@ public function testRenderTimeCellShowsNotSetForZeroTimestamp(): void
 
     public function testRenderUrlCellWrapsUrlInTitleSpan(): void
     {
-        $html = HistoryCellRenderer::renderUrlCell(self::row(['url' => 'http://example.test/path']));
+        self::assertSame(
+            <<<HTML
+            <span class="yii-debug-url-cell" title="http://example.test/path">http://example.test/path</span>
+            HTML,
+            HistoryCellRenderer::renderUrlCell(self::row(['url' => 'http://example.test/path'])),
+            'URL cell must carry the dedicated class.',
+        );
 
-        self::assertStringContainsString('yii-debug-url-cell', $html, 'URL cell must carry the dedicated class.');
-        self::assertStringContainsString('http://example.test/path', $html, 'URL value must render inside the cell.');
     }
 
     /**
diff --git a/tests/View/History/HistoryRowTest.php b/tests/View/History/HistoryRowTest.php
index 2b9437d..ea15d09 100644
--- a/tests/View/History/HistoryRowTest.php
+++ b/tests/View/History/HistoryRowTest.php
@@ -12,10 +12,8 @@
 use function date;
 
 /**
- * Unit tests for {@see HistoryRow} covering the projection of a manifest {@see RequestSummary} into the row the
- * History grid renders.
- *
- * @since 0.1
+ * Unit tests for {@see HistoryRow} covering the projection of a manifest {@see RequestSummary} into the row the History
+ * grid renders.
  */
 #[Group('view')]
 #[Group('history')]
@@ -61,17 +59,60 @@ public function testFromSummaryPassesEveryFieldThroughUntouched(): void
             ),
         );
 
-        self::assertSame('tag-9', $row->tag, 'Tag must pass through.');
-        self::assertSame('https://example.test/orders', $row->url, 'URL must pass through.');
-        self::assertTrue($row->ajax, 'AJAX flag must pass through.');
-        self::assertSame('POST', $row->method, 'Method must pass through.');
-        self::assertSame('10.0.0.1', $row->ip, 'IP must pass through.');
-        self::assertSame(404, $row->statusCode, 'Status code must pass through.');
-        self::assertSame(7, $row->sqlCount, 'SQL count must pass through.');
-        self::assertSame(2, $row->excessiveCallersCount, 'Excessive-caller count must pass through.');
-        self::assertSame(1, $row->mailCount, 'Mail count must pass through.');
-        self::assertSame(0.125, $row->processingTime, 'Processing time must pass through.');
-        self::assertSame(1_048_576, $row->peakMemory, 'Peak memory must pass through.');
+        self::assertSame(
+            'tag-9',
+            $row->tag,
+            'Tag must pass through.',
+        );
+        self::assertSame(
+            'https://example.test/orders',
+            $row->url,
+            'URL must pass through.',
+        );
+        self::assertTrue(
+            $row->ajax,
+            'AJAX flag must pass through.',
+        );
+        self::assertSame(
+            'POST',
+            $row->method,
+            'Method must pass through.',
+        );
+        self::assertSame(
+            '10.0.0.1',
+            $row->ip,
+            'IP must pass through.',
+        );
+        self::assertSame(
+            404,
+            $row->statusCode,
+            'Status code must pass through.',
+        );
+        self::assertSame(
+            7,
+            $row->sqlCount,
+            'SQL count must pass through.',
+        );
+        self::assertSame(
+            2,
+            $row->excessiveCallersCount,
+            'Excessive-caller count must pass through.',
+        );
+        self::assertSame(
+            1,
+            $row->mailCount,
+            'Mail count must pass through.',
+        );
+        self::assertSame(
+            0.125,
+            $row->processingTime,
+            'Processing time must pass through.',
+        );
+        self::assertSame(
+            1_048_576,
+            $row->peakMemory,
+            'Peak memory must pass through.',
+        );
     }
 
     /**
diff --git a/tests/View/History/HistoryScaleTest.php b/tests/View/History/HistoryScaleTest.php
index 8f55e3f..d3a1272 100644
--- a/tests/View/History/HistoryScaleTest.php
+++ b/tests/View/History/HistoryScaleTest.php
@@ -11,8 +11,6 @@
 
 /**
  * Unit tests for {@see HistoryScale} covering the page-maxima scan behind the History micro-gauges.
- *
- * @since 0.1
  */
 #[Group('view')]
 #[Group('history')]
@@ -29,26 +27,53 @@ public function testFromModelsIgnoresRowsWithoutCapturedValues(): void
             ],
         );
 
-        self::assertSame(0.5, $scale->maxProcessingTime, 'Largest captured duration must win.');
-        self::assertSame(2_097_152, $scale->maxPeakMemory, 'Largest captured memory must win.');
+        self::assertSame(
+            0.5,
+            $scale->maxProcessingTime,
+            'Largest captured duration must win.',
+        );
+        self::assertSame(
+            2_097_152,
+            $scale->maxPeakMemory,
+            'Largest captured memory must win.',
+        );
     }
 
     public function testFromModelsReturnsZeroMaximaForEmptyList(): void
     {
         $scale = HistoryScale::fromModels([]);
 
-        self::assertSame(0.0, $scale->maxProcessingTime, 'Empty pages must report a `0.0` duration scale.');
-        self::assertSame(0, $scale->maxPeakMemory, 'Empty pages must report a `0` memory scale.');
+        self::assertSame(
+            0.0,
+            $scale->maxProcessingTime,
+            "Empty pages must report a '0.0' duration scale.",
+        );
+        self::assertSame(
+            0,
+            $scale->maxPeakMemory,
+            "Empty pages must report a '0' memory scale.",
+        );
     }
 
     public function testFromModelsReturnsZeroMaximaWhenNoRowCarriesValues(): void
     {
         $scale = HistoryScale::fromModels(
-            [self::row(null, null), self::row(null, null)],
+            [
+                self::row(null, null),
+                self::row(null, null),
+            ],
         );
 
-        self::assertSame(0.0, $scale->maxProcessingTime, 'All-`null` durations must collapse the scale to `0.0`.');
-        self::assertSame(0, $scale->maxPeakMemory, 'All-`null` memory must collapse the scale to `0`.');
+        self::assertSame(
+            0.0,
+            $scale->maxProcessingTime,
+            "All-'null' durations must collapse the scale to '0.0'.",
+        );
+        self::assertSame(
+            0,
+            $scale->maxPeakMemory,
+            "All-'null' memory must collapse the scale to '0'.",
+        );
     }
 
     private static function row(float|null $processingTime, int|null $peakMemory): HistoryRow
diff --git a/tests/View/History/HistorySummaryTest.php b/tests/View/History/HistorySummaryTest.php
index f4575a7..74c604d 100644
--- a/tests/View/History/HistorySummaryTest.php
+++ b/tests/View/History/HistorySummaryTest.php
@@ -12,8 +12,6 @@
 /**
  * Unit tests for {@see HistorySummary} covering the manifest aggregation that feeds the History index summary header
  * total requests, per-bucket counts/sample codes/variants and the unique status-code filter map.
- *
- * @since 0.1
  */
 #[Group('view')]
 #[Group('history')]
@@ -58,8 +56,16 @@ public function testFromManifestCountsTypedEntries(): void
             ],
         );
 
-        self::assertSame(2, $summary->totalRequests, 'Total count must reflect every typed manifest entry.');
-        self::assertCount(2, $summary->statusBuckets, 'Each status family must contribute one bucket.');
+        self::assertSame(
+            2,
+            $summary->totalRequests,
+            'Total count must reflect every typed manifest entry.',
+        );
+        self::assertCount(
+            2,
+            $summary->statusBuckets,
+            'Each status family must contribute one bucket.',
+        );
     }
 
     public function testFromManifestExposesEmptyFilterWhenNoStatusCaptured(): void
@@ -83,8 +89,15 @@ public function testFromManifestExposesFirstSeenSampleCode(): void
 
         $first = $summary->statusBuckets[0] ?? null;
 
-        self::assertNotNull($first, 'Bucket list must be non-empty.');
-        self::assertSame(201, $first->sampleCode, 'Sample code must be the first observed in the bucket.');
+        self::assertNotNull(
+            $first,
+            'Bucket list must be non-empty.',
+        );
+        self::assertSame(
+            201,
+            $first->sampleCode,
+            'Sample code must be the first observed in the bucket.',
+        );
     }
 
     public function testFromManifestKeepsStatusFamilyBoundariesExclusive(): void
@@ -172,9 +185,20 @@ public function testFromManifestReturnsEmptyForEmptyManifest(): void
     {
         $summary = HistorySummary::fromManifest([]);
 
-        self::assertSame(0, $summary->totalRequests, 'Empty manifest must yield zero total requests.');
-        self::assertSame([], $summary->statusBuckets, 'Empty manifest must yield no buckets.');
-        self::assertNull($summary->statusCodeFilter, 'Empty manifest must yield a null filter dropdown.');
+        self::assertSame(
+            0,
+            $summary->totalRequests,
+            'Empty manifest must yield zero total requests.',
+        );
+        self::assertSame(
+            [],
+            $summary->statusBuckets,
+            'Empty manifest must yield no buckets.',
+        );
+        self::assertNull(
+            $summary->statusCodeFilter,
+            'Empty manifest must yield a null filter dropdown.',
+        );
     }
 
     public function testFromManifestSkipsRequestsWithStatusBelow200(): void
@@ -188,8 +212,15 @@ public function testFromManifestSkipsRequestsWithStatusBelow200(): void
 
         $first = $summary->statusBuckets[0] ?? null;
 
-        self::assertNotNull($first, "Bucket list must surface the '200' entry.");
-        self::assertSame(1, $first->count, "Status '100' must not contribute to any bucket.");
+        self::assertNotNull(
+            $first,
+            "Bucket list must surface the '200' entry.",
+        );
+        self::assertSame(
+            1,
+            $first->count,
+            "Status '100' must not contribute to any bucket.",
+        );
     }
 
     public function testFromManifestSortsUniqueStatusCodes(): void
diff --git a/tests/View/Sidebar/SidebarRendererTest.php b/tests/View/Sidebar/SidebarRendererTest.php
index 51c306c..b20b5da 100644
--- a/tests/View/Sidebar/SidebarRendererTest.php
+++ b/tests/View/Sidebar/SidebarRendererTest.php
@@ -13,8 +13,6 @@
 /**
  * Unit tests for {@see SidebarRenderer} covering the snapshot card composition (method/URL/status/time/AJAX), the
  * cursor-mode vs navigation-mode branching of the navigator row, and the panel nav entry rendering.
- *
- * @since 0.1
  */
 #[Group('view')]
 #[Group('sidebar')]
@@ -44,9 +42,38 @@ public function testRenderEmitsAriaCurrentOnActiveNavLink(): void
 
         $html = SidebarRenderer::render($view);
 
-        self::assertStringContainsString('aria-current="page"', $html, 'Active nav entry must carry aria-current.');
-        self::assertStringContainsString('is-active', $html, 'Active nav entry must carry the is-active modifier.');
-        self::assertSame(1, substr_count($html, 'is-active'), 'Only the active entry carries the modifier.');
+        self::assertSame(
+            <<<HTML
+            <aside class="yii-debug-sidebar">
+            <nav class="yii-debug-nav yii-debug-nav-iconed" aria-label="Debug panels">
+            <ul>
+            <li>
+            <a class="yii-debug-nav-link is-active" href="/debug/index" title="History" aria-current="page">
+            <span class="yii-debug-nav-link-label">
+            History
+            </span>
+            </a>
+            </li>
+            <li>
+            <a class="yii-debug-nav-link" href="/debug/view?panel=request" title="Request">
+            <span class="yii-debug-nav-link-label">
+            Request
+            </span>
+            </a>
+            </li>
+            </ul>
+            </nav>
+            </aside>
+            HTML,
+            $html,
+            'Active nav entry must carry aria-current.',
+        );
+
+        self::assertSame(
+            1,
+            substr_count($html, 'is-active'),
+            'Only the active entry carries the modifier.',
+        );
         self::assertMatchesRegularExpression(
             '/<a class="yii-debug-nav-link is-active"[^>]*title="History"[^>]*aria-current="page">/',
             $html,
@@ -58,37 +85,55 @@ public function testRenderEmitsCursorButtonsWhenSnapshotIsCursor(): void
     {
         $view = new SidebarView(snapshot: $this->snapshot(isCursor: true), navItems: []);
 
-        $html = SidebarRenderer::render($view);
-
-        self::assertStringContainsString(
-            'data-yii-debug-cursor="newest"',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <aside class="yii-debug-sidebar">
+            <section class="yii-debug-side-section yii-debug-request-nav" aria-label="Newest captured request" data-yii-debug-history-cursor="true">
+            <header class="yii-debug-side-section-title">
+            Newest request
+            </header><div class="yii-debug-history-card" title="GET http://example.test/index.php">
+            <div class="yii-debug-snapshot-line">
+            <span class="yii-debug-snapshot-method yii-debug-verb-get" data-snapshot-field="method">GET</span><span class="yii-debug-snapshot-url" title="http://example.test/index.php" data-snapshot-field="url">/index.php</span>
+            </div><div class="yii-debug-snapshot-meta">
+            <span class="yii-debug-snapshot-status yii-debug-status-2xx" data-snapshot-field="status">200</span><span class="yii-debug-snapshot-time" data-snapshot-field="time">12:34:56</span><span class="yii-debug-snapshot-tag" data-snapshot-field="ajax">AJAX</span>
+            </div><div class="yii-debug-request-nav-row" role="group">
+            <button class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon is-disabled" type="button" title="Newest request" disabled aria-label="Newest captured request" data-yii-debug-cursor="newest"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m7 11l5-5l5 5"/><path d="m7 17l5-5l5 5"/></g></svg></button><button class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon is-disabled" type="button" title="Newer request" disabled aria-label="Newer captured request" data-yii-debug-cursor="newer"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m6 15l6-6l6 6"/></g></svg></button><button class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon" type="button" title="Older request" aria-label="Older captured request" data-yii-debug-cursor="older"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m6 9l6 6l6-6"/></g></svg></button><button class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon" type="button" title="Oldest request" aria-label="Oldest captured request" data-yii-debug-cursor="oldest"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m7 7l5 5l5-5"/><path d="m7 13l5 5l5-5"/></g></svg></button>
+            </div>
+            </div>
+            </section>
+            </aside>
+            HTML,
+            SidebarRenderer::render($view),
             'Cursor mode must emit the Newest cursor button.',
         );
-        self::assertStringContainsString(
-            'data-yii-debug-cursor="older"',
-            $html,
-            'Cursor mode must emit the Older cursor button.',
-        );
-        self::assertStringContainsString('<button', $html, 'Cursor mode must use buttons instead of anchors.');
     }
 
     public function testRenderEmitsHistoryCursorMarkerWhenSnapshotIsCursor(): void
     {
         $view = new SidebarView(snapshot: $this->snapshot(isCursor: true, cursorInitTag: 'init-tag'), navItems: []);
 
-        $html = SidebarRenderer::render($view);
-
-        self::assertStringContainsString(
-            'data-yii-debug-history-cursor="true"',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <aside class="yii-debug-sidebar">
+            <section class="yii-debug-side-section yii-debug-request-nav" aria-label="Newest captured request" data-yii-debug-history-cursor="true" data-yii-debug-cursor-init="init-tag">
+            <header class="yii-debug-side-section-title">
+            Newest request
+            </header><div class="yii-debug-history-card" title="GET http://example.test/index.php">
+            <div class="yii-debug-snapshot-line">
+            <span class="yii-debug-snapshot-method yii-debug-verb-get" data-snapshot-field="method">GET</span><span class="yii-debug-snapshot-url" title="http://example.test/index.php" data-snapshot-field="url">/index.php</span>
+            </div><div class="yii-debug-snapshot-meta">
+            <span class="yii-debug-snapshot-status yii-debug-status-2xx" data-snapshot-field="status">200</span><span class="yii-debug-snapshot-time" data-snapshot-field="time">12:34:56</span><span class="yii-debug-snapshot-tag" data-snapshot-field="ajax">AJAX</span>
+            </div><div class="yii-debug-request-nav-row" role="group">
+            <button class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon is-disabled" type="button" title="Newest request" disabled aria-label="Newest captured request" data-yii-debug-cursor="newest"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m7 11l5-5l5 5"/><path d="m7 17l5-5l5 5"/></g></svg></button><button class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon is-disabled" type="button" title="Newer request" disabled aria-label="Newer captured request" data-yii-debug-cursor="newer"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m6 15l6-6l6 6"/></g></svg></button><button class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon" type="button" title="Older request" aria-label="Older captured request" data-yii-debug-cursor="older"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m6 9l6 6l6-6"/></g></svg></button><button class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon" type="button" title="Oldest request" aria-label="Oldest captured request" data-yii-debug-cursor="oldest"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m7 7l5 5l5-5"/><path d="m7 13l5 5l5-5"/></g></svg></button>
+            </div>
+            </div>
+            </section>
+            </aside>
+            HTML,
+            SidebarRenderer::render($view),
             'Cursor mode must emit a true history-cursor marker.',
         );
-        self::assertStringContainsString(
-            'data-yii-debug-cursor-init="init-tag"',
-            $html,
-            'Cursor init tag must surface as data attribute.',
-        );
+
     }
 
     public function testRenderEmitsIconSpanWhenNavItemDeclaresIconSvg(): void
@@ -106,23 +151,30 @@ public function testRenderEmitsIconSpanWhenNavItemDeclaresIconSvg(): void
             ],
         );
 
-        $html = SidebarRenderer::render($view);
-
-        self::assertStringContainsString(
-            'yii-debug-nav-link-icon',
-            $html,
+        self::assertSame(
+            <<<HTML
+            <aside class="yii-debug-sidebar">
+            <nav class="yii-debug-nav yii-debug-nav-iconed" aria-label="Debug panels">
+            <ul>
+            <li>
+            <a class="yii-debug-nav-link" href="/debug/view?panel=request" title="Request">
+            <span class="yii-debug-nav-link-icon" aria-hidden="true">
+            <svg data-test="request-icon"></svg>
+            </span>
+            <span class="yii-debug-nav-link-label">
+            Request
+            </span>
+            </a>
+            </li>
+            </ul>
+            </nav>
+            </aside>
+            HTML,
+            SidebarRenderer::render($view),
             'Nav item with iconSvg must wrap the markup in the icon span.',
         );
-        self::assertStringContainsString(
-            'data-test="request-icon"',
-            $html,
-            'Icon SVG payload must surface inside the nav link.',
-        );
-        self::assertStringContainsString(
-            'aria-hidden="true"',
-            $html,
-            'Decorative panel icons must remain hidden from assistive technology.',
-        );
+
+
     }
 
     public function testRenderHidesAjaxTagWhenNotAjax(): void
@@ -151,8 +203,24 @@ public function testRenderShowsDashWhenStatusCodeIsZero(): void
     {
         $view = new SidebarView(snapshot: $this->snapshot(statusCode: 0), navItems: []);
 
-        self::assertStringContainsString(
-            '>–<',
+        self::assertSame(
+            <<<HTML
+            <aside class="yii-debug-sidebar">
+            <section class="yii-debug-side-section yii-debug-request-nav" aria-label="Current request">
+            <header class="yii-debug-side-section-title">
+            Current request
+            </header><div class="yii-debug-history-card" title="GET http://example.test/index.php">
+            <div class="yii-debug-snapshot-line">
+            <span class="yii-debug-snapshot-method yii-debug-verb-get" data-snapshot-field="method">GET</span><span class="yii-debug-snapshot-url" title="http://example.test/index.php" data-snapshot-field="url">/index.php</span>
+            </div><div class="yii-debug-snapshot-meta">
+            <span class="yii-debug-snapshot-status yii-debug-status-2xx" data-snapshot-field="status">–</span><span class="yii-debug-snapshot-time" data-snapshot-field="time">12:34:56</span><span class="yii-debug-snapshot-tag" data-snapshot-field="ajax">AJAX</span>
+            </div><div class="yii-debug-request-nav-row" role="group">
+            <button class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon is-disabled" type="button" title="Newest request" disabled aria-label="Newest captured request"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m7 11l5-5l5 5"/><path d="m7 17l5-5l5 5"/></g></svg></button><button class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon is-disabled" type="button" title="Newer request" disabled aria-label="Newer captured request"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m6 15l6-6l6 6"/></g></svg></button><a class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon" href="/debug/view?tag=older" title="Older request" aria-label="Older captured request"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m6 9l6 6l6-6"/></g></svg></a><a class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon" href="/debug/view?tag=oldest" title="Oldest request" aria-label="Oldest captured request"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m7 7l5 5l5-5"/><path d="m7 13l5 5l5-5"/></g></svg></a>
+            </div>
+            </div>
+            </section>
+            </aside>
+            HTML,
             SidebarRenderer::render($view),
             'Status 0 must surface as an en-dash placeholder.',
         );
@@ -162,8 +230,11 @@ public function testRenderSkipsSnapshotSectionWhenSnapshotIsNull(): void
     {
         $view = new SidebarView(snapshot: null, navItems: []);
 
-        self::assertStringNotContainsString(
-            'yii-debug-side-section',
+        self::assertSame(
+            <<<HTML
+            <aside class="yii-debug-sidebar">
+            </aside>
+            HTML,
             SidebarRenderer::render($view),
             'Null snapshot must skip the section entirely.',
         );
@@ -173,18 +244,46 @@ public function testRenderTintsSnapshotMethodAndStatusWithVocabularyClasses(): v
     {
         $html = SidebarRenderer::render(new SidebarView(snapshot: $this->snapshot(), navItems: []));
 
-        self::assertStringContainsString(
-            'class="yii-debug-snapshot-method yii-debug-verb-get"',
+        self::assertSame(
+            <<<HTML
+            <aside class="yii-debug-sidebar">
+            <section class="yii-debug-side-section yii-debug-request-nav" aria-label="Current request">
+            <header class="yii-debug-side-section-title">
+            Current request
+            </header><div class="yii-debug-history-card" title="GET http://example.test/index.php">
+            <div class="yii-debug-snapshot-line">
+            <span class="yii-debug-snapshot-method yii-debug-verb-get" data-snapshot-field="method">GET</span><span class="yii-debug-snapshot-url" title="http://example.test/index.php" data-snapshot-field="url">/index.php</span>
+            </div><div class="yii-debug-snapshot-meta">
+            <span class="yii-debug-snapshot-status yii-debug-status-2xx" data-snapshot-field="status">200</span><span class="yii-debug-snapshot-time" data-snapshot-field="time">12:34:56</span><span class="yii-debug-snapshot-tag" data-snapshot-field="ajax">AJAX</span>
+            </div><div class="yii-debug-request-nav-row" role="group">
+            <button class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon is-disabled" type="button" title="Newest request" disabled aria-label="Newest captured request"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m7 11l5-5l5 5"/><path d="m7 17l5-5l5 5"/></g></svg></button><button class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon is-disabled" type="button" title="Newer request" disabled aria-label="Newer captured request"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m6 15l6-6l6 6"/></g></svg></button><a class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon" href="/debug/view?tag=older" title="Older request" aria-label="Older captured request"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m6 9l6 6l6-6"/></g></svg></a><a class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon" href="/debug/view?tag=oldest" title="Oldest request" aria-label="Oldest captured request"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m7 7l5 5l5-5"/><path d="m7 13l5 5l5-5"/></g></svg></a>
+            </div>
+            </div>
+            </section>
+            </aside>
+            HTML,
             $html,
             "GET must wear the 'get' verb class.",
         );
-        self::assertStringContainsString(
-            'class="yii-debug-snapshot-status yii-debug-status-2xx"',
-            $html,
-            "Status '200' must wear the '2xx' status class.",
-        );
-        self::assertStringContainsString(
-            'class="yii-debug-snapshot-status yii-debug-status-5xx"',
+
+        self::assertSame(
+            <<<HTML
+            <aside class="yii-debug-sidebar">
+            <section class="yii-debug-side-section yii-debug-request-nav" aria-label="Current request">
+            <header class="yii-debug-side-section-title">
+            Current request
+            </header><div class="yii-debug-history-card" title="GET http://example.test/index.php">
+            <div class="yii-debug-snapshot-line">
+            <span class="yii-debug-snapshot-method yii-debug-verb-get" data-snapshot-field="method">GET</span><span class="yii-debug-snapshot-url" title="http://example.test/index.php" data-snapshot-field="url">/index.php</span>
+            </div><div class="yii-debug-snapshot-meta">
+            <span class="yii-debug-snapshot-status yii-debug-status-5xx" data-snapshot-field="status">500</span><span class="yii-debug-snapshot-time" data-snapshot-field="time">12:34:56</span><span class="yii-debug-snapshot-tag" data-snapshot-field="ajax">AJAX</span>
+            </div><div class="yii-debug-request-nav-row" role="group">
+            <button class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon is-disabled" type="button" title="Newest request" disabled aria-label="Newest captured request"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m7 11l5-5l5 5"/><path d="m7 17l5-5l5 5"/></g></svg></button><button class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon is-disabled" type="button" title="Newer request" disabled aria-label="Newer captured request"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m6 15l6-6l6 6"/></g></svg></button><a class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon" href="/debug/view?tag=older" title="Older request" aria-label="Older captured request"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m6 9l6 6l6-6"/></g></svg></a><a class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon" href="/debug/view?tag=oldest" title="Oldest request" aria-label="Oldest captured request"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m7 7l5 5l5-5"/><path d="m7 13l5 5l5-5"/></g></svg></a>
+            </div>
+            </div>
+            </section>
+            </aside>
+            HTML,
             SidebarRenderer::render(new SidebarView(snapshot: $this->snapshot(statusCode: 500), navItems: [])),
             "Status '500' must wear the '5xx' status class.",
         );
@@ -196,16 +295,27 @@ public function testRenderWiresNavigationAnchorsInViewMode(): void
 
         $html = SidebarRenderer::render($view);
 
-        self::assertStringContainsString(
-            'aria-label="Newest captured request"',
+        self::assertSame(
+            <<<HTML
+            <aside class="yii-debug-sidebar">
+            <section class="yii-debug-side-section yii-debug-request-nav" aria-label="Current request">
+            <header class="yii-debug-side-section-title">
+            Current request
+            </header><div class="yii-debug-history-card" title="GET http://example.test/index.php">
+            <div class="yii-debug-snapshot-line">
+            <span class="yii-debug-snapshot-method yii-debug-verb-get" data-snapshot-field="method">GET</span><span class="yii-debug-snapshot-url" title="http://example.test/index.php" data-snapshot-field="url">/index.php</span>
+            </div><div class="yii-debug-snapshot-meta">
+            <span class="yii-debug-snapshot-status yii-debug-status-2xx" data-snapshot-field="status">200</span><span class="yii-debug-snapshot-time" data-snapshot-field="time">12:34:56</span><span class="yii-debug-snapshot-tag" data-snapshot-field="ajax">AJAX</span>
+            </div><div class="yii-debug-request-nav-row" role="group">
+            <button class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon is-disabled" type="button" title="Newest request" disabled aria-label="Newest captured request"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m7 11l5-5l5 5"/><path d="m7 17l5-5l5 5"/></g></svg></button><button class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon is-disabled" type="button" title="Newer request" disabled aria-label="Newer captured request"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m6 15l6-6l6 6"/></g></svg></button><a class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon" href="/debug/view?tag=older" title="Older request" aria-label="Older captured request"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m6 9l6 6l6-6"/></g></svg></a><a class="yii-debug-btn yii-debug-btn-ghost yii-debug-btn-icon" href="/debug/view?tag=oldest" title="Oldest request" aria-label="Oldest captured request"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="m7 7l5 5l5-5"/><path d="m7 13l5 5l5-5"/></g></svg></a>
+            </div>
+            </div>
+            </section>
+            </aside>
+            HTML,
             $html,
             "Navigation mode must use the long 'aria-label' for Newest.",
         );
-        self::assertStringContainsString(
-            'title="GET http://example.test/index.php"',
-            $html,
-            'Snapshot tooltip must prefix the URL with the request method.',
-        );
         self::assertMatchesRegularExpression(
             '/<button class="[^"]*is-disabled"[^>]*aria-label="Newer captured request">/',
             $html,
@@ -216,11 +326,7 @@ public function testRenderWiresNavigationAnchorsInViewMode(): void
             $html,
             'An available older capture must render an anchor to its tag.',
         );
-        self::assertStringNotContainsString(
-            'data-yii-debug-cursor=',
-            $html,
-            'Navigation mode must NOT emit cursor buttons.',
-        );
+
     }
 
     private function snapshot(