@tscircuit/fanout-solver 0.0.20 → 0.0.22

package/README.md

@@ -64,6 +64,9 @@ and treats each bus-layer decision atomically.
 - `compactBusTracks` bends each bus into a trace/clearance-pitch routing
   envelope, so a wide pad row does not consume a disproportionately wide
   breakout corridor.
+- `preferOriginalEndpointTracks` projects boundary tracks onto the original
+  downstream pad coordinates and prefers their layer when legal. This lets
+  ordered edge-pad buses make direct, visibly continuous pad connections.
 - Chamfers orthogonal routing corners into 45° segments before validating and
   emitting the fanout.
 - Verifies oriented-pad, via, trace, and already-routed fanout clearance on
@@ -77,6 +80,13 @@ and treats each bus-layer decision atomically.
   opt-in; different electrical nets remain hard obstacles.
 - Audits route continuity, unique connection coverage, boundary exits, and
   retained downstream endpoints before marking a solution complete.
+- `completeOriginalEndpoints` adds a bounded fail-first completion stage after
+  fanout. It first places DRC-gated interstitial capacitor escapes, then tries
+  breakout-to-pad routes with layer transitions at interior points along the
+  existing fanout copper, and finally a bounded capacity-router fallback. Vias
+  at original or moved routing endpoints are rejected. A candidate is retained
+  only when it improves independently proven original endpoint connectivity
+  and the complete emitted copper remains DRC-clean.
 - Emits supplied fanout traces, via obstacles, and moved breakout endpoints in a
   new `SimpleRouteJson`. The returned problem is ready for a downstream
   autorouter to finish.
@@ -115,6 +125,7 @@ const fanoutSolver = new FanoutSolver(simpleRouteJson, {
   availableCornersAndSides: ["top_left", "top", "top_right"],
   borderDistribution: "even",
   compactBusTracks: true,
+  preferOriginalEndpointTracks: true,
   buses: [
     {
       busId: "ground",
@@ -186,6 +197,10 @@ bus-layer combination search.
 
 - `simpleRouteJson`: the downstream routing problem with fanout prefixes
 - `fanoutTraces`: the newly supplied pad-to-breakout traces
+- `completionTraces`: optional DRC-gated traces from breakouts to original
+  endpoints
+- `endpointCompletion`: optional independent connectivity/DRC reports and
+  bounded-search diagnostics
 - `planeTerminations`: the completed local-via connection, layer, and via data
 - `busLayerAssignments`: the selected layer for every bus
 - `busDirections`: the direction shared by each bus
@@ -239,10 +254,16 @@ samples in parallel, and `--sample-timeout-seconds 600` prevents a difficult
 sample from blocking the remaining work. Each run writes the full ordered
 results to `benchmark-results/srj29.json` and
 `benchmark-results/srj29.md`. A row is marked solved only when every input
-connection has a validated breakout, all downstream endpoints remain attached,
-and the independent DRC audit passes. Partial solutions are reported as
-benchmark results instead of failing the command, making current completion
-rates a baseline for solver improvements. `bun run benchmark:srj29` is an alias
+connection has a validated breakout and an independent physical-copper audit
+proves that the emitted wires, vias, and same-net pads connect every original
+endpoint on compatible layers. A second independent audit checks every emitted
+trace and via against different-net pads, obstacles, traces, and vias on every
+physical layer in its span. Reaching an arbitrary boundary point, retaining an
+unrouted endpoint in the output JSON, or emitting copper with a DRC violation
+does not count. The report separates fanout-prefix completion from physically
+connected original connections so partial progress remains visible without
+overstating it as a solution. Partial solutions are reported as benchmark
+results instead of failing the command. `bun run benchmark:srj29` is an alias
 for the same command.
 
 The `SRJ29 Benchmark` GitHub Actions workflow runs the complete dataset on a

package/lib/build-output.ts

@@ -1,12 +1,14 @@
 import type { Obstacle, SimpleRouteJson } from "@tscircuit/capacity-autorouter"
-import type { FanoutRoutePlan } from "./types"
+import type { FanoutRoutePlan, SimpleRouteJsonWithFanoutPlanes } from "./types"
 
 function createViaObstacle(
   plan: FanoutRoutePlan,
   layerNames: string[],
+  endpoint = false,
 ): Obstacle | null {
-  if (!plan.via) return null
-  const zLayers = plan.via.spanLayers.map((layer) => {
+  const via = endpoint ? plan.planeEndpointVia : plan.via
+  if (!via) return null
+  const zLayers = via.spanLayers.map((layer) => {
     const layerIndex = layerNames.indexOf(layer)
     if (layerIndex < 0) {
       throw new Error(
@@ -16,12 +18,12 @@ function createViaObstacle(
     return layerIndex
   })
   return {
-    obstacleId: `fanout-via:${plan.connectionName}`,
+    obstacleId: `${endpoint ? "fanout-plane-endpoint-via" : "fanout-via"}:${plan.connectionName}`,
     type: "rect",
-    center: plan.via.center,
-    width: plan.via.diameter,
-    height: plan.via.diameter,
-    layers: plan.via.spanLayers,
+    center: via.center,
+    width: via.diameter,
+    height: via.diameter,
+    layers: via.spanLayers,
     zLayers,
     __zLayers: zLayers,
     connectedTo: [plan.connectionName, plan.trace.pcb_trace_id],
@@ -32,7 +34,7 @@ export function buildOutputSimpleRouteJson(params: {
   inputSrj: SimpleRouteJson
   plans: FanoutRoutePlan[]
   layerNames: string[]
-}): SimpleRouteJson {
+}): SimpleRouteJsonWithFanoutPlanes {
   const { inputSrj, plans, layerNames } = params
   const outputConnections = inputSrj.connections.map((connection) => ({
     ...connection,
@@ -62,9 +64,15 @@ export function buildOutputSimpleRouteJson(params: {
     }
     const viaObstacle = createViaObstacle(plan, layerNames)
     if (viaObstacle) viaObstacles.push(viaObstacle)
+    const endpointViaObstacle = createViaObstacle(plan, layerNames, true)
+    if (endpointViaObstacle) viaObstacles.push(endpointViaObstacle)
   }
-  const coordinateRoutePoints = plans.flatMap((plan) =>
-    plan.trace.route.filter(
+  const planTraces = plans.flatMap((plan) => [
+    plan.trace,
+    ...(plan.planeEndpointTrace ? [plan.planeEndpointTrace] : []),
+  ])
+  const coordinateRoutePoints = planTraces.flatMap((trace) =>
+    trace.route.filter(
       (
         routePoint,
       ): routePoint is Extract<typeof routePoint, { x: number; y: number }> =>
@@ -107,6 +115,16 @@ export function buildOutputSimpleRouteJson(params: {
 
   return {
     ...inputSrj,
+    fanoutPlaneConnectivity: plans.flatMap((plan) =>
+      plan.termination.type === "plane"
+        ? [
+            {
+              connectionName: plan.connectionName,
+              layer: plan.termination.layer,
+            },
+          ]
+        : [],
+    ),
     bounds: outputBounds,
     connections: outputConnections.filter(
       (connection) => !planeTerminatedConnectionNames.has(connection.name),
@@ -134,7 +152,7 @@ export function buildOutputSimpleRouteJson(params: {
         ...trace,
         route: trace.route.map((routePoint) => ({ ...routePoint })),
       })),
-      ...plans.map((plan) => plan.trace),
+      ...planTraces,
     ],
   }
 }