@tscircuit/schematic-trace-solver 0.0.189 → 0.0.191

package/tests/solvers/LongDistancePairSolver/__snapshots__/vertical-rails.snap.svg

@@ -0,0 +1,86 @@
+<svg width="1200" height="2016" viewBox="0 0 1200 2016" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on top and Circuit JSON schematic on the bottom">
+  <g transform="translate(0, 0) scale(1.875, 1.875) translate(0, 0)">
+    <rect width="100%" height="100%" fill="white"/><g><polyline data-points="0.4,0 0.4,2" data-type="line" data-label="" points="368.69565217391306,563.4782608695652 368.69565217391306,320" fill="none" stroke="hsl(222, 100%, 50%, 0.8)" stroke-width="1px" stroke-dasharray="4 2"/></g><g><polyline data-points="0.4,0 0.4,4" data-type="line" data-label="" points="368.69565217391306,563.4782608695652 368.69565217391306,76.52173913043475" fill="none" stroke="hsl(222, 100%, 50%, 0.8)" stroke-width="1px" stroke-dasharray="4 2"/></g><g><polyline data-points="0.4,2 0.4,4" data-type="line" data-label="" points="368.69565217391306,320 368.69565217391306,76.52173913043475" fill="none" stroke="hsl(222, 100%, 50%, 0.8)" stroke-width="1px" stroke-dasharray="4 2"/></g><g><polyline data-points="-0.4,0 -0.4,2" data-type="line" data-label="" points="271.30434782608694,563.4782608695652 271.30434782608694,320" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1px" stroke-dasharray="4 2"/></g><g><polyline data-points="-0.4,0 -0.4,4" data-type="line" data-label="" points="271.30434782608694,563.4782608695652 271.30434782608694,76.52173913043475" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1px" stroke-dasharray="4 2"/></g><g><polyline data-points="-0.4,2 -0.4,4" data-type="line" data-label="" points="271.30434782608694,320 271.30434782608694,76.52173913043475" fill="none" stroke="hsl(157, 100%, 50%, 0.8)" stroke-width="1px" stroke-dasharray="4 2"/></g><g><polyline data-points="0.4,0 0.6000000000000001,0 0.6000000000000001,2 0.4,2" data-type="line" data-label="" points="368.69565217391306,563.4782608695652 393.0434782608696,563.4782608695652 393.0434782608696,320 368.69565217391306,320" fill="none" stroke="purple" stroke-width="1px"/></g><g><polyline data-points="0.6000000000000001,2 0.6000000000000001,4 0.4,4" data-type="line" data-label="" points="393.0434782608696,320 393.0434782608696,76.52173913043475 368.69565217391306,76.52173913043475" fill="none" stroke="purple" stroke-width="1px"/></g><g><polyline data-points="-0.4,0 -0.6000000000000001,0 -0.6000000000000001,2 -0.4,2" data-type="line" data-label="" points="271.30434782608694,563.4782608695652 246.9565217391304,563.4782608695652 246.9565217391304,320 271.30434782608694,320" fill="none" stroke="purple" stroke-width="1px"/></g><g><polyline data-points="-0.6000000000000001,2 -0.6000000000000001,4 -0.4,4" data-type="line" data-label="" points="246.9565217391304,320 246.9565217391304,76.52173913043475 271.30434782608694,76.52173913043475" fill="none" stroke="purple" stroke-width="1px"/></g><g><rect data-type="rect" data-label="C1" data-x="0" data-y="0" x="271.30434782608694" y="526.9565217391305" width="97.39130434782612" height="73.0434782608695" fill="hsl(326, 100%, 50%, 0.8)" stroke="black" stroke-width="0.008214285714285714"/></g><g><rect data-type="rect" data-label="C2" data-x="0" data-y="2" x="271.30434782608694" y="283.47826086956525" width="97.39130434782612" height="73.0434782608695" fill="hsl(327, 100%, 50%, 0.8)" stroke="black" stroke-width="0.008214285714285714"/></g><g><rect data-type="rect" data-label="C3" data-x="0" data-y="4" x="271.30434782608694" y="40" width="97.39130434782612" height="73.0434782608695" fill="hsl(328, 100%, 50%, 0.8)" stroke="black" stroke-width="0.008214285714285714"/></g><g><rect data-type="rect" data-label="netId: VDD
+globalConnNetId: connectivity_net0" data-x="0.8250000000000001" data-y="0" x="393.0434782608696" y="551.304347826087" width="54.78260869565213" height="24.347826086956502" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.008214285714285714"/></g><g><rect data-type="rect" data-label="netId: GND
+globalConnNetId: connectivity_net1" data-x="-0.8250000000000001" data-y="0" x="192.17391304347825" y="551.304347826087" width="54.78260869565216" height="24.347826086956502" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.008214285714285714"/></g><g><circle data-type="point" data-label="C1.1
+x+" data-x="0.4" data-y="0" cx="368.69565217391306" cy="563.4782608695652" r="3" fill="hsl(121, 100%, 50%, 0.8)"/></g><g><circle data-type="point" data-label="C1.2
+x-" data-x="-0.4" data-y="0" cx="271.30434782608694" cy="563.4782608695652" r="3" fill="hsl(122, 100%, 50%, 0.8)"/></g><g><circle data-type="point" data-label="C2.2
+x-" data-x="-0.4" data-y="2" cx="271.30434782608694" cy="320" r="3" fill="hsl(3, 100%, 50%, 0.8)"/></g><g><circle data-type="point" data-label="C2.1
+x+" data-x="0.4" data-y="2" cx="368.69565217391306" cy="320" r="3" fill="hsl(2, 100%, 50%, 0.8)"/></g><g><circle data-type="point" data-label="C3.1
+x+" data-x="0.4" data-y="4" cx="368.69565217391306" cy="76.52173913043475" r="3" fill="hsl(243, 100%, 50%, 0.8)"/></g><g><circle data-type="point" data-label="C3.2
+x-" data-x="-0.4" data-y="4" cx="271.30434782608694" cy="76.52173913043475" r="3" fill="hsl(244, 100%, 50%, 0.8)"/></g><g><circle data-type="point" data-label="anchorPoint
+orientation: x+" data-x="0.6000000000000001" data-y="0" cx="393.0434782608696" cy="563.4782608695652" r="3" fill="hsl(40, 100%, 50%, 0.9)"/></g><g><circle data-type="point" data-label="anchorPoint
+orientation: x-" data-x="-0.6000000000000001" data-y="0" cx="246.9565217391304" cy="563.4782608695652" r="3" fill="hsl(40, 100%, 50%, 0.9)"/></g><g id="crosshair" style="display: none"><line id="crosshair-h" y1="0" y2="640" stroke="#666" stroke-width="0.5"/><line id="crosshair-v" x1="0" x2="640" stroke="#666" stroke-width="0.5"/><text id="coordinates" font-family="monospace" font-size="12" fill="#666"></text></g><script><![CDATA[
+              document.currentScript.parentElement.addEventListener('mousemove', (e) => {
+                const svg = e.currentTarget;
+                const rect = svg.getBoundingClientRect();
+                const x = e.clientX - rect.left;
+                const y = e.clientY - rect.top;
+                const crosshair = svg.getElementById('crosshair');
+                const h = svg.getElementById('crosshair-h');
+                const v = svg.getElementById('crosshair-v');
+                const coords = svg.getElementById('coordinates');
+
+                crosshair.style.display = 'block';
+                h.setAttribute('x1', '0');
+                h.setAttribute('x2', '640');
+                h.setAttribute('y1', y);
+                h.setAttribute('y2', y);
+                v.setAttribute('x1', x);
+                v.setAttribute('x2', x);
+                v.setAttribute('y1', '0');
+                v.setAttribute('y2', '640');
+
+                // Calculate real coordinates using inverse transformation
+                const matrix = {"a":121.73913043478262,"c":0,"e":320,"b":0,"d":-121.73913043478262,"f":563.4782608695652};
+                // Manually invert and apply the affine transform
+                // Since we only use translate and scale, we can directly compute:
+                // x' = (x - tx) / sx
+                // y' = (y - ty) / sy
+                const sx = matrix.a;
+                const sy = matrix.d;
+                const tx = matrix.e;
+                const ty = matrix.f;
+                const realPoint = {
+                  x: (x - tx) / sx,
+                  y: (y - ty) / sy // Flip y back since we used negative scale
+                }
+
+                coords.textContent = `(${realPoint.x.toFixed(2)}, ${realPoint.y.toFixed(2)})`;
+                coords.setAttribute('x', (x + 5).toString());
+                coords.setAttribute('y', (y - 5).toString());
+              });
+              document.currentScript.parentElement.addEventListener('mouseleave', () => {
+                document.currentScript.parentElement.getElementById('crosshair').style.display = 'none';
+              });
+            ]]></script>
+  </g>
+  <g transform="translate(0, 1216)">
+    <style>
+              .boundary { fill: rgb(245, 241, 237); }
+              .schematic-boundary { fill: none; stroke: #fff; }
+              .component { fill: none; stroke: rgb(132, 0, 0); }
+              .chip { fill: rgb(255, 255, 194); stroke: rgb(132, 0, 0); }
+              .component-pin { fill: none; stroke: rgb(132, 0, 0); }
+              .text { font-family: sans-serif; fill: rgb(0, 150, 0); }
+              .pin-number { fill: rgb(169, 0, 0); }
+              .port-label { fill: rgb(0, 100, 100); }
+              .component-name { fill: rgb(0, 100, 100); }
+
+            </style><rect class="boundary" x="0" y="0" width="1200" height="800"/><g class="trace sch-trace" data-layer="base" data-circuit-json-type="schematic_trace" data-schematic-trace-id="schematic_trace_0__stack1"><path d="M 654.54545454544 672.7272727273 L 681.81818181816 672.7272727273 L 681.81818181816 400.00000000010004 L 654.54545454544 400.00000000010004" class="trace-invisible-hover-outline sch-trace-hitbox" stroke="rgb(0, 150, 0)" fill="none" stroke-width="21.818181818176px" stroke-linecap="round" opacity="0" stroke-linejoin="round"/><path class="sch-trace-path" d="M 654.54545454544 672.7272727273 L 681.81818181816 672.7272727273 L 681.81818181816 400.00000000010004 L 654.54545454544 400.00000000010004" stroke="rgb(0, 150, 0)" fill="none" stroke-width="2.727272727272px" stroke-linecap="round" stroke-linejoin="round"/></g><g class="trace sch-trace" data-layer="base" data-circuit-json-type="schematic_trace" data-schematic-trace-id="schematic_trace_1__stack1"><path d="M 681.81818181816 400.00000000010004 L 681.81818181816 127.27272727290006 L 654.54545454544 127.27272727290006" class="trace-invisible-hover-outline sch-trace-hitbox" stroke="rgb(0, 150, 0)" fill="none" stroke-width="21.818181818176px" stroke-linecap="round" opacity="0" stroke-linejoin="round"/><path class="sch-trace-path" d="M 681.81818181816 400.00000000010004 L 681.81818181816 127.27272727290006 L 654.54545454544 127.27272727290006" stroke="rgb(0, 150, 0)" fill="none" stroke-width="2.727272727272px" stroke-linecap="round" stroke-linejoin="round"/></g><g class="trace sch-trace" data-layer="base" data-circuit-json-type="schematic_trace" data-schematic-trace-id="schematic_trace_2__stack1"><path d="M 545.45454545456 672.7272727273 L 518.18181818184 672.7272727273 L 518.18181818184 400.00000000010004 L 545.45454545456 400.00000000010004" class="trace-invisible-hover-outline sch-trace-hitbox" stroke="rgb(0, 150, 0)" fill="none" stroke-width="21.818181818176px" stroke-linecap="round" opacity="0" stroke-linejoin="round"/><path class="sch-trace-path" d="M 545.45454545456 672.7272727273 L 518.18181818184 672.7272727273 L 518.18181818184 400.00000000010004 L 545.45454545456 400.00000000010004" stroke="rgb(0, 150, 0)" fill="none" stroke-width="2.727272727272px" stroke-linecap="round" stroke-linejoin="round"/></g><g class="trace sch-trace" data-layer="base" data-circuit-json-type="schematic_trace" data-schematic-trace-id="schematic_trace_3__stack1"><path d="M 518.18181818184 400.00000000010004 L 518.18181818184 127.27272727290006 L 545.45454545456 127.27272727290006" class="trace-invisible-hover-outline sch-trace-hitbox" stroke="rgb(0, 150, 0)" fill="none" stroke-width="21.818181818176px" stroke-linecap="round" opacity="0" stroke-linejoin="round"/><path class="sch-trace-path" d="M 518.18181818184 400.00000000010004 L 518.18181818184 127.27272727290006 L 545.45454545456 127.27272727290006" stroke="rgb(0, 150, 0)" fill="none" stroke-width="2.727272727272px" stroke-linecap="round" stroke-linejoin="round"/></g><g class="trace-overlays sch-trace-overlays" data-layer="overlay" data-circuit-json-type="schematic_trace" data-schematic-trace-id="schematic_trace_0__stack1"><circle cx="681.81818181816" cy="400.00000000010004" r="4.090909090907999" class="trace-junction sch-trace-junction" fill="rgb(0, 150, 0)"/></g><g class="trace-overlays sch-trace-overlays" data-layer="overlay" data-circuit-json-type="schematic_trace" data-schematic-trace-id="schematic_trace_1__stack1"/><g class="trace-overlays sch-trace-overlays" data-layer="overlay" data-circuit-json-type="schematic_trace" data-schematic-trace-id="schematic_trace_2__stack1"><circle cx="518.18181818184" cy="400.00000000010004" r="4.090909090907999" class="trace-junction sch-trace-junction" fill="rgb(0, 150, 0)"/></g><g class="trace-overlays sch-trace-overlays" data-layer="overlay" data-circuit-json-type="schematic_trace" data-schematic-trace-id="schematic_trace_3__stack1"/><g class="sch-component" data-circuit-json-type="schematic_component" data-schematic-component-id="schematic_component_0__stack1"><rect class="component-overlay sch-component-overlay" x="545.45454545456" y="643.6327272727623" width="109.0909090908799" height="58.1890909090755" fill="transparent"/><path class="sch-component-symbol-path" d="M 654.54545454544 672.7272727273 L 610.909090909088 672.7272727273" stroke="rgb(132, 0, 0)" fill="none" stroke-width="2.727272727272px" stroke-linecap="round"/><path class="sch-component-symbol-path" d="M 589.090909090912 672.7272727273 L 545.45454545456 672.7272727273" stroke="rgb(132, 0, 0)" fill="none" stroke-width="2.727272727272px" stroke-linecap="round"/><path class="sch-component-symbol-path" d="M 610.909090909088 643.6327272727623 L 610.909090909088 701.8218181818378" stroke="rgb(132, 0, 0)" fill="none" stroke-width="2.727272727272px" stroke-linecap="round"/><path class="sch-component-symbol-path" d="M 589.090909090912 643.6327272727623 L 589.090909090912 701.8218181818378" stroke="rgb(132, 0, 0)" fill="none" stroke-width="2.727272727272px" stroke-linecap="round"/><text class="sch-component-name sch-component-text" x="600" y="629.090909090948" stroke="rgb(245, 241, 237)" stroke-width="2.727272727272px" paint-order="stroke" fill="rgb(15, 15, 15)" font-family="sans-serif" text-anchor="middle" dominant-baseline="ideographic" font-size="24.545454545448px">C1</text><text class="sch-component-text" x="600" y="716.3636363636521" fill="rgb(15, 15, 15)" font-family="sans-serif" text-anchor="middle" dominant-baseline="hanging" font-size="24.545454545448px"></text></g><g class="sch-component" data-circuit-json-type="schematic_component" data-schematic-component-id="schematic_component_1__stack1"><rect class="component-overlay sch-component-overlay" x="545.45454545456" y="370.90545454556235" width="109.0909090908799" height="58.18909090907539" fill="transparent"/><path class="sch-component-symbol-path" d="M 654.54545454544 400.00000000010004 L 610.909090909088 400.00000000010004" stroke="rgb(132, 0, 0)" fill="none" stroke-width="2.727272727272px" stroke-linecap="round"/><path class="sch-component-symbol-path" d="M 589.090909090912 400.00000000010004 L 545.45454545456 400.00000000010004" stroke="rgb(132, 0, 0)" fill="none" stroke-width="2.727272727272px" stroke-linecap="round"/><path class="sch-component-symbol-path" d="M 610.909090909088 370.90545454556235 L 610.909090909088 429.09454545463774" stroke="rgb(132, 0, 0)" fill="none" stroke-width="2.727272727272px" stroke-linecap="round"/><path class="sch-component-symbol-path" d="M 589.090909090912 370.90545454556235 L 589.090909090912 429.09454545463774" stroke="rgb(132, 0, 0)" fill="none" stroke-width="2.727272727272px" stroke-linecap="round"/><text class="sch-component-name sch-component-text" x="600" y="356.363636363748" stroke="rgb(245, 241, 237)" stroke-width="2.727272727272px" paint-order="stroke" fill="rgb(15, 15, 15)" font-family="sans-serif" text-anchor="middle" dominant-baseline="ideographic" font-size="24.545454545448px">C2</text><text class="sch-component-text" x="600" y="443.6363636364521" fill="rgb(15, 15, 15)" font-family="sans-serif" text-anchor="middle" dominant-baseline="hanging" font-size="24.545454545448px"></text></g><g class="sch-component" data-circuit-json-type="schematic_component" data-schematic-component-id="schematic_component_2__stack1"><rect class="component-overlay sch-component-overlay" x="545.45454545456" y="98.17818181836236" width="109.0909090908799" height="58.18909090907539" fill="transparent"/><path class="sch-component-symbol-path" d="M 654.54545454544 127.27272727290006 L 610.909090909088 127.27272727290006" stroke="rgb(132, 0, 0)" fill="none" stroke-width="2.727272727272px" stroke-linecap="round"/><path class="sch-component-symbol-path" d="M 589.090909090912 127.27272727290006 L 545.45454545456 127.27272727290006" stroke="rgb(132, 0, 0)" fill="none" stroke-width="2.727272727272px" stroke-linecap="round"/><path class="sch-component-symbol-path" d="M 610.909090909088 98.17818181836236 L 610.909090909088 156.36727272743775" stroke="rgb(132, 0, 0)" fill="none" stroke-width="2.727272727272px" stroke-linecap="round"/><path class="sch-component-symbol-path" d="M 589.090909090912 98.17818181836236 L 589.090909090912 156.36727272743775" stroke="rgb(132, 0, 0)" fill="none" stroke-width="2.727272727272px" stroke-linecap="round"/><text class="sch-component-name sch-component-text" x="600" y="83.63636363654805" stroke="rgb(245, 241, 237)" stroke-width="2.727272727272px" paint-order="stroke" fill="rgb(15, 15, 15)" font-family="sans-serif" text-anchor="middle" dominant-baseline="ideographic" font-size="24.545454545448px">C3</text><text class="sch-component-text" x="600" y="170.90909090925206" fill="rgb(15, 15, 15)" font-family="sans-serif" text-anchor="middle" dominant-baseline="hanging" font-size="24.545454545448px"></text></g><g class="schematic-port-hover sch-port-hover" data-schematic-port-id="source_port_0_0__stack1"><circle cx="668.1818181818" cy="672.7272727273" r="5.454545454544" fill="red" opacity="0"/></g><g class="schematic-port-hover sch-port-hover" data-schematic-port-id="source_port_0_1__stack1"><circle cx="559.09090909092" cy="672.7272727273" r="5.454545454544" fill="red" opacity="0"/></g><g class="schematic-port-hover sch-port-hover" data-schematic-port-id="source_port_1_0__stack1"><circle cx="559.09090909092" cy="400.00000000010004" r="5.454545454544" fill="red" opacity="0"/></g><g class="schematic-port-hover sch-port-hover" data-schematic-port-id="source_port_1_1__stack1"><circle cx="668.1818181818" cy="400.00000000010004" r="5.454545454544" fill="red" opacity="0"/></g><g class="schematic-port-hover sch-port-hover" data-schematic-port-id="source_port_2_0__stack1"><circle cx="668.1818181818" cy="127.27272727290006" r="5.454545454544" fill="red" opacity="0"/></g><g class="schematic-port-hover sch-port-hover" data-schematic-port-id="source_port_2_1__stack1"><circle cx="559.09090909092" cy="127.27272727290006" r="5.454545454544" fill="red" opacity="0"/></g><path class="net-label sch-net-label" data-circuit-json-type="schematic_net_label" data-schematic-net-label-id="schematic_net_label_0__stack1" d="
+    M 681.81818181816,672.7272727273
+    L 689.1818181817945,659.09090909094
+    L 735.9454545454183,659.09090909094
+    L 735.9454545454183,686.36363636366
+    L 689.1818181817945,686.36363636366
+    Z
+  " fill="rgba(255, 255, 255, 0.6)" stroke="rgb(132, 0, 0)" stroke-width="2.727272727272px"/><text class="net-label-text sch-net-label-text" data-circuit-json-type="schematic_net_label" data-schematic-net-label-id="schematic_net_label_0__stack1" x="694.090909090884" y="672.7272727273" fill="rgb(132, 0, 0)" text-anchor="start" dominant-baseline="central" font-family="sans-serif" font-variant-numeric="tabular-nums" font-size="24.545454545448px" transform="">XX</text><path class="net-label sch-net-label" data-circuit-json-type="schematic_net_label" data-schematic-net-label-id="schematic_net_label_1__stack1" d="
+    M 518.18181818184,672.7272727273
+    L 510.8181818182056,686.36363636366
+    L 464.05454545458167,686.36363636366
+    L 464.05454545458167,659.09090909094
+    L 510.8181818182056,659.09090909094
+    Z
+  " fill="rgba(255, 255, 255, 0.6)" stroke="rgb(132, 0, 0)" stroke-width="2.727272727272px"/><text class="net-label-text sch-net-label-text" data-circuit-json-type="schematic_net_label" data-schematic-net-label-id="schematic_net_label_1__stack1" x="505.90909090911595" y="672.7272727273" fill="rgb(132, 0, 0)" text-anchor="end" dominant-baseline="central" font-family="sans-serif" font-variant-numeric="tabular-nums" font-size="24.545454545448px" transform="">XX</text>
+  </g>
+</svg>

package/tests/solvers/LongDistancePairSolver/parallel-decoupling-labels.test.ts

@@ -0,0 +1,505 @@
+import { expect, test } from "bun:test"
+import { SchematicTracePipelineSolver } from "lib/solvers/SchematicTracePipelineSolver/SchematicTracePipelineSolver"
+import { getTraceConnectedPinComponents } from "lib/solvers/SchematicTraceLinesSolver/getTraceConnectedPinComponents"
+import type { InputProblem } from "lib/types/InputProblem"
+import "tests/fixtures/matcher"
+
+const createBank = (): InputProblem => ({
+  chips: [0, 2, 4].map((x, index) => ({
+    chipId: `C${index + 1}`,
+    center: { x, y: 0 },
+    width: 0.6,
+    height: 0.8,
+    pins: [
+      { pinId: `C${index + 1}.1`, x, y: 0.4 },
+      { pinId: `C${index + 1}.2`, x, y: -0.4 },
+    ],
+  })),
+  directConnections: [],
+  netConnections: [
+    { netId: "VDD", pinIds: ["C1.1", "C2.1", "C3.1"] },
+    { netId: "GND", isGround: true, pinIds: ["C1.2", "C2.2", "C3.2"] },
+  ],
+  availableNetLabelOrientations: { VDD: ["y+"], GND: ["y-"] },
+  maxMspPairDistance: 1,
+})
+
+const solve = (input: InputProblem) => {
+  const solver = new SchematicTracePipelineSolver(input)
+  solver.solve()
+  expect(solver.solved).toBe(true)
+  expect(solver.failed).toBe(false)
+  return solver
+}
+
+for (const rotated of [false, true]) {
+  test(`aligned parallel capacitors share rails (rotated=${rotated})`, async () => {
+    const input = createBank()
+    if (rotated) {
+      for (const chip of input.chips) {
+        chip.center = { x: chip.center.y, y: chip.center.x }
+        ;[chip.width, chip.height] = [chip.height, chip.width]
+        for (const pin of chip.pins) [pin.x, pin.y] = [pin.y, pin.x]
+      }
+      input.availableNetLabelOrientations = { VDD: ["x+"], GND: ["x-"] }
+    }
+    // Rail detection should not depend on pin order or component metadata.
+    input.chips[1]!.pins.reverse()
+    const solver = solve(input)
+    expect(solver.longDistancePairSolver!.getOutput().newTraces).toEqual([])
+    const { traces, netLabelPlacements } =
+      solver.netLabelToTraceSolver!.getOutput()
+    expect(netLabelPlacements).toHaveLength(2)
+    expect(traces).toHaveLength(4)
+    for (const net of input.netConnections) {
+      const components = getTraceConnectedPinComponents({
+        pinIds: net.pinIds,
+        traces,
+      })
+      expect(components).toHaveLength(1)
+      // Every rail stays outside the component bodies on its own side.
+      const sign = net.netId === "GND" ? -1 : 1
+      for (const trace of components[0]!.traces) {
+        for (const point of trace.tracePath) {
+          expect(sign * point[rotated ? "x" : "y"]).toBeGreaterThanOrEqual(
+            0.4 - 1e-6,
+          )
+        }
+      }
+    }
+    await expect(solver).toMatchSolverSnapshot(
+      import.meta.path,
+      rotated ? "vertical-rails" : "horizontal-rails",
+    )
+  })
+}
+
+test("keeps shared rails within the configured routing distance", () => {
+  const input = createBank()
+  input.maxMspPairDistance = 2
+  const solver = solve(input)
+  expect(solver.mspConnectionPairSolver!.mspConnectionPairs).toHaveLength(4)
+  expect(
+    solver.netLabelToTraceSolver!.getOutput().netLabelPlacements,
+  ).toHaveLength(2)
+})
+
+test("uniformly spaced capacitor rows retain shared rails at a wider pitch", () => {
+  const input = createBank()
+  for (const chip of input.chips) {
+    chip.center.x *= 3
+    for (const pin of chip.pins) pin.x *= 3
+  }
+  const solver = solve(input)
+  expect(solver.mspConnectionPairSolver!.mspConnectionPairs).toHaveLength(4)
+  expect(solver.longDistancePairSolver!.getOutput().newTraces).toEqual([])
+  const { traces, netLabelPlacements } =
+    solver.netLabelToTraceSolver!.getOutput()
+  expect(traces).toHaveLength(4)
+  expect(netLabelPlacements).toHaveLength(2)
+})
+
+test("preserves explicitly wired rails while labeling the independent ground pins", () => {
+  const input = createBank()
+  input.directConnections = [
+    { pinIds: ["C1.1", "C2.1"] },
+    { pinIds: ["C2.1", "C3.1"] },
+  ]
+  const solver = solve(input)
+  const recovered = solver.longDistancePairSolver!.getOutput().newTraces
+  expect(recovered.length).toBeGreaterThan(0)
+  expect(
+    recovered.every((trace) => trace.pinIds.every((pin) => pin.endsWith(".1"))),
+  ).toBe(true)
+})
+
+test("fallback labels allow shared rails without long-distance recovery", () => {
+  const input = createBank()
+  input.directConnections = [
+    { pinIds: ["C1.1", "C2.1"], netLabelWidth: 0.5 },
+    { pinIds: ["C2.1", "C3.1"], netLabelWidth: 0.5 },
+  ]
+  const solver = solve(input)
+  expect(solver.longDistancePairSolver!.getOutput().newTraces).toEqual([])
+  expect(
+    solver.netLabelToTraceSolver!.getOutput().netLabelPlacements,
+  ).toHaveLength(2)
+})
+
+test("recognizes a ground alias by its metadata and global connectivity", () => {
+  const input = createBank()
+  input.netConnections[1]!.netId = "return-net"
+  input.netConnections[1]!.isGround = true
+  input.netConnections.push({ netId: "alias", pinIds: ["C1.2"] })
+  input.availableNetLabelOrientations = { VDD: ["y+"], "return-net": ["y-"] }
+  const solver = solve(input)
+  expect(solver.longDistancePairSolver!.getOutput().newTraces).toEqual([])
+  expect(solver.mspConnectionPairSolver!.mspConnectionPairs).toHaveLength(4)
+})
+
+test("preserves long-distance recovery for unrelated signal connections", () => {
+  const input = createBank()
+  input.netConnections[1]!.netId = "SIGNAL"
+  input.netConnections[1]!.isGround = false
+  expect(
+    solve(input).longDistancePairSolver!.getOutput().newTraces.length,
+  ).toBeGreaterThan(0)
+})
+
+test.each([undefined, false])(
+  "does not infer ground from the net name when isGround=%s",
+  (isGround) => {
+    const input = createBank()
+    input.netConnections[1]!.isGround = isGround
+    const solver = solve(input)
+    expect(solver.mspConnectionPairSolver!.mspConnectionPairs).toHaveLength(0)
+    expect(
+      solver.longDistancePairSolver!.getOutput().newTraces.length,
+    ).toBeGreaterThan(0)
+  },
+)
+
+for (const { rotated, pitch } of [
+  { rotated: false, pitch: 2 },
+  { rotated: true, pitch: 2 },
+  { rotated: false, pitch: 6 },
+  { rotated: true, pitch: 6 },
+]) {
+  test(`large gaps separate aligned capacitor banks (rotated=${rotated}, pitch=${pitch})`, () => {
+    const input = createBank()
+    input.chips = [0, 1, 4.5, 5.5].map((offset, index) => ({
+      ...structuredClone(input.chips[0]!),
+      chipId: `C${index + 1}`,
+      center: rotated
+        ? { x: 0, y: offset * pitch }
+        : { x: offset * pitch, y: 0 },
+      width: rotated ? 0.8 : 0.6,
+      height: rotated ? 0.6 : 0.8,
+      pins: [0.4, -0.4].map((pinOffset, pinIndex) => ({
+        pinId: `C${index + 1}.${pinIndex + 1}`,
+        x: rotated ? pinOffset : offset * pitch,
+        y: rotated ? offset * pitch : pinOffset,
+      })),
+    }))
+    input.netConnections[0]!.isGround = false
+    for (const [index, net] of input.netConnections.entries()) {
+      net.pinIds = input.chips.map((chip) => chip.pins[index]!.pinId)
+    }
+    if (rotated) {
+      input.availableNetLabelOrientations = { VDD: ["x+"], GND: ["x-"] }
+    }
+    const solver = solve(input)
+    expect(solver.mspConnectionPairSolver!.mspConnectionPairs).toHaveLength(4)
+    expect(solver.longDistancePairSolver!.getOutput().newTraces).toEqual([])
+    const { traces, netLabelPlacements } =
+      solver.netLabelToTraceSolver!.getOutput()
+    expect(traces).toHaveLength(4)
+    expect(netLabelPlacements).toHaveLength(4)
+    for (const [index, net] of input.netConnections.entries()) {
+      const components = getTraceConnectedPinComponents({
+        pinIds: net.pinIds,
+        traces,
+      })
+      expect(components.map((component) => component.pinIds.sort())).toEqual([
+        [`C1.${index + 1}`, `C2.${index + 1}`],
+        [`C3.${index + 1}`, `C4.${index + 1}`],
+      ])
+      for (const component of components) {
+        expect(
+          netLabelPlacements.filter((label) =>
+            label.pinIds.some((pinId) => component.pinIds.includes(pinId)),
+          ),
+        ).toHaveLength(1)
+      }
+    }
+  })
+}
+
+test("two isolated capacitors do not form a rail across a large gap", () => {
+  const input = createBank()
+  input.chips.splice(1, 1)
+  for (const net of input.netConnections) net.pinIds.splice(1, 1)
+  const solver = solve(input)
+  expect(solver.mspConnectionPairSolver!.mspConnectionPairs).toHaveLength(0)
+  expect(solver.longDistancePairSolver!.getOutput().newTraces).toEqual([])
+  const { traces, netLabelPlacements } =
+    solver.netLabelToTraceSolver!.getOutput()
+  expect(traces).toHaveLength(0)
+  expect(netLabelPlacements).toHaveLength(4)
+})
+
+test.each([4, 7])(
+  "rail separation survives ground recovery across a gap of %d",
+  (gap) => {
+    const input = createBank()
+    input.chips.splice(1, 1)
+    input.chips[1]!.center.x = gap
+    for (const pin of input.chips[1]!.pins) pin.x = gap
+    input.chips.push({
+      chipId: "U1",
+      center: { x: gap / 2, y: -4 },
+      width: 1,
+      height: 1,
+      pins: [{ pinId: "U1.GND", x: gap / 2, y: -4.5 }],
+    })
+    input.netConnections = [
+      { netId: "VDD1", isGround: false, pinIds: ["C1.1"] },
+      { netId: "VDD2", isGround: false, pinIds: ["C3.1"] },
+      { netId: "GND", isGround: true, pinIds: ["C1.2", "C3.2", "U1.GND"] },
+    ]
+    input.availableNetLabelOrientations = {
+      VDD1: ["y+"],
+      VDD2: ["y+"],
+      GND: ["y-"],
+    }
+
+    const solver = solve(input)
+    expect(solver.mspConnectionPairSolver!.mspConnectionPairs).toHaveLength(0)
+    expect(solver.longDistancePairSolver!.getOutput().newTraces).toEqual([])
+    const { traces, netLabelPlacements } =
+      solver.netLabelToTraceSolver!.getOutput()
+    expect(traces).toHaveLength(0)
+    expect(netLabelPlacements).toHaveLength(5)
+  },
+)
+
+test("keeps distant net-only loads local even when they are staggered", () => {
+  const input = createBank()
+  for (const [index, chip] of input.chips.entries()) {
+    chip.center.y += index * 2
+    for (const pin of chip.pins) pin.y += index * 2
+  }
+  expect(solve(input).longDistancePairSolver!.getOutput().newTraces).toEqual([])
+})
+
+test("different-size components do not bypass the net connection distance", () => {
+  const input = createBank()
+  for (const [index, chip] of input.chips.entries()) {
+    chip.height += index * 0.2
+    chip.pins[0]!.y += index * 0.1
+    chip.pins[1]!.y -= index * 0.1
+  }
+  const solver = solve(input)
+  expect(solver.longDistancePairSolver!.getOutput().newTraces).toEqual([])
+  expect(
+    solver.netLabelToTraceSolver!.getOutput().netLabelPlacements,
+  ).toHaveLength(6)
+})
+
+test("parallel branch labeling does not depend on optional symbol metadata", () => {
+  const input = createBank()
+  for (const chip of input.chips) chip.symbolName = "resistor"
+  const solver = solve(input)
+  expect(solver.longDistancePairSolver!.getOutput().newTraces).toEqual([])
+  expect(
+    solver.netLabelToTraceSolver!.getOutput().netLabelPlacements,
+  ).toHaveLength(6)
+})
+
+test("recognizes parallel banks across named-net aliases", () => {
+  const input = createBank()
+  input.netConnections = [
+    { netId: "VDD", pinIds: ["C1.1", "C2.1"] },
+    { netId: "VDD_ALIAS", pinIds: ["C2.1", "C3.1"] },
+    input.netConnections[1]!,
+  ]
+  expect(solve(input).longDistancePairSolver!.getOutput().newTraces).toEqual([])
+})
+
+test("final label-to-trace recovery preserves shared bank rails", () => {
+  const input = createBank()
+  input.netConnections[0]!.isGround = false
+  input.netConnections[1]!.isGround = true
+  const output = solve(input).netLabelToTraceSolver!.getOutput()
+  expect(output.traces.filter((trace) => trace.pinIds.length > 1)).toHaveLength(
+    4,
+  )
+  expect(output.netLabelPlacements).toHaveLength(2)
+})
+
+test("an explicit bank wire does not extend to other branches", () => {
+  const input = createBank()
+  input.directConnections = [{ pinIds: ["C1.1", "C2.1"] }]
+  const traces = solve(input).longDistancePairSolver!.getOutput().newTraces
+  expect(traces.map((trace) => [...trace.pinIds].sort())).toEqual([
+    ["C1.1", "C2.1"],
+  ])
+})
+
+test("different supplies share only the ground rail", () => {
+  const input = createBank()
+  input.netConnections = [
+    { netId: "VDD1", pinIds: ["C1.1"] },
+    { netId: "VDD2", pinIds: ["C2.1"] },
+    { netId: "VDD3", pinIds: ["C3.1"] },
+    input.netConnections[1]!,
+  ]
+  const output = solve(input).netLabelToTraceSolver!.getOutput()
+  expect(output.traces).toHaveLength(2)
+  expect(
+    output.traces.every((trace) =>
+      trace.pinIds.every((pinId) => pinId.endsWith(".2")),
+    ),
+  ).toBe(true)
+  expect(output.netLabelPlacements).toHaveLength(4)
+})
+
+test("loads connected through source wires retain their existing recovery", () => {
+  const input = createBank()
+  input.netConnections[0]!.pinIds = ["C1.1"]
+  input.directConnections = [
+    { pinIds: ["C1.1", "C2.1"] },
+    { pinIds: ["C2.1", "C3.1"] },
+  ]
+  const traces = solve(input).longDistancePairSolver!.getOutput().newTraces
+  expect(
+    traces.some((trace) => trace.pinIds.every((pinId) => pinId.endsWith(".2"))),
+  ).toBe(true)
+})
+
+test("two aligned capacitors can share both rails beyond the local distance", () => {
+  const input = createBank()
+  input.chips.pop()
+  for (const net of input.netConnections) net.pinIds.pop()
+  const solver = solve(input)
+  expect(solver.mspConnectionPairSolver!.mspConnectionPairs).toHaveLength(2)
+  expect(
+    solver.netLabelToTraceSolver!.getOutput().netLabelPlacements,
+  ).toHaveLength(2)
+})
+
+test("an intervening component breaks the shared rail", () => {
+  const input = createBank()
+  input.chips.push({
+    chipId: "barrier",
+    center: { x: 1, y: 0.6 },
+    width: 0.2,
+    height: 0.8,
+    pins: [],
+  })
+  const output = solve(input).netLabelToTraceSolver!.getOutput()
+  expect(output.traces).toHaveLength(2)
+  expect(
+    output.traces.every(
+      (trace) => !trace.pinIds.some((pinId) => pinId.startsWith("C1.")),
+    ),
+  ).toBe(true)
+  expect(
+    output.netLabelPlacements.filter((label) =>
+      label.pinIds.some((pinId) => pinId.startsWith("C1.")),
+    ),
+  ).toHaveLength(2)
+})
+
+test("shared rails stay within their schematic section", () => {
+  const input = createBank()
+  input.chips[2]!.sectionId = "separate"
+  const output = solve(input).netLabelToTraceSolver!.getOutput()
+  expect(output.traces).toHaveLength(2)
+  expect(
+    output.traces.every(
+      (trace) => !trace.pinIds.some((pinId) => pinId.startsWith("C3.")),
+    ),
+  ).toBe(true)
+  expect(output.netLabelPlacements).toHaveLength(4)
+})
+
+test("a common ground rail does not recover wires across interleaved supplies", () => {
+  const input = createBank()
+  input.chips = [0, 2, 4, 6, 8, 10].map((x, index) => ({
+    chipId: `C${index + 1}`,
+    center: { x, y: 0 },
+    width: 0.6,
+    height: 0.8,
+    pins: [
+      { pinId: `C${index + 1}.1`, x, y: 0.4 },
+      { pinId: `C${index + 1}.2`, x, y: -0.4 },
+    ],
+  }))
+  input.netConnections = [
+    { netId: "VDD", isGround: false, pinIds: ["C1.1", "C3.1", "C5.1"] },
+    { netId: "VEE", isGround: false, pinIds: ["C2.1", "C4.1", "C6.1"] },
+    {
+      netId: "GND",
+      isGround: true,
+      pinIds: input.chips.map((chip) => chip.pins[1]!.pinId),
+    },
+  ]
+  const solver = solve(input)
+  const output = solver.netLabelToTraceSolver!.getOutput()
+  expect(solver.longDistancePairSolver!.getOutput().newTraces).toHaveLength(0)
+  expect(output.traces).toHaveLength(5)
+  expect(
+    output.traces.every((trace) =>
+      trace.pinIds.every((pinId) => pinId.endsWith(".2")),
+    ),
+  ).toBe(true)
+  expect(output.netLabelPlacements).toHaveLength(7)
+})
+
+test("decoupling row shares GND while keeping DEC supplies separate", async () => {
+  const input = createBank()
+  input.chips = Array.from({ length: 6 }, (_, index) => ({
+    chipId: [
+      "C_MCU_VDD1",
+      "C_MCU_VDD3",
+      "C_MCU_VDD2",
+      "C_MCU_DEC1",
+      "C_MCU_DEC3",
+      "C_MCU_DEC4",
+    ][index]!,
+    symbolName: "capacitor_down",
+    center: { x: index * 3, y: 0 },
+    width: 0.6,
+    height: 0.76,
+    pins: [
+      { pinId: `C${index + 1}.1`, x: index * 3, y: 0.38 },
+      { pinId: `C${index + 1}.2`, x: index * 3, y: -0.38 },
+    ],
+  }))
+  input.netConnections = [
+    { netId: "V3V3", netLabelText: "V3V3", pinIds: ["C1.1", "C2.1", "C3.1"] },
+    ...["DEC1", "DEC3", "DEC4"].map((netId, index) => ({
+      netId,
+      netLabelText: netId,
+      pinIds: [`C${index + 4}.1`],
+    })),
+    {
+      netId: "GND",
+      isGround: true,
+      netLabelText: "GND",
+      pinIds: input.chips.map((chip) => chip.pins[1]!.pinId),
+    },
+  ]
+  input.availableNetLabelOrientations = {
+    V3V3: ["y+"],
+    DEC1: ["y+"],
+    DEC3: ["y+"],
+    DEC4: ["y+"],
+    GND: ["y-"],
+  }
+  const solver = solve(input)
+  const { traces, netLabelPlacements } =
+    solver.netLabelToTraceSolver!.getOutput()
+  expect(traces).toHaveLength(7)
+  expect(netLabelPlacements).toHaveLength(5)
+  for (const net of input.netConnections) {
+    expect(
+      getTraceConnectedPinComponents({ pinIds: net.pinIds, traces }),
+    ).toHaveLength(1)
+    expect(
+      netLabelPlacements.filter((label) => label.netId === net.netId),
+    ).toHaveLength(1)
+  }
+  for (const trace of traces) {
+    const pinNets = trace.pinIds.map(
+      (pinId) =>
+        input.netConnections.find((net) => net.pinIds.includes(pinId))!.netId,
+    )
+    expect(new Set(pinNets).size).toBe(1)
+  }
+  await expect(solver).toMatchSolverSnapshot(
+    import.meta.path,
+    "decoupling-mixed-supplies",
+  )
+})

package/tests/solvers/SameNetJunctionAlignmentSolver/collapse-same-net-cycles.test.ts

@@ -87,6 +87,36 @@ test("collapses a same-net cycle between a shared pin and crossing", () => {
   expect(result.netLabelPlacements[0]?.anchorPoint).toEqual({ x: 0, y: 0 })
 })
 
+test("collapses a cycle within one same-net trace", () => {
+  const traces = [
+    createTraceFixture({
+      mspPairId: "self-crossing-trace",
+      pinIds: ["start", "end"],
+      tracePath: [
+        { x: 0, y: 4 },
+        { x: 0, y: 0 },
+        { x: 4, y: 0 },
+        { x: 4, y: 2 },
+        { x: 1, y: 2 },
+        { x: 1, y: -1 },
+      ],
+    }),
+  ]
+
+  const result = collapseSameNetCycles({
+    traces,
+    netLabelPlacements: [],
+  })
+
+  expect(result.collapsedCycleCount).toBe(1)
+  expect(result.traces[0]?.tracePath).toEqual([
+    { x: 0, y: 4 },
+    { x: 0, y: 0 },
+    { x: 1, y: 0 },
+    { x: 1, y: -1 },
+  ])
+})
+
 test("keeps a valid shared same-net branch", () => {
   const traces = [
     createTraceFixture({