Merge feat/smooth: opt-in --smooth turns grid staircases into octilinear runs after routing

A short diagonal at a wire's end is a kink beside its pad, and the pour
refilled round it left a copper sliver (KiCad copper_sliver) on the
TerraHawk lights node. Small offsets now stay square jogs; chamfers get
the same floor.

CLAUDE.md

@@ -1,12 +1,12 @@
 # CLAUDE.md
 
-Guidance for Claude Code working in the `freeroute` repository.
+Guidance for Claude Code working in the `rpmroute` repository.
 
 ## What this is
 
 A native Python PCB autorouter: a Java-free reimplementation of the
 [FreeRouting](https://github.com/freerouting/freerouting) engine. Specctra DSN
-in, Specctra SES out, no JVM anywhere. Published on PyPI as `freeroute`
+in, Specctra SES out, no JVM anywhere. Published on PyPI as `rpmroute`
 (GPL-3.0-or-later, CalVer).
 
 ## Commands
@@ -16,7 +16,7 @@ uv sync
 uv run pytest -m "not oracle"        # the fast suite (this is what you run)
 uv run pytest -m oracle              # differential tests against the real JAR (needs Java)
 uv run ruff check src/ tests/
-uv run freeroute board.dsn --engine room --pack -do board.ses
+uv run rpmroute board.dsn --engine room --pack -do board.ses
 ```
 
 ## The three non-negotiable invariants
@@ -67,7 +67,7 @@ route/     grid_router | exact_router | room_router, shove, pipeline, cli
   decomposed into convex rooms joined by doors, so it routes off-grid channels
   the grid literally cannot see. DRC-clean. Supports `--pack` and `--shove`.
 
-The engine/option matrix lives in `freeroute.cli.ENGINE_OPTIONS` and is
+The engine/option matrix lives in `rpmroute.cli.ENGINE_OPTIONS` and is
 importable, so consumers can assert against it. **An unsupported combination is
 a hard error (exit 2), never a silent no-op.** Downstream code (`mckicad`) reads
 this matrix to avoid sending an invalid pair.

README.md

@@ -1,14 +1,23 @@
-# freeroute
+# rpmroute
 
-A native Python PCB autorouter: a Java-free reimplementation of the
-[FreeRouting](https://github.com/freerouting/freerouting) engine. Specctra DSN
-in, Specctra SES out, no JVM anywhere in the pipeline.
+A native Python PCB autorouter. Specctra DSN in, Specctra SES out, no JVM
+anywhere in the pipeline.
+
+It began as a Java-free port of the
+[FreeRouting](https://github.com/freerouting/freerouting) engine and has grown
+its own router since: negotiated congestion before routing, multi-pin nets
+routed as trees, every route checked against exact pad and copper shapes, and
+pin escapes along the pad's own axis for parts placed at an angle. On dense
+boards it now finishes more connections than the FreeRouting JAR, with no
+rule violations.
+
+It was called `freeroute` until 2026-10-07; that command still works.
 
 ## Why
 
 Toolchains that autoroute (`kicad-mcp` among them) do it by shelling out to
 `freerouting.jar`, which drags a JVM into every install and container image.
-`freeroute` reimplements the routing engine in pure Python, with no dependencies
+`rpmroute` reimplements the routing engine in pure Python, with no dependencies
 beyond the standard library, so the JAR step becomes a `pip install`.
 
 ## The contract
@@ -16,31 +25,31 @@ beyond the standard library, so the JAR step becomes a `pip install`.
 The entire integration surface is two Specctra files:
 
 ```
-board.dsn  ──▶  freeroute  ──▶  board.ses
+board.dsn  ──▶  rpmroute  ──▶  board.ses
 (unrouted)                       (routed session: traces + vias)
 ```
 
-`kicad-cli` already exports `.dsn` and imports `.ses`, so `freeroute` drops in
+`kicad-cli` already exports `.dsn` and imports `.ses`, so `rpmroute` drops in
 wherever `java -jar freerouting.jar` was invoked, and nothing else in the pipeline
 changes. The `-de` / `-do` / `-mp` flags are the JAR's, on purpose.
 
 ## Install
 
 ```bash
-uv tool install freeroute      # or: pipx install freeroute
+uv tool install rpmroute      # or: pipx install rpmroute
 ```
 
 ## Usage
 
 ```bash
 # a KiCad board: the exact engine, with the board's copper-to-edge rule
-freeroute board.dsn --engine exact --shove --edge-clearance 0.5 -do board.ses
+rpmroute board.dsn --engine exact --shove --edge-clearance 0.5 -do board.ses
 
-freeroute -de board.dsn -do board.ses     # the FreeRouting JAR spelling (grid engine)
-freeroute board.dsn --engine room --pack --shove -do board.ses
+rpmroute -de board.dsn -do board.ses     # the FreeRouting JAR spelling (grid engine)
+rpmroute board.dsn --engine room --pack --shove -do board.ses
 ```
 
-With no `-do` / `-o`, the SES goes to stdout. Connections freeroute could not
+With no `-do` / `-o`, the SES goes to stdout. Connections rpmroute could not
 make are listed on stderr; the SES is still written and the exit code stays 0,
 as with the JAR. Connections whose two ends sit in one zone of their net are
 listed separately, as left to that zone's fill.
@@ -99,7 +108,7 @@ What the opt-in passes buy you:
 - **`--diagonal`** (exact): a still-dropped 2-pin net is retried as a 45° trace
   covered by an exact integer octagon.
 
-## What freeroute reads from a KiCad DSN
+## What rpmroute reads from a KiCad DSN
 
 These were each checked against KiCad itself, pad by pad or with its DRC:
 
@@ -125,7 +134,7 @@ SES coordinates are written in resolution units, exactly as the JAR writes them.
 ## Library use
 
 ```python
-from freeroute.route import route
+from rpmroute.route import route
 
 ses_text = route(dsn_text, engine="exact", shove=True, edge_clearance_mm=0.5)
 ```
@@ -136,13 +145,13 @@ Alpha. Measured on two real KiCad 10 boards (the TerraHawk charge node's power
 stage and sense board, 2026-09-27), with every track stripped, then routed, then
 checked with `kicad-cli pcb drc --refill-zones`:
 
-| board | freeroute exact | FreeRouting JAR | DRC errors from freeroute |
+| board | rpmroute exact | FreeRouting JAR | DRC errors from rpmroute |
 |---|---|---|---|
 | power stage (40 x 30 mm) | 7 unconnected, ~5 s | 12 | 0 |
 | sense board (55 x 25 mm, 0.5 mm pitch MCU) | 41 unconnected, ~2.5 min | 32 | 0 |
 
 In the board owner's production flow (hand-routed power lanes kept, pours added
-after routing), freeroute completed the power stage with no unconnected items.
+after routing), rpmroute completed the power stage with no unconnected items.
 
 What it is **not**, stated plainly:
 
@@ -164,7 +173,7 @@ What it is **not**, stated plainly:
 
 For maximum completion on a dense board today, the JAR is still the stronger
 router. For routing without a JVM (CI, containers, an MCP server, a library
-call), freeroute routes legally and says what it could not do.
+call), rpmroute routes legally and says what it could not do.
 
 ## Development
 

bench/bench.py

@@ -24,9 +24,11 @@ off. Exits non-zero if any run crashed or timed out.
 from __future__ import annotations
 
 import argparse
+from concurrent.futures import ThreadPoolExecutor, as_completed
 import json
 import math
 import os
+from pathlib import Path
 import re
 import shlex
 import subprocess
@@ -34,11 +36,9 @@ import sys
 import tempfile
 import threading
 import time
-from concurrent.futures import ThreadPoolExecutor, as_completed
-from pathlib import Path
 
-NOT_ROUTED = re.compile(r"freeroute: (\d+) connection\(s\) not routed")
-TO_ZONE = re.compile(r"freeroute: (\d+) more connection\(s\) left to a zone fill")
+NOT_ROUTED = re.compile(r"rpmroute: (\d+) connection\(s\) not routed")
+TO_ZONE = re.compile(r"rpmroute: (\d+) more connection\(s\) left to a zone fill")
 
 
 def parse_boards(path: Path) -> list[tuple[str, Path, list[str]]]:
@@ -61,8 +61,8 @@ def parse_variant(spec: str) -> tuple[str, str | None, list[str]]:
     if not sep or not head:
         raise SystemExit(f"variant {spec!r}: want NAME=FLAGS or NAME@SRC=FLAGS")
     name, _, src = head.partition("@")
-    if src and not (Path(src) / "freeroute").is_dir():
-        raise SystemExit(f"variant {name}: {src} has no freeroute package")
+    if src and not (Path(src) / "rpmroute").is_dir():
+        raise SystemExit(f"variant {name}: {src} has no rpmroute package")
     return name, src or None, shlex.split(flags)
 
 
@@ -74,7 +74,7 @@ def run_one(board, variant, seed: int, timeout: float) -> dict:
         env["PYTHONPATH"] = src + os.pathsep + env.get("PYTHONPATH", "")
     with tempfile.TemporaryDirectory() as tmp:
         cmd = [
-            sys.executable, "-m", "freeroute.cli", str(dsn), "-do", f"{tmp}/out.ses",
+            sys.executable, "-m", "rpmroute.cli", str(dsn), "-do", f"{tmp}/out.ses",
             *board_flags, *flags, "--seed", str(seed),
         ]
         start = time.monotonic()
@@ -100,13 +100,18 @@ def run_one(board, variant, seed: int, timeout: float) -> dict:
         )
         rss_mb = round(usage.ru_maxrss / 1024)
         secs = round(time.monotonic() - start, 1)
+        try:
+            with open(f"{tmp}/out.ses", encoding="utf-8") as f:
+                vias = f.read().count("(via ")
+        except OSError:
+            vias = None
     missing = NOT_ROUTED.search(err)
     zone = TO_ZONE.search(err)
     return {
         "board": name, "variant": vname, "seed": seed, "status": status,
         "unrouted": int(missing.group(1)) if missing else 0,
         "to_zone": int(zone.group(1)) if zone else 0,
-        "secs": secs, "rss_mb": rss_mb,
+        "secs": secs, "rss_mb": rss_mb, "vias": vias,
         "tail": err.strip().splitlines()[-1] if status != "ok" and err.strip() else "",
     }
 
@@ -147,6 +152,16 @@ def report(rows: list[dict], boards, variants) -> None:
                     line += (f"   {dm:+.1f} ± {se:.1f}  ({better} better, {worse} worse,"
                              f" {len(diffs) - better - worse} same)  {verdict}")
             print(line)
+    # vias, where the runs recorded them (older result files did not)
+    print("\nvias per variant, summed over boards (mean over seeds per board)\n")
+    for vname, _, _ in variants:
+        total, boards_counted = 0.0, 0
+        for bname, _, _ in boards:
+            vs = [r["vias"] for k, r in ok.items() if k[:2] == (bname, vname) and r.get("vias") is not None]
+            if vs:
+                total += sum(vs) / len(vs)
+                boards_counted += 1
+        print(f"{vname:14} {total:8.1f} vias over {boards_counted} boards")
     failed = [r for r in rows if r["status"] != "ok"]
     for r in failed:
         print(f"FAILED {r['board']} {r['variant']} seed {r['seed']}: {r['status']} {r['tail']}")

bench/diagnose.py

@@ -0,0 +1,310 @@
+"""Why did each connection fail? Sort the failures of one exact-engine run.
+
+    uv run python bench/diagnose.py board.dsn --edge-clearance 0.5 [--json out.json]
+
+Every connection the exact engine leaves unrouted lands in one bucket:
+
+rejected    the grid routed it, the exact geometry check refused its copper
+alone       it cannot be routed even on a board with no other routes: the
+            pads, keepouts or the grid itself are the limit, not congestion
+walled-in   in the routed board one of its pins has no way out: a flood from
+            the pin's end cells through free cells stops short (pin access)
+congestion  both pins can get out, but no free path joins them
+
+The board state is the one the result came from (the best pass), rebuilt by
+replaying that pass's paths. Diagnostic only: it reaches into the router.
+"""
+
+from __future__ import annotations
+
+import argparse
+from collections import Counter
+import json
+from pathlib import Path
+import sys
+
+from rpmroute.board import build_board
+from rpmroute.board.search_tree import ShapeSearchTree
+from rpmroute.dsn import parse_dsn
+from rpmroute.geometry.octagon import overlaps_2d
+from rpmroute.route import grid_router
+from rpmroute.route.exact_router import route_board_exact
+from rpmroute.route.grid_router import GridRouter, _ends_of
+from rpmroute.route.pipeline import (
+    _mm_to_board,
+    _net_widths_board,
+    _rule_clearance_dsn,
+    _rule_width_dsn,
+    _via_drill_board,
+    _via_half_board,
+)
+
+# a pin whose free neighbourhood holds fewer nodes than this is walled in
+FLOOD_LIMIT = 200
+
+
+def _capture_router():
+    """Patch GridRouter so the instance route_board_exact builds, and the paths
+    of its best pass, can be read back afterwards."""
+    seen: dict = {}
+    original_commit = GridRouter._commit
+    original_snapshot = GridRouter._snapshot
+
+    def commit(self, conn, path):
+        original_commit(self, conn, path)
+        self._diag_paths[conn.index] = (list(path), conn.a_end, conn.b_end)
+
+    def snapshot(self, conns):
+        self._diag_best = {c.index: self._diag_paths[c.index] for c in conns if c.routed}
+        seen["router"] = self
+        return original_snapshot(self, conns)
+
+    def init(self, *args, **kwargs):
+        original_init(self, *args, **kwargs)
+        self._diag_paths = {}
+        self._diag_best = {}
+        seen["kwargs"] = kwargs
+        seen["args"] = args
+
+    original_init = GridRouter.__init__
+    GridRouter.__init__ = init
+    GridRouter._commit = commit
+    GridRouter._snapshot = snapshot
+    return seen
+
+
+def _capture_conflicts() -> list:
+    """Record each exact-check refusal: the copper box, its kind, and the
+    shape it came too close to. The check stops at a connection's first
+    conflict, so refusals and rejected connections line up in order."""
+    log: list = []
+    original = ShapeSearchTree.clearance_conflict
+
+    def conflict(self, box, net_no, layer, clearance, kind="wire"):
+        hit = original(self, box, net_no, layer, clearance, kind)
+        if hit:
+            # the shape that tripped the check, found the way the check does
+            other = None
+            expanded = box.offset(clearance)
+            for s in self.overlapping(expanded):
+                if s.net_no == net_no or not s.on_layer(layer):
+                    continue
+                if s.blocks != "all" and s.blocks != kind + "s":
+                    continue
+                if not s.clearance:
+                    if s.tile.overlaps(box):
+                        other = s
+                        break
+                    continue
+                if (s.exact is not None and overlaps_2d(s.exact, expanded)) or (
+                    s.exact is None and s.tile.overlaps(expanded)
+                ):
+                    other = s
+                    break
+            log.append((net_no, kind, layer, box, clearance, other))
+        return hit
+
+    ShapeSearchTree.clearance_conflict = conflict
+    return log
+
+
+def _wall_name(wall, names) -> str:
+    if isinstance(wall, str):
+        if wall.startswith("fixed copper of net "):
+            net = int(wall.rsplit(" ", 1)[1])
+            return f"fixed copper of {names.get(net, net)}"
+        return wall
+    return names.get(wall, "pads/keepouts")
+
+
+def _gap(a, b) -> int:
+    dx = max(b.ll.x - a.ur.x, a.ll.x - b.ur.x, 0)
+    dy = max(b.ll.y - a.ur.y, a.ll.y - b.ur.y, 0)
+    return max(dx, dy)
+
+
+def _fresh(seen) -> GridRouter:
+    router = grid_router.GridRouter(*seen["args"], **seen["kwargs"])
+    router._conns = router._build_connections()
+    return router
+
+
+def _static_wall(router: GridRouter, node) -> str:
+    """What static copper closes a node: a keepout, copper already on the
+    board (a fixed via or track, by net), or a pad."""
+    if node in router._keepout:
+        return "keepout"
+    fixed = getattr(router, "_diag_fixed", None)
+    if fixed is None:
+        fixed = router._diag_fixed = {}
+        margin = router.clearance + router.half_width
+        for net, layers, box in router.board.get_fixed_copper():
+            for cell in router._cells_in_box(box, margin):
+                for layer in layers:
+                    fixed[(*cell, layer)] = net
+    net = fixed.get(node)
+    if net is not None:
+        return f"fixed copper of net {net}"
+    return "pads"
+
+
+def _flood(router: GridRouter, pin, net_no: int, conns) -> tuple[int, Counter]:
+    """How many nodes a pin can reach through free cells (up to FLOOD_LIMIT),
+    and which other nets' copper bounds the region."""
+    walls: Counter = Counter()
+    # the search starts on every end node unconditionally (it may leave one
+    # inside a wire keepout by a via), so the flood does too
+    start = list(router._end_nodes(pin, net_no, conns))
+    seen = set(start)
+    frontier = list(start)
+    while frontier and len(seen) < FLOOD_LIMIT:
+        x, y, layer = frontier.pop()
+        steps = [(x + dx, y + dy, layer) for dx, dy in router._neighbours]
+        if router._via_placeable((x, y), net_no, conns):
+            steps += [(x, y, other) for other in router.layers if other != layer]
+        elif len(seen) == 1:
+            # the pin's own exit is a via that other copper leaves no room for
+            via_nodes = [(*c, lay) for c in router._via_cells((x, y)) for lay in router.layers]
+            for owner in router._crossed_owners(via_nodes, net_no, conns):
+                walls[conns[owner].net_no] += 1
+        for n in steps:
+            if n in seen or not (0 <= n[0] < router.cols and 0 <= n[1] < router.rows):
+                continue
+            if router._enter_cost(n[:2], n[2], net_no, False, conns) is None:
+                # trace, via footprint or clearance halo, as rip-up sees them
+                owners = router._crossed_owners([n], net_no, conns)
+                for owner in owners:
+                    walls[conns[owner].net_no] += 1
+                if not owners:
+                    walls[_static_wall(router, n)] += 1
+                continue
+            seen.add(n)
+            frontier.append(n)
+    return len(seen), walls
+
+
+def diagnose(
+    dsn_text: str, edge_clearance_mm: float | None, resolution: int = 2, shove: bool = False,
+    access_cost: float = 0.0, hole_to_hole_mm: float = 0.25, seed: int | None = None,
+    negotiate: int = 0,
+) -> dict:
+    dsn = parse_dsn(dsn_text)
+    names = {i + 1: n.name for i, n in enumerate(dsn.nets)}
+    scale = max(dsn.resolution.value, 1)
+    seen = _capture_router()
+    conflicts = _capture_conflicts()
+    exact = route_board_exact(
+        build_board(dsn),
+        trace_width=round(_rule_width_dsn(dsn) * scale),
+        clearance=round(_rule_clearance_dsn(dsn) * scale),
+        via_half=_via_half_board(dsn, scale),
+        edge_clearance=_mm_to_board(dsn, scale, edge_clearance_mm),
+        resolution=resolution,
+        shove=shove,
+        access_cost=access_cost,
+        seed=seed,
+        negotiate=negotiate,
+        # the product's configuration: net-class widths and hole spacing
+        net_widths=_net_widths_board(dsn, scale),
+        via_drill=_via_drill_board(dsn, scale),
+        hole_to_hole=_mm_to_board(dsn, scale, hole_to_hole_mm) or 0,
+    )
+    routed = seen["router"]
+    best = routed._diag_best
+    grid_failed = {(c.net_no, *_ends_of(c)) for c in routed._conns if c.index not in best}
+
+    # the board as the best pass left it
+    state = _fresh(seen)
+    # pins on turned pads leave along their pad's axis: replay with the same exits
+    state._axis_exits = dict(routed._axis_exits)
+    conns = state._conns
+    for idx, (path, a_end, b_end) in best.items():
+        conns[idx].a_end, conns[idx].b_end = a_end, b_end
+        state._commit(conns[idx], path)
+    empty = _fresh(seen)
+    # refusals in the order the check made them, one per rejected connection
+    per_net: dict[int, list] = {}
+    for net_no, kind, layer, box, clearance, other in conflicts:
+        if other is None:
+            what = "?"
+        elif other.net_no == -1:
+            what = "keepout" if other.clearance else "rule area"
+        else:
+            what = ("trace/via of " if other.routed else "pad of ") + names.get(other.net_no, "?")
+        need = clearance if other is None or other.clearance else 0
+        short = (need - _gap(box, other.tile)) / scale / 1000 if other is not None else 0
+        per_net.setdefault(net_no, []).append(
+            {"copper": kind, "layer": layer, "against": what, "short_mm": round(short, 4)}
+        )
+    by_key = {(c.net_no, *_ends_of(c)): c for c in conns}
+
+    rows = []
+    for failure in exact.result.failed:
+        net_no, a, b = failure[0], failure[1], failure[2]
+        zone = failure[3] if len(failure) > 3 else ""
+        if zone:
+            continue  # left to a zone fill, not a failure
+        key = (net_no, a, b)
+        row = {"net": names.get(net_no, str(net_no)), "a": a, "b": b}
+        conn = by_key.get(key)
+        if key not in grid_failed:
+            row["kind"] = "rejected"
+            if per_net.get(net_no):
+                row["conflict"] = per_net[net_no].pop(0)
+        elif conn is None:
+            row["kind"] = "unknown"
+        elif empty._search(empty._conns[conn.index], allow_ripup=False, conns=empty._conns) is None:
+            row["kind"] = "alone"
+        else:
+            walled = []
+            for end, group in ((a, conn.a_group), (b, conn.b_group)):
+                for pin in group[0][:1]:  # a group's first pin is its route end
+                    reach, walls = _flood(state, pin, net_no, conns)
+                    if reach < FLOOD_LIMIT:
+                        walled.append({
+                            "pin": end, "reach": reach,
+                            "walls": [
+                                _wall_name(n, names) for n, _ in walls.most_common(4)
+                            ],
+                        })
+            row["kind"] = "walled-in" if walled else "congestion"
+            if walled:
+                row["walled"] = walled
+        rows.append(row)
+    return {"failures": rows, "counts": dict(Counter(r["kind"] for r in rows))}
+
+
+def main(argv: list[str] | None = None) -> int:
+    ap = argparse.ArgumentParser(description=__doc__.split("\n\n")[0])
+    ap.add_argument("dsn", type=Path)
+    ap.add_argument("--edge-clearance", type=float, metavar="MM")
+    ap.add_argument("--grid-resolution", type=int, default=2, metavar="K")
+    ap.add_argument("--shove", action="store_true", help="as mckicad routes")
+    ap.add_argument("--access-cost", type=float, default=0.0)
+    ap.add_argument("--seed", type=int, help="route in this shuffled order, as bench.py does")
+    ap.add_argument("--negotiate", type=int, default=0, metavar="N", help="as the router's --negotiate")
+    ap.add_argument("--hole-to-hole", type=float, default=0.25, metavar="MM")
+    ap.add_argument("--json", type=Path, help="also write the full table here")
+    args = ap.parse_args(argv)
+
+    report = diagnose(args.dsn.read_text(), args.edge_clearance, args.grid_resolution, args.shove,
+                      args.access_cost, args.hole_to_hole, args.seed, args.negotiate)
+    for row in report["failures"]:
+        extra = ""
+        for w in row.get("walled", []):
+            extra += f"  [{w['pin']} reaches {w['reach']} cells, walled by {', '.join(w['walls'])}]"
+        if "conflict" in row:
+            c = row["conflict"]
+            extra += (f"  [{c['copper']} on layer {c['layer']} {c['short_mm']} mm too close"
+                      f" to {c['against']}]")
+        print(f"{row['kind']:11} {row['net']}: {row['a']} to {row['b']}{extra}")
+    total = sum(report["counts"].values())
+    print(f"\n{total} failed: " + ", ".join(f"{k} {v}" for k, v in sorted(report["counts"].items())),
+          file=sys.stderr)
+    if args.json:
+        args.json.write_text(json.dumps(report, indent=1))
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

bench/drc_check.sh

@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+# Route one KiCad board with rpmroute and judge the result with KiCad's DRC.
+#
+#   bench/drc_check.sh [--keep] <board.kicad_pcb> <out-dir> [rpmroute args...]
+#
+# Copies the board (and its .kicad_pro) into <out-dir>, strips its tracks and
+# vias unless --keep is given (then they reach the router as fixed wiring),
+# exports the DSN through mckicad, routes, applies the session, and runs DRC
+# with zones refilled at every severity. Prints one line: time, copper added,
+# shorts, opens, hole problems (whatever severity the board gives them) and
+# the other errors. The source board is never touched.
+#
+# RPMROUTE (or the older FREEROUTE; default: this checkout's .venv/bin/rpmroute) and MCK (default
+# ~/claude/mckicad) pick the builds to judge.
+set -euo pipefail
+keep=0
+if [[ "${1:-}" == "--keep" ]]; then keep=1; shift; fi
+src="$1"; out="$2"; shift 2
+here="$(cd "$(dirname "$0")/.." && pwd)"
+RPMROUTE="${RPMROUTE:-${FREEROUTE:-$here/.venv/bin/rpmroute}}"
+MCK="${MCK:-$HOME/claude/mckicad}"
+rm -rf "$out"; mkdir -p "$out"
+cp "${src%.kicad_pcb}.kicad_pro" "$out/board.kicad_pro" 2>/dev/null || true
+
+if [[ $keep == 1 ]]; then
+    cp "$src" "$out/board.kicad_pcb"
+else
+    (cd "$MCK" && uv run --no-sync python - "$src" "$out/board.kicad_pcb" <<'EOF'
+import sys
+from mckicad.utils.sexp_tree import parse
+text = open(sys.argv[1]).read()
+spans = sorted((c.span for c in parse(text).children if c.tag in ("segment", "arc", "via")), reverse=True)
+for a, b in spans:
+    text = text[:a] + text[b:]
+open(sys.argv[2], "w").write(text)
+EOF
+    )
+fi
+
+(cd "$MCK" && uv run --no-sync python -c "
+from mckicad.utils.freerouting import FreeRoutingEngine
+assert FreeRoutingEngine().export_dsn_from_kicad('$out/board.kicad_pcb', '$out/board.dsn', {})") \
+    >/dev/null 2>&1 || { echo "$out: DSN export failed"; exit 1; }
+
+start=$(date +%s.%N)
+"$RPMROUTE" "$out/board.dsn" -do "$out/board.ses" "$@" >"$out/route.log" 2>&1 || true
+secs=$(python3 -c "print(round($(date +%s.%N)-$start,1))")
+[[ -s "$out/board.ses" ]] || { echo "$out: no session ($(tail -1 "$out/route.log"))"; exit 1; }
+
+(cd "$MCK" && uv run --no-sync python -c "
+from mckicad.utils.ses_apply import apply_ses_to_board as a
+r = a('$out/board.kicad_pcb', '$out/board.ses', '$out/board.kicad_pcb')
+print(r['segments_added'], r['vias_added'])" 2>/dev/null) >"$out/apply.txt"
+
+kicad-cli pcb drc --refill-zones --format json --severity-all \
+    -o "$out/drc.json" "$out/board.kicad_pcb" >/dev/null 2>&1 || true
+python3 - "$out" "$secs" <<'EOF'
+import collections, json, sys
+out, secs = sys.argv[1:]
+seg, via = open(f"{out}/apply.txt").read().split()
+d = json.load(open(f"{out}/drc.json"))
+errors = collections.Counter(v["type"] for v in d["violations"] if v.get("severity") == "error")
+other = collections.Counter(v["type"] for v in d["violations"] if v.get("severity") != "error")
+holes = {k: errors.pop(k, 0) + other.get(k, 0) for k in ("holes_co_located", "hole_to_hole")}
+print(f"{out}: {secs}s  {seg} seg {via} via  shorts {errors.pop('shorting_items', 0)}  "
+      f"opens {len(d.get('unconnected_items', []))}  holes {holes}  errors {dict(errors)}")
+EOF

docs/ARCHITECTURE.md

@@ -90,7 +90,7 @@ this is the structure the Python `reader.py` mirrors):
 
 **Python port status:** items 1 (tokenizer), the shape grammar, and every
 structure/library/network/placement/parser/resolution scope above are
-implemented in `src/freeroute/dsn/` this session (see below).
+implemented in `src/rpmroute/dsn/` this session (see below).
 
 ## 2. Board data model — `board/`
 
@@ -175,7 +175,7 @@ converge toward FreeRouting's free-space rooms. Not started this session.
   into the read result).
 
 ## Port order (this file drives the roadmap)
-1. **DSN parser** — done this session (`src/freeroute/dsn/`).
+1. **DSN parser** — done this session (`src/rpmroute/dsn/`).
 2. **SES writer** — next. Start with an empty/no-op session to prove the loop
    end-to-end through `kicad-cli pcb import specctra-ses`. See `SesWriter.java`
    and `SpecctraSesFileWriter.java`: `(session <name> (base_design <name>)
@@ -184,6 +184,6 @@ converge toward FreeRouting's free-space rooms. Not started this session.
 3. **Geometry primitives** — `geometry/planar` subset needed by the board model.
 4. **Board model** — `board` items + spatial index.
 5. **Autorouter** — maze/rip-up core, then optimize pass.
-6. **CLI + kicad-mcp integration** — `freeroute board.dsn -o board.ses`.
+6. **CLI + kicad-mcp integration** — `rpmroute board.dsn -o board.ses`.
 </content>
 </invoke>

docs/PORTING_PLAN.md

@@ -43,7 +43,7 @@ the output. Match that I/O and the rest of `kicad-mcp` is unchanged.
 4. **Autorouter core** — maze routing with rip-up-and-retry. Start grid-based
    Manhattan/45° for an MVP; converge toward FreeRouting's approach. _(TBD.)_
 5. **Optimize pass** — via minimization, trace smoothing. _(TBD.)_
-6. **CLI + kicad-mcp integration** — `freeroute board.dsn -o board.ses`, then
+6. **CLI + kicad-mcp integration** — `rpmroute board.dsn -o board.ses`, then
    swap it in behind `kicad_mcp/utils/freerouting_engine.py`'s JAR step.
 
 ## Validation strategy

pyproject.toml

@@ -3,9 +3,9 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [project]
-name = "freeroute"
-version = "2026.07.14"
-description = "Native Python PCB autorouter — a Java-free port of the FreeRouting engine (Specctra DSN in, SES out)"
+name = "rpmroute"
+version = "2026.10.07"
+description = "Native Python PCB autorouter with negotiated congestion and tree routing (Specctra DSN in, SES out)"
 readme = "README.md"
 license = "GPL-3.0-or-later"
 license-files = ["LICENSE"]
@@ -40,14 +40,17 @@ requires-python = ">=3.10"
 dependencies = []
 
 [project.urls]
-"Homepage" = "https://git.supported.systems/warehack.ing/freeroute"
-"Repository" = "https://git.supported.systems/warehack.ing/freeroute"
-"Issues" = "https://git.supported.systems/warehack.ing/freeroute/issues"
-# The Java engine this is a port of; freeroute ships no upstream code.
-"Upstream" = "https://github.com/freerouting/freerouting"
+"Homepage" = "https://git.supported.systems/warehack.ing/rpmroute"
+"Repository" = "https://git.supported.systems/warehack.ing/rpmroute"
+"Issues" = "https://git.supported.systems/warehack.ing/rpmroute/issues"
+# Where it started: a port of the Java FreeRouting engine. It has since grown
+# its own router (negotiation, tree nets, exact checks) and ships no upstream code.
+"Origin" = "https://github.com/freerouting/freerouting"
 
 [project.scripts]
-freeroute = "freeroute.cli:main"
+rpmroute = "rpmroute.cli:main"
+# the name it had until 2026-10-07, kept so existing scripts keep working
+freeroute = "rpmroute.cli:main"
 
 [dependency-groups]
 dev = [
@@ -57,7 +60,7 @@ dev = [
 ]
 
 [tool.hatch.build.targets.wheel]
-packages = ["src/freeroute"]
+packages = ["src/rpmroute"]
 
 [tool.hatch.build.targets.sdist]
 # Ship the package, the licence, and the docs — nothing else. `reference/` is a
@@ -95,7 +98,7 @@ select = ["E", "W", "F", "I", "B", "C4", "UP", "SIM"]
 ignore = ["E501"]
 
 [tool.ruff.lint.isort]
-known-first-party = ["freeroute"]
+known-first-party = ["rpmroute"]
 force-sort-within-sections = true
 
 [tool.pytest.ini_options]

src/freeroute/__init__.py

@@ -1,3 +0,0 @@
-"""freeroute — native Python PCB autorouter (Java-free FreeRouting port)."""
-
-__version__ = "0.1.0"

src/freeroute/cli.py

@@ -1,267 +0,0 @@
-"""freeroute command-line interface: Specctra DSN in, routed SES out.
-
-Flag-compatible with the FreeRouting JAR (``-de`` / ``-do`` / ``-mp``) so it can
-be dropped in wherever ``java -jar freerouting.jar`` was invoked, plus the
-freeroute-specific engine selection (``--engine``) and its opt-in passes.
-
-Not every engine supports every pass. The matrix below is the single source of
-truth; an unsupported combination is an error, never a silent no-op::
-
-    engine   --pack  --shove  --diagonal  --no-rip-up  -mp/--max-passes
-    grid       no      no        no          yes            yes
-    exact      no      yes       yes         yes            yes
-    room       yes     yes       no          no             no
-"""
-
-from __future__ import annotations
-
-import argparse
-import sys
-
-from freeroute.dsn.reader import parse_dsn
-from freeroute.route.orders import best_of_orders
-from freeroute.route.pipeline import (
-    build_exact_routing_result,
-    build_rooms_routing_result,
-    build_routing_result,
-)
-from freeroute.ses import write_ses
-
-#: which optional flags each engine actually implements. Anything not listed for
-#: an engine is rejected by :func:`_validate` rather than quietly ignored.
-ENGINE_OPTIONS: dict[str, frozenset[str]] = {
-    "grid": frozenset({"rip_up", "max_passes", "seed", "orders"}),
-    "exact": frozenset({"shove", "diagonal", "rip_up", "max_passes", "seed", "orders"}),
-    "room": frozenset({"shove", "pack"}),
-}
-
-#: option key -> the CLI spelling to name in an error message
-_FLAG_NAMES = {
-    "pack": "--pack",
-    "shove": "--shove",
-    "diagonal": "--diagonal",
-    "rip_up": "--no-rip-up",
-    "max_passes": "-mp/--max-passes",
-    "seed": "--seed",
-    "orders": "--orders",
-}
-
-
-def _supported_by(option: str) -> str:
-    engines = [e for e, opts in ENGINE_OPTIONS.items() if option in opts]
-    return " or ".join(f"--engine {e}" for e in engines)
-
-
-def _validate(parser: argparse.ArgumentParser, engine: str, requested: list[str]) -> None:
-    """Reject any requested option the selected engine does not implement."""
-    supported = ENGINE_OPTIONS[engine]
-    for option in requested:
-        if option not in supported:
-            parser.error(
-                f"{_FLAG_NAMES[option]} is not supported by --engine {engine} "
-                f"(supported by: {_supported_by(option)})"
-            )
-
-
-def build_parser() -> argparse.ArgumentParser:
-    parser = argparse.ArgumentParser(
-        prog="freeroute",
-        description="Native PCB autorouter — route a Specctra DSN and write an SES session file.",
-    )
-    parser.add_argument("dsn", nargs="?", help="input Specctra .dsn file")
-    parser.add_argument(
-        "-de", "--design", dest="design", help="input .dsn (FreeRouting-compatible alias)"
-    )
-    parser.add_argument(
-        "-do", "-o", "--output", dest="output", help="output .ses file (default: stdout)"
-    )
-    parser.add_argument(
-        "-mp",
-        "--max-passes",
-        type=int,
-        default=None,
-        help="rip-up-and-retry pass bound (grid and exact engines; default 10)",
-    )
-    parser.add_argument(
-        "--engine",
-        choices=sorted(ENGINE_OPTIONS),
-        default="grid",
-        help=(
-            "routing track: grid (default; multi-layer rip-up maze, highest coverage), "
-            "exact (orthogonal, exact-geometry DRC-verified output), "
-            "room (continuous expansion rooms, routes off-grid channels)"
-        ),
-    )
-    parser.add_argument(
-        "--pack",
-        action="store_true",
-        help="coordinated multi-trace channel packing (room engine only)",
-    )
-    parser.add_argument(
-        "--shove",
-        action="store_true",
-        help="shove committed traces aside to recover dropped nets (exact and room engines)",
-    )
-    parser.add_argument(
-        "--diagonal",
-        action="store_true",
-        help="45-degree recovery pass for dropped 2-pin nets (exact engine only)",
-    )
-    parser.add_argument(
-        "--no-rip-up",
-        action="store_true",
-        help="disable rip-up-and-retry (grid and exact engines)",
-    )
-    parser.add_argument("--layers", help="comma-separated signal layer indices to route on")
-    parser.add_argument(
-        "--grid-resolution",
-        type=int,
-        default=None,
-        metavar="K",
-        help="grid and exact engines: cells K times finer than trace + clearance; "
-        "default 2 for exact (reaches 0.5 mm pitch pins), 1 for grid",
-    )
-    parser.add_argument(
-        "--heuristic-weight",
-        type=float,
-        default=1.0,
-        metavar="W",
-        help="exact engine: weighted A* (W >= 1); larger is faster, routes at most "
-        "W times the shortest length (default 1)",
-    )
-    parser.add_argument(
-        "--edge-clearance",
-        type=float,
-        metavar="MM",
-        help="copper to board-edge clearance in mm, e.g. KiCad's min_copper_edge_clearance "
-        "(the DSN does not carry it); default 0: copper only has to stay inside the outline",
-    )
-    parser.add_argument(
-        "--seed",
-        type=int,
-        metavar="N",
-        help="grid and exact engines: shuffle the order connections are routed in; "
-        "the same seed gives the same result (default: fewer-pin nets first)",
-    )
-    parser.add_argument(
-        "--orders",
-        type=int,
-        metavar="N",
-        help="grid and exact engines: route N connection orders in parallel and keep the "
-        "one leaving the fewest connections unrouted (the default order is one of them)",
-    )
-    parser.add_argument(
-        "--jobs",
-        type=int,
-        metavar="J",
-        help="processes for --orders (default: one per order, up to the CPU count)",
-    )
-    return parser
-
-
-def main(argv: list[str] | None = None) -> int:
-    parser = build_parser()
-    args = parser.parse_args(argv)
-
-    dsn_path = args.design or args.dsn
-    if not dsn_path:
-        parser.error("no input DSN (pass a path, or -de <file>)")
-
-    requested = [
-        option
-        for option, asked in (
-            ("pack", args.pack),
-            ("shove", args.shove),
-            ("diagonal", args.diagonal),
-            ("rip_up", args.no_rip_up),
-            ("max_passes", args.max_passes is not None),
-            ("seed", args.seed is not None),
-            ("orders", args.orders is not None),
-        )
-        if asked
-    ]
-    _validate(parser, args.engine, requested)
-
-    try:
-        layers = [int(x) for x in args.layers.split(",")] if args.layers else None
-    except ValueError:
-        parser.error(f"--layers must be comma-separated integers (got: {args.layers!r})")
-
-    try:
-        with open(dsn_path, encoding="utf-8") as f:
-            dsn_text = f.read()
-    except OSError as e:
-        print(f"freeroute: cannot read {dsn_path}: {e}", file=sys.stderr)
-        return 2
-
-    dsn = parse_dsn(dsn_text)
-    rip_up = not args.no_rip_up
-    max_passes = args.max_passes if args.max_passes is not None else 10
-
-    if args.orders is not None and args.orders < 1:
-        parser.error("--orders must be at least 1")
-    if args.engine == "exact":
-        options = {
-            "layers": layers,
-            "shove": args.shove,
-            "diagonal": args.diagonal,
-            "rip_up": rip_up,
-            "max_passes": max_passes,
-            "edge_clearance_mm": args.edge_clearance,
-            "resolution": 2 if args.grid_resolution is None else args.grid_resolution,
-            "heuristic_weight": args.heuristic_weight,
-        }
-    elif args.engine == "grid":
-        options = {
-            "layers": layers,
-            "rip_up": rip_up,
-            "max_passes": max_passes,
-            "edge_clearance_mm": args.edge_clearance,
-            "resolution": 1 if args.grid_resolution is None else args.grid_resolution,
-        }
-    if args.engine == "room":
-        result = build_rooms_routing_result(
-            dsn, layers=layers, shove=args.shove, pack=args.pack,
-            edge_clearance_mm=args.edge_clearance,
-        )
-    elif args.orders and args.orders > 1:
-        result, kept, tried = best_of_orders(
-            dsn_text, args.engine, options, orders=args.orders, seed=args.seed, jobs=args.jobs
-        )
-        counts = ", ".join(f"{'default' if s is None else s}: {m}" for s, (m, _z) in tried)
-        print(
-            f"freeroute: tried {len(tried)} orders, kept "
-            f"{'the default order' if kept is None else f'--seed {kept}'} (unrouted {counts})",
-            file=sys.stderr,
-        )
-    elif args.engine == "exact":
-        result = build_exact_routing_result(dsn, seed=args.seed, **options)
-    else:
-        result = build_routing_result(dsn, seed=args.seed, **options)
-
-    ses_text = write_ses(dsn, result)
-    missing = [u for u in result.unrouted if not u[3]]
-    in_zone = [u for u in result.unrouted if u[3]]
-    if missing:
-        # the SES is still written; say plainly what it is missing
-        print(f"freeroute: {len(missing)} connection(s) not routed:", file=sys.stderr)
-        for net, a, b, _zone in missing:
-            print(f"  {net}: {a} to {b}", file=sys.stderr)
-    if in_zone:
-        print(
-            f"freeroute: {len(in_zone)} more connection(s) left to a zone fill that may join them:",
-            file=sys.stderr,
-        )
-        for net, a, b, zone in in_zone:
-            print(f"  {net}: {a} to {b} (both in zone {zone})", file=sys.stderr)
-
-    if args.output:
-        with open(args.output, "w", encoding="utf-8") as f:
-            f.write(ses_text)
-    else:
-        sys.stdout.write(ses_text)
-    return 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

src/rpmroute/__init__.py

@@ -0,0 +1,3 @@
+"""rpmroute — native Python PCB autorouter (Java-free FreeRouting port)."""
+
+__version__ = "0.1.0"

src/rpmroute/board/__init__.py

@@ -1,9 +1,9 @@
-"""Board data model for freeroute.
+"""Board data model for rpmroute.
 
 The data model a parsed DSN produces and the (future) router operates on:
 layers, units, coordinate transform, nets, clearance matrix, the item hierarchy,
 and the :class:`BasicBoard` container. :func:`build_board` constructs a board
-from a :class:`~freeroute.dsn.model.DsnBoard`.
+from a :class:`~rpmroute.dsn.model.DsnBoard`.
 
 The routing operations (``RoutingBoard``) and the spatial ``ShapeSearchTree``
 belong to the router phase.

src/rpmroute/board/board.py

@@ -9,7 +9,7 @@ board-model invariants check.
 
 from __future__ import annotations
 
-from freeroute.geometry import IntBox
+from rpmroute.geometry import IntBox
 
 from .clearance import ClearanceMatrix
 from .items import ConductionArea, Item, ObstacleArea, Pin, Trace, Via
@@ -70,6 +70,27 @@ class BasicBoard:
     def get_traces(self) -> list[Trace]:
         return [it for it in self._items if isinstance(it, Trace)]
 
+    def get_fixed_copper(self) -> list[tuple[int, frozenset[int], IntBox]]:
+        """Copper already routed on the board (the DSN's ``wiring``), as
+        ``(net, layers, box)``. A track is its segments, its corners and the
+        round caps at its ends (as squares); a via is its largest pad."""
+        from rpmroute.geometry.polyline import Polyline, PolylineShape, corner_box
+
+        out: list[tuple[int, frozenset[int], IntBox]] = []
+        for item in self._items:
+            if not item.fixed or not item.net_nos:
+                continue
+            net = item.net_nos[0]
+            if isinstance(item, Trace) and not item.is_empty():
+                layers = frozenset({item.layer})
+                for box in PolylineShape(Polyline(item.corners), item.half_width).tiles():
+                    out.append((net, layers, box))
+                for end in (item.corners[0], item.corners[-1]):
+                    out.append((net, layers, corner_box(end, item.half_width)))
+            elif isinstance(item, Via) and item.shape is not None:
+                out.append((net, frozenset(item.layers), item.shape.bounding_box()))
+        return out
+
     def get_vias(self) -> list[Via]:
         return [it for it in self._items if isinstance(it, Via)]
 

src/rpmroute/board/build.py

@@ -1,6 +1,6 @@
 """Build a :class:`BasicBoard` from a parsed DSN :class:`DsnBoard`.
 
-This is the load-bearing integration between :mod:`freeroute.dsn` and the board
+This is the load-bearing integration between :mod:`rpmroute.dsn` and the board
 model. It mirrors what FreeRouting's ``Structure.create_board`` / ``Library`` /
 ``Component`` / ``Network`` readers do collectively, but on the already-parsed
 ``DsnBoard``:
@@ -12,9 +12,10 @@ model. It mirrors what FreeRouting's ``Structure.create_board`` / ``Library`` /
 * padstacks x placement -> :class:`Pin` items
 * keepouts -> :class:`ObstacleArea` items
 
-Pad geometry: a rectangle pad becomes an exact :class:`IntBox`; a circle pad its
-bounding box (documented approximation pending an exact circle tile); a convex
-polygon pad an exact :class:`Simplex`. Every pad is placed centred on its pin
+Pad geometry: a rectangle pad becomes an exact :class:`IntBox`; a circle pad a
+16-sided :class:`Simplex` drawn just outside it (its corners stand out by 2% of
+the radius, where the bounding box's stood out by 41%); a convex polygon pad an
+exact :class:`Simplex`. Every pad is placed centred on its pin
 location, so it contains that location by construction. Component rotation is
 applied to the pin position; the pad tile itself is not rotated (irrelevant to
 the containment invariant, and pads are centre-symmetric in practice).
@@ -23,21 +24,25 @@ the containment invariant, and pads are centre-symmetric in practice).
 from __future__ import annotations
 
 import math
+import re
 
-from freeroute.dsn.model import DsnBoard
-from freeroute.dsn.shapes import Circle, Path, Polygon, Rectangle, Shape
-from freeroute.geometry import FloatPoint, IntBox, IntPoint, IntVector, Simplex
-from freeroute.geometry.polygon_shape import PolygonShape
+from rpmroute.dsn.model import DsnBoard
+from rpmroute.dsn.shapes import Circle, Path, Polygon, Rectangle, Shape
+from rpmroute.geometry import FloatPoint, IntBox, IntPoint, IntVector, Simplex
+from rpmroute.geometry.polygon_shape import PolygonShape
 
 from .board import BasicBoard
 from .clearance import ClearanceMatrix
-from .items import ConductionArea, ObstacleArea, Pin
+from .items import ConductionArea, ObstacleArea, Pin, Trace, Via
 from .layer import Layer, LayerStructure
 from .net import Nets
 from .transform import CoordinateTransform
 
 __all__ = ["build_board"]
 
+# DSN units per micrometre, for drills KiCad gives in um in via padstack names
+_DSN_PER_UM = {"um": 1.0, "mm": 0.001, "mil": 1 / 25.4, "inch": 1 / 25400}
+
 
 def build_board(dsn: DsnBoard) -> BasicBoard:
     """Construct a :class:`BasicBoard` from a parsed :class:`DsnBoard`."""
@@ -56,6 +61,7 @@ def build_board(dsn: DsnBoard) -> BasicBoard:
     _insert_keepouts(dsn, board, transform)
     _insert_image_keepouts(dsn, board, transform)
     _insert_zones(dsn, board, transform, nets)
+    _insert_wiring(dsn, board, transform, nets)
     return board
 
 
@@ -244,7 +250,7 @@ def _placed_pad_tile(shape: Shape, place, dsn_pin, transform: CoordinateTransfor
         r = round(transform.dsn_to_board(shape.diameter / 2))
         cx = round(transform.dsn_to_board(centre.x))
         cy = round(transform.dsn_to_board(centre.y))
-        return IntBox(cx - r, cy - r, cx + r, cy + r)
+        return _circle_tile(cx, cy, r)
     if isinstance(shape, Rectangle):
         x0, y0, x1, y1 = shape.coords[:4]
         corners = [(x0, y0), (x1, y0), (x1, y1), (x0, y1)]
@@ -263,15 +269,65 @@ def _placed_pad_tile(shape: Shape, place, dsn_pin, transform: CoordinateTransfor
     for x, y in corners:
         p = _to_board_offset(place, x, y, dsn_pin.rotation)
         pts.append(IntPoint(round(transform.dsn_to_board(p.x)), round(transform.dsn_to_board(p.y))))
-    if len(pts) >= 3:
-        simplex = Simplex.from_corners(pts)
-        if not simplex.is_empty():
-            return simplex
+    # An oval's padded corners are not in outline order, and a mirrored
+    # part reverses the winding: take the convex hull, then either winding.
+    hull = _convex_hull(pts)
+    if len(hull) >= 3:
+        for corners in (hull, hull[::-1]):
+            simplex = Simplex.from_corners(corners)
+            if not simplex.is_empty():
+                return simplex
     xs = [p.x for p in pts] or [0]
     ys = [p.y for p in pts] or [0]
     return IntBox(min(xs), min(ys), max(xs), max(ys))
 
 
+_CIRCLE_SIDES = 16
+
+
+def _circle_tile(cx: int, cy: int, r: int):
+    """A polygon around the circle, every side touching it. A square around a
+    big round pad (a mounting hole) puts phantom copper in its corners that
+    blocks legal routes past it; this stays outside the circle, so the router
+    is still never closer than KiCad measures."""
+    if r < 8:
+        return IntBox(cx - r, cy - r, cx + r, cy + r)
+    reach = r / math.cos(math.pi / _CIRCLE_SIDES)
+    corners = []
+    for k in range(_CIRCLE_SIDES):
+        a = (k + 0.5) * 2 * math.pi / _CIRCLE_SIDES
+        dx, dy = reach * math.cos(a), reach * math.sin(a)
+        # round away from the centre so the polygon never cuts into the circle
+        corners.append(IntPoint(cx + math.copysign(math.ceil(abs(dx)), dx),
+                                cy + math.copysign(math.ceil(abs(dy)), dy)))
+    corners = [IntPoint(int(p.x), int(p.y)) for p in corners]
+    for winding in (corners, corners[::-1]):
+        simplex = Simplex.from_corners(winding)
+        if not simplex.is_empty():
+            return simplex
+    return IntBox(cx - r, cy - r, cx + r, cy + r)
+
+
+def _convex_hull(pts: list[IntPoint]) -> list[IntPoint]:
+    """The convex hull of ``pts`` counter-clockwise, collinear points dropped."""
+    ps = sorted({(p.x, p.y) for p in pts})
+    if len(ps) < 3:
+        return [IntPoint(x, y) for x, y in ps]
+
+    def cross(o, a, b):
+        return (a[0] - o[0]) * (b[1] - o[1]) - (a[1] - o[1]) * (b[0] - o[0])
+
+    def half(points):
+        out: list[tuple[int, int]] = []
+        for p in points:
+            while len(out) >= 2 and cross(out[-2], out[-1], p) <= 0:
+                out.pop()
+            out.append(p)
+        return out[:-1]
+
+    return [IntPoint(x, y) for x, y in half(ps) + half(ps[::-1])]
+
+
 def _pad_tile(shape: Shape, transform: CoordinateTransform):
     """A board-relative pad tile from a DSN padstack shape (centred near origin)."""
     if isinstance(shape, Rectangle):
@@ -281,7 +337,7 @@ def _pad_tile(shape: Shape, transform: CoordinateTransform):
         r = round(transform.dsn_to_board(shape.diameter / 2))
         cx = round(transform.dsn_to_board(shape.center_x))
         cy = round(transform.dsn_to_board(shape.center_y))
-        return IntBox(cx - r, cy - r, cx + r, cy + r)  # bounding-box approximation
+        return _circle_tile(cx, cy, r)
     if isinstance(shape, (Polygon, Path)):
         coords = shape.coords
         pts = [
@@ -333,10 +389,20 @@ def _insert_keepouts(dsn: DsnBoard, board: BasicBoard, transform: CoordinateTran
                     tiles=tiles,
                     blocks_wires=keepout.kind != "via_keepout",
                     blocks_vias=keepout.kind != "wire_keepout",
+                    clearance=not is_rule_area(keepout.area.name),
                 )
             )
 
 
+#: a structure keepout named with this prefix is a KiCad rule area (mckicad
+#: names them on export); it is checked for overlap only
+RULE_AREA_PREFIX = "rule_area"
+
+
+def is_rule_area(name: str | None) -> bool:
+    return bool(name) and name.startswith(RULE_AREA_PREFIX)
+
+
 def _area_border_tiles(shape: Shape, transform: CoordinateTransform) -> list:
     """Convex board tiles covering a keepout border shape.
 
@@ -461,6 +527,52 @@ def _placed_area_tiles(shape: Shape, place, transform: CoordinateTransform) -> l
     return [tile for tile in PolygonShape(pts).split_to_convex() if not tile.is_empty()]
 
 
+def _insert_wiring(dsn: DsnBoard, board: BasicBoard, transform: CoordinateTransform, nets) -> None:
+    """Tracks and vias already on the board, as fixed copper of their nets."""
+    layer_no = {layer.name: i for i, layer in enumerate(dsn.layers)}
+    signal_layers = [i for i, layer in enumerate(dsn.layers) if layer.is_signal]
+    numbers = {net.name: net.net_number for net in nets}
+    for wire in dsn.wires:
+        if wire.net not in numbers or wire.layer not in layer_no:
+            continue
+        c = wire.coords
+        corners = [transform.dsn_to_board_point(c[i], c[i + 1]) for i in range(0, len(c) - 1, 2)]
+        if len(corners) < 2:
+            continue
+        board.insert(
+            Trace(
+                net_nos=[numbers[wire.net]], fixed=True, layer=layer_no[wire.layer],
+                half_width=max(round(transform.dsn_to_board(wire.width / 2)), 1), corners=corners,
+            )
+        )
+    for via in dsn.vias:
+        padstack = dsn.padstack(via.padstack)
+        if via.net not in numbers or padstack is None or not padstack.shapes:
+            continue
+        layers: set[int] = set()
+        for shape in padstack.shapes:
+            if shape.layer in ("signal", "pcb"):
+                layers.update(signal_layers)
+            elif shape.layer in layer_no:
+                layers.add(layer_no[shape.layer])
+        location = transform.dsn_to_board_point(via.x, via.y)
+        pad = _pad_tile(max(padstack.shapes, key=_shape_extent), transform)
+        box = pad.bounding_box()
+        drill = re.search(r"_([\d.]+):([\d.]+)_um", via.padstack)
+        drill_board = (
+            round(transform.dsn_to_board(float(drill.group(2)) * _DSN_PER_UM.get(dsn.unit, 1.0)))
+            if drill else 0
+        )
+        board.insert(
+            Via(
+                net_nos=[numbers[via.net]], fixed=True, padstack_name=via.padstack,
+                drill=drill_board, location=location, layers=sorted(layers or signal_layers),
+                shape=IntBox(box.ll.x + location.x, box.ll.y + location.y,
+                             box.ur.x + location.x, box.ur.y + location.y),
+            )
+        )
+
+
 def _insert_zones(dsn: DsnBoard, board: BasicBoard, transform: CoordinateTransform, nets) -> None:
     """Each DSN plane as a ConductionArea of its net on its layer."""
     layer_no = {layer.name: i for i, layer in enumerate(dsn.layers)}

src/rpmroute/board/items.py

@@ -3,22 +3,22 @@
 Ports the *data model* of ``board/Item.java`` and its subclasses (``Pin``,
 ``ObstacleArea``/``ConductionArea``, ``Via``, ``PolylineTrace``). The routing
 and search-tree machinery in the Java classes is out of scope here — these hold
-the geometry and connectivity a :class:`~freeroute.board.board.BasicBoard`
+the geometry and connectivity a :class:`~rpmroute.board.board.BasicBoard`
 needs and that the DSN-import invariants check.
 
 Coordinates are board units (DSN units scaled by the resolution). Shapes are the
-exact convex tiles / boxes from :mod:`freeroute.geometry`.
+exact convex tiles / boxes from :mod:`rpmroute.geometry`.
 
 ``Trace``/``Via`` are only produced by routing (an imported unrouted board has
 none); they are lightweight here and the router phase fleshes out
-``Trace`` with a proper :class:`~freeroute.geometry.Polyline` shape.
+``Trace`` with a proper :class:`~rpmroute.geometry.Polyline` shape.
 """
 
 from __future__ import annotations
 
 from dataclasses import dataclass, field
 
-from freeroute.geometry import IntBox, IntPoint
+from rpmroute.geometry import IntBox, IntPoint
 
 __all__ = ["Item", "Pin", "ObstacleArea", "ConductionArea", "Via", "Trace"]
 
@@ -76,6 +76,11 @@ class ObstacleArea(Item):
     #: tracks" rule area, where vias are allowed), via_keepout only vias
     blocks_wires: bool = True
     blocks_vias: bool = True
+    #: False for a KiCad rule area: copper may not overlap it but may touch
+    #: it, since KiCad's DRC applies no clearance to a rule area. Every other
+    #: keepout may stand for copper (a net tie, a track kept as it is), so it
+    #: keeps the clearance unless named as a rule area.
+    clearance: bool = True
 
     def is_obstacle(self) -> bool:
         return True
@@ -109,6 +114,11 @@ class Via(Item):
 
     padstack_name: str = ""
     location: IntPoint = field(default_factory=lambda: IntPoint(0, 0))
+    #: layer indices the via's pads occupy, and the largest pad as a box
+    layers: list[int] = field(default_factory=list)
+    shape: object = None
+    #: drill diameter in board units, when the padstack name gives it
+    drill: int = 0
 
 
 @dataclass
@@ -116,7 +126,7 @@ class Trace(Item):
     """A routed trace (router-produced).
 
     Held as its corner points plus a half-width; the router phase attaches the
-    full :class:`~freeroute.geometry.Polyline` swept shape.
+    full :class:`~rpmroute.geometry.Polyline` swept shape.
     """
 
     layer: int = 0

src/rpmroute/board/outline.py

@@ -9,7 +9,7 @@ from __future__ import annotations
 
 import math
 
-from freeroute.geometry import IntBox, IntPoint
+from rpmroute.geometry import IntBox, IntPoint
 
 
 class BoardOutline:

src/rpmroute/board/search_tree.py

@@ -2,7 +2,7 @@
 
 Ports the query role of ``board/ShapeSearchTree*.java``. It replaces the exact
 router's occupancy grid: instead of rasterizing shapes into cells, it indexes
-each item's convex tiles (:class:`~freeroute.geometry.IntBox`) and answers
+each item's convex tiles (:class:`~rpmroute.geometry.IntBox`) and answers
 overlap / region queries with a broad phase (a bounding-box spatial hash) and an
 **exact** narrow phase (exact ``IntBox`` intersection). Insert and remove keep
 the index in step as traces are added.
@@ -18,7 +18,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 
-from freeroute.geometry import IntBox, Simplex, overlaps_2d, segment_octagon
+from rpmroute.geometry import IntBox, IntPoint, Simplex, overlaps_2d, segment_octagon, segment_slab
 
 __all__ = ["TreeShape", "ShapeSearchTree"]
 
@@ -34,7 +34,7 @@ class TreeShape:
 
     ``exact`` / ``seg`` are set only for a 45-degree (diagonal) trace tile: ``tile``
     is then the bounding box (broad-phase only), ``exact`` is the tight octagon
-    copper :class:`~freeroute.geometry.Simplex`, and ``seg`` is ``(a, b,
+    copper :class:`~rpmroute.geometry.Simplex`, and ``seg`` is ``(a, b,
     half_width)`` so the clearance region can be rebuilt exactly on demand. For
     every orthogonal tile both are ``None`` and all code paths are byte-identical
     to the box-only tree.
@@ -50,6 +50,8 @@ class TreeShape:
     #: which copper a keepout tile stops: "all", "wires" (a wire_keepout,
     #: vias allowed) or "vias" (a via_keepout)
     blocks: str = "all"
+    #: False for a rule area: copper may touch it, only overlap counts
+    clearance: bool = True
 
     def on_layer(self, layer: int) -> bool:
         return layer in self.layers
@@ -61,7 +63,9 @@ class TreeShape:
         segment swept by ``half_width + clearance`` (exact integer superset)."""
         if self.seg is None:
             return self.tile.offset(clearance)
-        a, b, half_width = self.seg
+        a, b, half_width = self.seg[-3:]
+        if self.seg[0] == "slab":  # a slanted pin exit, at any angle
+            return segment_slab(a, b, half_width + clearance)
         return segment_octagon(a, b, half_width + clearance)
 
 
@@ -129,6 +133,8 @@ class ShapeSearchTree:
 
         Uses a strict 2-D overlap of the ``clearance``-expanded box, so tiles
         exactly ``clearance`` apart (touching after expansion) are allowed.
+        A rule area (``clearance=False``) only has to be clear of the copper
+        itself.
         """
         expanded = box.offset(clearance)
         for shape in self.overlapping(expanded):
@@ -136,6 +142,10 @@ class ShapeSearchTree:
                 continue
             if shape.blocks != "all" and shape.blocks != kind + "s":
                 continue  # a wire-only keepout does not stop a via, and so on
+            if not shape.clearance:
+                if shape.tile.overlaps(box):
+                    return True
+                continue
             if shape.exact is not None:
                 if overlaps_2d(shape.exact, expanded):
                     return True
@@ -143,6 +153,36 @@ class ShapeSearchTree:
                 return True
         return False
 
+    def segment_conflict(
+        self, a: IntPoint, b: IntPoint, half_width: int, net_no: int, layer: int,
+        clearance: int, kind: str = "wire",
+    ) -> bool:
+        """:meth:`clearance_conflict` for a slanted segment, checked on its
+        exact swept copper instead of its bounding box (which would reach the
+        neighbouring pads of a pin leaving along its turned pad's axis)."""
+        copper = segment_slab(a, b, half_width)
+        grown = segment_slab(a, b, half_width + clearance)
+        for shape in self.overlapping(grown.bounding_box()):
+            if shape.net_no == net_no or not shape.on_layer(layer):
+                continue
+            if shape.blocks != "all" and shape.blocks != kind + "s":
+                continue
+            other = shape.exact if shape.exact is not None else shape.tile
+            if overlaps_2d(copper if not shape.clearance else grown, other):
+                return True
+        return False
+
+    def rule_area_overlap(self, box: IntBox, layer: int, kind: str = "wire") -> bool:
+        """True if ``box`` overlaps a rule area on ``layer`` that stops ``kind``."""
+        for shape in self.overlapping(box):
+            if shape.clearance or not shape.on_layer(layer):
+                continue
+            if shape.blocks != "all" and shape.blocks != kind + "s":
+                continue
+            if shape.tile.overlaps(box):
+                return True
+        return False
+
     def clearance_conflict_shape(
         self, region, net_no: int, layer: int
     ) -> bool:
@@ -169,6 +209,8 @@ class ShapeSearchTree:
         overlap). Static pad-vs-pad spacing in the source design is not counted.
         """
         for shape in self.all_shapes():
+            if not shape.routed:
+                continue  # a pair with routed copper is checked from that side
             expanded = shape.tile.offset(clearance)
             grown = None  # exact clearance region, built lazily only for diagonals
             for other in self.overlapping(expanded):
@@ -178,6 +220,13 @@ class ShapeSearchTree:
                     continue  # static input pair (e.g. pad vs pad) — not a routing DRC
                 if not (shape.layers & other.layers):
                     continue
+                if not (shape.clearance and other.clearance):
+                    # a rule area: only an overlap is a violation
+                    mine = shape.exact if shape.exact is not None else shape.tile
+                    theirs = other.exact if other.exact is not None else other.tile
+                    if overlaps_2d(mine, theirs):
+                        return shape
+                    continue
                 if shape.exact is None and other.exact is None:
                     if other.tile.overlaps(expanded):  # byte-identical box path
                         return shape
@@ -188,3 +237,36 @@ class ShapeSearchTree:
                 if overlaps_2d(grown, other_tile):
                     return shape
         return None
+
+    def violation_pairs(self, clearance: int) -> list[tuple[TreeShape, TreeShape, bool]]:
+        """Every different-net pair sharing a layer, at least one of them
+        routed, whose coppers come closer than ``clearance``: ``(routed tile,
+        other tile, touching)``. ``touching`` is True when the coppers
+        themselves overlap (a short, or copper inside a keepout); False for a
+        clearance violation. Each pair of tiles is reported once.
+
+        :meth:`has_violation` asks whether there is one; this lists them all,
+        for a report on copper that no engine has checked.
+        """
+        pairs: list[tuple[TreeShape, TreeShape, bool]] = []
+        seen: set[tuple[int, int]] = set()
+        for shape in self.all_shapes():
+            if not shape.routed:
+                continue
+            mine = shape.exact if shape.exact is not None else shape.tile
+            grown = shape.clearance_region(clearance)
+            for other in self.overlapping(grown.bounding_box()):
+                if other is shape or other.net_no == shape.net_no:
+                    continue
+                if not (shape.layers & other.layers):
+                    continue
+                key = (min(id(shape), id(other)), max(id(shape), id(other)))
+                if key in seen:
+                    continue
+                theirs = other.exact if other.exact is not None else other.tile
+                touching = overlaps_2d(mine, theirs)
+                if not touching and (not other.clearance or not overlaps_2d(grown, theirs)):
+                    continue  # a rule area only counts an overlap
+                seen.add(key)
+                pairs.append((shape, other, touching))
+        return pairs

src/rpmroute/board/transform.py

@@ -8,7 +8,7 @@ resolution`` and zero offset (see ``Structure.create_board``).
 
 from __future__ import annotations
 
-from freeroute.geometry import FloatPoint, IntPoint
+from rpmroute.geometry import FloatPoint, IntPoint
 
 __all__ = ["CoordinateTransform"]
 

src/rpmroute/cli.py

@@ -0,0 +1,499 @@
+"""rpmroute command-line interface: Specctra DSN in, routed SES out.
+
+Flag-compatible with the FreeRouting JAR (``-de`` / ``-do`` / ``-mp``) so it can
+be dropped in wherever ``java -jar freerouting.jar`` was invoked, plus the
+rpmroute-specific engine selection (``--engine``) and its opt-in passes.
+
+Not every engine supports every pass. The matrix below is the single source of
+truth; an unsupported combination is an error, never a silent no-op::
+
+    engine   --pack  --shove  --diagonal  --no-rip-up  -mp/--max-passes
+    grid       no      no        no          yes            yes
+    exact      no      yes       yes         yes            yes
+    room       yes     yes       no          no             no
+"""
+
+from __future__ import annotations
+
+import argparse
+import sys
+
+from rpmroute.dsn.reader import parse_dsn
+from rpmroute.route.orders import best_of_orders, promote_failures
+from rpmroute.route.pipeline import (
+    build_exact_routing_result,
+    build_rooms_routing_result,
+    build_routing_result,
+)
+from rpmroute.route.smooth import smooth
+from rpmroute.route.verify import verify_result
+from rpmroute.ses import write_ses
+
+#: which optional flags each engine actually implements. Anything not listed for
+#: an engine is rejected by :func:`_validate` rather than quietly ignored.
+ENGINE_OPTIONS: dict[str, frozenset[str]] = {
+    "grid": frozenset({
+        "rip_up", "max_passes", "seed", "orders", "promote", "access", "negotiate", "rollback",
+        "tree", "via_cost",
+    }),
+    "exact": frozenset({
+        "shove", "diagonal", "rip_up", "max_passes", "seed", "orders", "promote", "access",
+        "negotiate", "rollback", "tree", "window", "vias", "via_cost", "smooth",
+    }),
+    "room": frozenset({"shove", "pack"}),
+}
+
+#: option key -> the CLI spelling to name in an error message
+_FLAG_NAMES = {
+    "pack": "--pack",
+    "shove": "--shove",
+    "diagonal": "--diagonal",
+    "rip_up": "--no-rip-up",
+    "max_passes": "-mp/--max-passes",
+    "seed": "--seed",
+    "orders": "--orders",
+    "promote": "--promote-failures",
+    "access": "--access-cost",
+    "negotiate": "--negotiate",
+    "rollback": "--no-rollback",
+    "tree": "--no-tree",
+    "window": "--window-reroute",
+    "vias": "--reduce-vias",
+    "via_cost": "--via-cost",
+    "smooth": "--smooth",
+}
+
+
+def _supported_by(option: str) -> str:
+    engines = [e for e, opts in ENGINE_OPTIONS.items() if option in opts]
+    return " or ".join(f"--engine {e}" for e in engines)
+
+
+def _validate(parser: argparse.ArgumentParser, engine: str, requested: list[str]) -> None:
+    """Reject any requested option the selected engine does not implement."""
+    supported = ENGINE_OPTIONS[engine]
+    for option in requested:
+        if option not in supported:
+            parser.error(
+                f"{_FLAG_NAMES[option]} is not supported by --engine {engine} "
+                f"(supported by: {_supported_by(option)})"
+            )
+
+
+def build_parser() -> argparse.ArgumentParser:
+    parser = argparse.ArgumentParser(
+        prog="rpmroute",
+        description="Native PCB autorouter — route a Specctra DSN and write an SES session file.",
+    )
+    parser.add_argument("dsn", nargs="?", help="input Specctra .dsn file")
+    parser.add_argument(
+        "-de", "--design", dest="design", help="input .dsn (FreeRouting-compatible alias)"
+    )
+    parser.add_argument(
+        "-do", "-o", "--output", dest="output", help="output .ses file (default: stdout)"
+    )
+    parser.add_argument(
+        "-mp",
+        "--max-passes",
+        type=int,
+        default=None,
+        help="rip-up-and-retry pass bound (grid and exact engines; default 10)",
+    )
+    parser.add_argument(
+        "--engine",
+        choices=sorted(ENGINE_OPTIONS),
+        default="exact",
+        help=(
+            "routing track: exact (default; every route checked against exact pad and "
+            "copper shapes, DRC-clean output), grid (quick maze on the grid alone: its "
+            "copper is NOT clearance-checked and can short), room (continuous expansion "
+            "rooms, routes off-grid channels; not clearance-checked either)"
+        ),
+    )
+    parser.add_argument(
+        "--pack",
+        action="store_true",
+        help="coordinated multi-trace channel packing (room engine only)",
+    )
+    parser.add_argument(
+        "--shove",
+        action="store_true",
+        help="shove committed traces aside to recover dropped nets (exact and room engines)",
+    )
+    parser.add_argument(
+        "--diagonal",
+        action="store_true",
+        help="45-degree recovery pass for dropped 2-pin nets (exact engine only)",
+    )
+    parser.add_argument(
+        "--no-rip-up",
+        action="store_true",
+        help="disable rip-up-and-retry (grid and exact engines)",
+    )
+    parser.add_argument("--layers", help="comma-separated signal layer indices to route on")
+    parser.add_argument(
+        "--grid-resolution",
+        type=int,
+        default=None,
+        metavar="K",
+        help="grid and exact engines: cells K times finer than trace + clearance; "
+        "default 2 for exact (reaches 0.5 mm pitch pins), 1 for grid",
+    )
+    parser.add_argument(
+        "--heuristic-weight",
+        type=float,
+        default=1.0,
+        metavar="W",
+        help="exact engine: weighted A* (W >= 1); larger is faster, routes at most "
+        "W times the shortest length (default 1)",
+    )
+    parser.add_argument(
+        "--edge-clearance",
+        type=float,
+        metavar="MM",
+        help="copper to board-edge clearance in mm, e.g. KiCad's min_copper_edge_clearance "
+        "(the DSN does not carry it); default 0: copper only has to stay inside the outline",
+    )
+    parser.add_argument(
+        "--seed",
+        type=int,
+        metavar="N",
+        help="grid and exact engines: shuffle the order connections are routed in; "
+        "the same seed gives the same result (default: fewer-pin nets first)",
+    )
+    parser.add_argument(
+        "--orders",
+        type=int,
+        metavar="N",
+        help="grid and exact engines: route N connection orders in parallel and keep the "
+        "one leaving the fewest connections unrouted (the default order is one of them)",
+    )
+    parser.add_argument(
+        "--promote-failures",
+        type=int,
+        metavar="R",
+        help="grid and exact engines: up to R rounds, each routing the connections that "
+        "failed so far first; keeps the best round",
+    )
+    parser.add_argument(
+        "--access-cost",
+        type=float,
+        metavar="C",
+        help="grid and exact engines: extra cost for a route to pass where it would close "
+        "another pin's way out while that pin still has connections to route (default 0: off)",
+    )
+    parser.add_argument(
+        "--negotiate",
+        type=int,
+        metavar="N",
+        help="grid and exact engines: before routing, N rounds of negotiation on the empty "
+        "board, where routes may share space at a price that rises where they compete; "
+        "the contested cells then cost extra in the real routing (default 0: off)",
+    )
+    parser.add_argument(
+        "--smooth",
+        action="store_true",
+        help="exact engine: after routing, turn grid staircases into straight and 45-degree "
+        "runs and chamfer right-angle corners; same nets, ends, vias and layers, and every "
+        "new piece of copper checked on exact shapes against the board edge, other nets "
+        "and keepouts",
+    )
+    parser.add_argument(
+        "--smooth-report",
+        action="store_true",
+        help="with --smooth (implies it): also print track length per layer before and after",
+    )
+    parser.add_argument(
+        "--no-rollback",
+        dest="rollback",
+        action="store_false",
+        help="grid and exact engines: keep every rip-up, as before. By default the "
+        "connections a rip-up displaces are rerouted at once and the rip-up is undone "
+        "if fewer connections end up routed",
+    )
+    parser.add_argument(
+        "--no-tree",
+        dest="tree_nets",
+        action="store_false",
+        help="grid and exact engines: join a multi-pin net's pins as a chain in pin "
+        "order, each connection ending on one chosen pin, as before. By default they are "
+        "paired by a minimum spanning tree and a connection may end on copper its net "
+        "has already routed",
+    )
+    parser.add_argument(
+        "--window-reroute",
+        type=int,
+        metavar="N",
+        help="exact engine: after routing, N rounds of window re-routes: around each "
+        "connection still unrouted, the nets routed wholly inside a window are ripped and "
+        "the window routed again on a finer grid, kept only if fewer connections are left "
+        "unrouted; each round doubles the window's margin (default 0: off)",
+    )
+    parser.add_argument(
+        "--window-resolution",
+        type=int,
+        default=4,
+        metavar="K",
+        help="the window re-route's grid resolution (default 4)",
+    )
+    parser.add_argument(
+        "--window-budget",
+        type=float,
+        default=0.25,
+        metavar="F",
+        help="the window re-route stops starting windows once it has spent this share "
+        "of the routing's own time (default 0.25)",
+    )
+    parser.add_argument(
+        "--window-cap",
+        type=int,
+        default=40,
+        metavar="W",
+        help="at most this many windows per round, smallest first (default 40)",
+    )
+    parser.add_argument(
+        "--window-margin",
+        type=float,
+        default=1.5,
+        metavar="MM",
+        help="the first round's window margin around the stuck connection's pins (default 1.5)",
+    )
+    parser.add_argument(
+        "--via-cost",
+        type=float,
+        default=None,
+        metavar="C",
+        help="grid and exact engines: what a layer change costs the search, in grid "
+        "steps of track (default 10)",
+    )
+    parser.add_argument(
+        "--reduce-vias",
+        action="store_true",
+        default=None,
+        help="exact engine: after routing, route each net that has vias again on its own "
+        "with vias made dearer, everything else held fixed; its new copper is kept only "
+        "if it fails nothing new and has fewer vias",
+    )
+    parser.add_argument(
+        "--reduce-vias-budget",
+        type=float,
+        default=0.5,
+        metavar="F",
+        help="via reduction stops starting nets once it has spent this share of the "
+        "routing's own time (default 0.5)",
+    )
+    parser.add_argument(
+        "--reduce-vias-margin",
+        type=float,
+        default=2.0,
+        metavar="MM",
+        help="how far past its pins and copper a net may go when routed again (default 2.0)",
+    )
+    parser.add_argument(
+        "--hole-to-hole",
+        type=float,
+        default=0.25,
+        metavar="MM",
+        help="grid and exact engines: least distance between the edges of any two via "
+        "holes, of one net or two (KiCad's min_hole_to_hole; default 0.25)",
+    )
+    parser.add_argument(
+        "--jobs",
+        type=int,
+        metavar="J",
+        help="processes for --orders (default: one per order, up to the CPU count)",
+    )
+    parser.add_argument(
+        "--strict",
+        action="store_true",
+        help=(
+            "exit with status 3 when the routed copper has shorts or clearance "
+            "violations (grid and room output is checked after routing; the "
+            "session file is still written)"
+        ),
+    )
+    return parser
+
+
+def main(argv: list[str] | None = None) -> int:
+    parser = build_parser()
+    args = parser.parse_args(argv)
+
+    dsn_path = args.design or args.dsn
+    if not dsn_path:
+        parser.error("no input DSN (pass a path, or -de <file>)")
+
+    requested = [
+        option
+        for option, asked in (
+            ("pack", args.pack),
+            ("shove", args.shove),
+            ("diagonal", args.diagonal),
+            ("rip_up", args.no_rip_up),
+            ("max_passes", args.max_passes is not None),
+            ("seed", args.seed is not None),
+            ("orders", args.orders is not None),
+            ("promote", args.promote_failures is not None),
+            ("access", args.access_cost is not None),
+            ("negotiate", args.negotiate is not None),
+            ("rollback", not args.rollback),
+            ("tree", not args.tree_nets),
+            ("window", args.window_reroute is not None),
+            ("vias", args.reduce_vias is not None),
+            ("via_cost", args.via_cost is not None),
+            ("smooth", args.smooth or args.smooth_report),
+        )
+        if asked
+    ]
+    _validate(parser, args.engine, requested)
+
+    try:
+        layers = [int(x) for x in args.layers.split(",")] if args.layers else None
+    except ValueError:
+        parser.error(f"--layers must be comma-separated integers (got: {args.layers!r})")
+
+    try:
+        with open(dsn_path, encoding="utf-8") as f:
+            dsn_text = f.read()
+    except OSError as e:
+        print(f"rpmroute: cannot read {dsn_path}: {e}", file=sys.stderr)
+        return 2
+
+    dsn = parse_dsn(dsn_text)
+    rip_up = not args.no_rip_up
+    max_passes = args.max_passes if args.max_passes is not None else 10
+
+    if args.orders is not None and args.orders < 1:
+        parser.error("--orders must be at least 1")
+    if args.engine == "exact":
+        options = {
+            "layers": layers,
+            "shove": args.shove,
+            "diagonal": args.diagonal,
+            "rip_up": rip_up,
+            "max_passes": max_passes,
+            "edge_clearance_mm": args.edge_clearance,
+            "resolution": 2 if args.grid_resolution is None else args.grid_resolution,
+            "heuristic_weight": args.heuristic_weight,
+            "access_cost": args.access_cost or 0.0,
+            "negotiate": args.negotiate or 0,
+            "hole_to_hole_mm": args.hole_to_hole,
+            "rollback": args.rollback,
+            "tree_nets": args.tree_nets,
+            "window_reroute": args.window_reroute or 0,
+            "window_resolution": args.window_resolution,
+            "window_margin_mm": args.window_margin,
+            "window_budget": args.window_budget,
+            "window_cap": args.window_cap,
+            "reduce_vias": bool(args.reduce_vias),
+            "reduce_vias_budget": args.reduce_vias_budget,
+            "reduce_vias_margin_mm": args.reduce_vias_margin,
+        }
+        if args.via_cost is not None:
+            options["via_cost"] = args.via_cost
+    elif args.engine == "grid":
+        options = {
+            "layers": layers,
+            "rip_up": rip_up,
+            "max_passes": max_passes,
+            "edge_clearance_mm": args.edge_clearance,
+            "resolution": 1 if args.grid_resolution is None else args.grid_resolution,
+            "access_cost": args.access_cost or 0.0,
+            "negotiate": args.negotiate or 0,
+            "hole_to_hole_mm": args.hole_to_hole,
+            "rollback": args.rollback,
+            "tree_nets": args.tree_nets,
+        }
+        if args.via_cost is not None:
+            options["via_cost"] = args.via_cost
+    if args.engine == "room":
+        result = build_rooms_routing_result(
+            dsn, layers=layers, shove=args.shove, pack=args.pack,
+            edge_clearance_mm=args.edge_clearance,
+        )
+    elif args.promote_failures and args.promote_failures > 1:
+        if args.orders:
+            parser.error("--orders and --promote-failures cannot be combined")
+        result, rounds = promote_failures(
+            dsn_text, args.engine, options, rounds=args.promote_failures, seed=args.seed
+        )
+        counts = ", ".join(str(m) for m, _z in rounds)
+        print(f"rpmroute: {len(rounds)} rounds, unrouted {counts}; kept the best", file=sys.stderr)
+    elif args.orders and args.orders > 1:
+        result, kept, tried = best_of_orders(
+            dsn_text, args.engine, options, orders=args.orders, seed=args.seed, jobs=args.jobs
+        )
+        counts = ", ".join(f"{'default' if s is None else s}: {m}" for s, (m, _z) in tried)
+        print(
+            f"rpmroute: tried {len(tried)} orders, kept "
+            f"{'the default order' if kept is None else f'--seed {kept}'} (unrouted {counts})",
+            file=sys.stderr,
+        )
+    elif args.engine == "exact":
+        result = build_exact_routing_result(dsn, seed=args.seed, **options)
+    else:
+        result = build_routing_result(dsn, seed=args.seed, **options)
+
+    if args.smooth or args.smooth_report:
+        report = smooth(dsn, result, edge_clearance_mm=args.edge_clearance)
+        print(f"rpmroute: {report.line()}", file=sys.stderr)
+        if args.smooth_report:
+            for row in report.table():
+                print(row, file=sys.stderr)
+
+    ses_text = write_ses(dsn, result)
+    missing = [u for u in result.unrouted if not u[3]]
+    in_zone = [u for u in result.unrouted if u[3]]
+    if missing:
+        # the SES is still written; say plainly what it is missing
+        print(f"rpmroute: {len(missing)} connection(s) not routed:", file=sys.stderr)
+        for net, a, b, _zone in missing:
+            print(f"  {net}: {a} to {b}", file=sys.stderr)
+    if result.narrowed:
+        print(
+            f"rpmroute: {len(result.narrowed)} connection(s) of a wider net class only fitted "
+            "at the default width; their nets are written at the default width:",
+            file=sys.stderr,
+        )
+        for net, a, b in result.narrowed:
+            print(f"  {net}: {a} to {b}", file=sys.stderr)
+    if in_zone:
+        print(
+            f"rpmroute: {len(in_zone)} more connection(s) left to a zone fill that may join them:",
+            file=sys.stderr,
+        )
+        for net, a, b, zone in in_zone:
+            print(f"  {net}: {a} to {b} (both in zone {zone})", file=sys.stderr)
+
+    flawed = False
+    if args.engine != "exact":
+        # These engines route on approximations and do not check the copper
+        # they write: check it now against the exact shapes the exact engine
+        # uses, so shorts are reported rather than shipped.
+        check = verify_result(dsn, result)
+        flawed = not check.clean
+        print(
+            f"rpmroute: {args.engine} output checked on exact shapes: "
+            f"{check.shorts} short(s), {check.clearance} clearance violation(s)",
+            file=sys.stderr,
+        )
+        for kind, examples in (("short", check.short_examples), ("clearance", check.clearance_examples)):
+            for found in examples:
+                print(f"  {kind}: {found}", file=sys.stderr)
+        if flawed:
+            print(
+                f"rpmroute: WARNING: this {args.engine} routing is not DRC-clean; fix it in "
+                "KiCad or route with --engine exact (the default)",
+                file=sys.stderr,
+            )
+
+    if args.output:
+        with open(args.output, "w", encoding="utf-8") as f:
+            f.write(ses_text)
+    else:
+        sys.stdout.write(ses_text)
+    return 3 if (flawed and args.strict) else 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

src/rpmroute/dsn/__init__.py

@@ -1,13 +1,13 @@
-"""Specctra DSN parsing for freeroute.
+"""Specctra DSN parsing for rpmroute.
 
 Public API::
 
-    from freeroute.dsn import parse_dsn
+    from rpmroute.dsn import parse_dsn
     board = parse_dsn(dsn_text)
 
-``parse_dsn`` returns a typed :class:`~freeroute.dsn.model.DsnBoard`. The
-lower-level :func:`~freeroute.dsn.tokenizer.tokenize` and
-:func:`~freeroute.dsn.sexp.parse` are exposed for tooling and tests.
+``parse_dsn`` returns a typed :class:`~rpmroute.dsn.model.DsnBoard`. The
+lower-level :func:`~rpmroute.dsn.tokenizer.tokenize` and
+:func:`~rpmroute.dsn.sexp.parse` are exposed for tooling and tests.
 """
 
 from __future__ import annotations

src/rpmroute/dsn/model.py

@@ -27,6 +27,8 @@ __all__ = [
     "NetPin",
     "Net",
     "NetClass",
+    "WiringVia",
+    "WiringWire",
     "Keepout",
     "DsnBoard",
 ]
@@ -186,6 +188,26 @@ class Keepout:
     kind: str = "keepout"  # keepout | via_keepout | wire_keepout | place_keepout
 
 
+@dataclass
+class WiringWire:
+    """A track already on the board: ``(wire (path LAYER WIDTH x y ...) (net N))``."""
+
+    net: str
+    layer: str
+    width: float
+    coords: list[float] = field(default_factory=list)
+
+
+@dataclass
+class WiringVia:
+    """A via already on the board: ``(via PADSTACK x y (net N))``."""
+
+    net: str
+    padstack: str
+    x: float
+    y: float
+
+
 @dataclass
 class DsnBoard:
     """The fully parsed DSN file."""
@@ -197,6 +219,9 @@ class DsnBoard:
     layers: list[Layer] = field(default_factory=list)
     #: copper zones, as planes of a net
     planes: list[Plane] = field(default_factory=list)
+    #: copper already routed (the ``wiring`` scope), kept fixed
+    wires: list[WiringWire] = field(default_factory=list)
+    vias: list[WiringVia] = field(default_factory=list)
     #: bounding-box boundary shape (layer ``pcb``), if present
     boundary: Shape | None = None
     #: outline shapes (layer ``signal``)

src/rpmroute/dsn/reader.py

@@ -9,6 +9,8 @@ tolerant ``skip_scope`` behaviour.
 
 from __future__ import annotations
 
+import re
+
 from .model import (
     ClearanceRule,
     ComponentPlace,
@@ -25,6 +27,8 @@ from .model import (
     Pin,
     Resolution,
     WidthRule,
+    WiringVia,
+    WiringWire,
 )
 from .sexp import SExp, parse
 from .shapes import Shape, read_area, read_shape
@@ -481,12 +485,26 @@ def _read_network(node: SExp, board: DsnBoard) -> None:
 # --- top level ---------------------------------------------------------------
 
 
+_STRING_QUOTE = re.compile(r"\(\s*string_quote\s+(\S)\s*\)")
+
+
+def _declared_quote(text: str) -> str:
+    """The quote character the file declares in ``(string_quote X)``.
+
+    Only that character opens a string. Without a declaration both kinds are
+    accepted, as before: KiCad declares ``"`` and then writes a bare ``'``
+    where a value is a single quote mark, e.g. a keycap part number.
+    """
+    found = _STRING_QUOTE.search(text[:4096])
+    return found.group(1) if found else "\"'"
+
+
 def parse_dsn(text: str) -> DsnBoard:
     """Parse DSN ``text`` into a :class:`DsnBoard`.
 
     Raises :class:`DsnParseError` if the top-level scope is not ``(pcb ...)``.
     """
-    top = parse(text)
+    top = parse(text, _declared_quote(text))
     if top.head != "pcb":
         raise DsnParseError(
             f"not a Specctra DSN file: expected top-level '(pcb ...)', got '({top.head} ...)'"
@@ -515,11 +533,45 @@ def parse_dsn(text: str) -> DsnBoard:
             _read_placement(it, board)
         elif head == "network":
             _read_network(it, board)
-        # `wiring` and unknown scopes are intentionally ignored for now.
+        elif head == "wiring":
+            _read_wiring(it, board)
+        # unknown scopes are ignored
 
     return board
 
 
+def _read_wiring(node: SExp, board: DsnBoard) -> None:
+    """Tracks and vias already on the board. They stay where they are: the
+    router treats them as copper of their net that other nets keep clear of."""
+    for it in node.items:
+        if not isinstance(it, SExp):
+            continue
+        net_scope = it.child("net")
+        net = _first_value(net_scope) if net_scope is not None else None
+        if not net:
+            continue  # netless copper would need a keepout, not a wire
+        if it.head == "wire":
+            path = it.child("path") or it.child("polyline_path")
+            vals = [v.text for v in path.values()] if path is not None else []
+            if len(vals) < 6:
+                continue
+            try:
+                width = float(vals[1])
+                coords = [float(v) for v in vals[2:]]
+            except ValueError:
+                continue
+            board.wires.append(WiringWire(net=net, layer=vals[0], width=width, coords=coords))
+        elif it.head == "via":
+            vals = [v.text for v in it.values()]
+            if len(vals) < 3:
+                continue
+            try:
+                x, y = float(vals[1]), float(vals[2])
+            except ValueError:
+                continue
+            board.vias.append(WiringVia(net=net, padstack=vals[0], x=x, y=y))
+
+
 def _read_plane(node: SExp):
     """``(plane <net> (polygon <layer> <width> x y ...))`` -> :class:`Plane`."""
     from .model import Plane

src/rpmroute/dsn/sexp.py

@@ -22,7 +22,7 @@ class SExp:
 
     ``head`` is the text of the first token when it is an atom (e.g. ``pcb``,
     ``layer``, ``net``), else ``None``. ``items`` holds the remaining elements,
-    each either a :class:`~freeroute.dsn.tokenizer.Token` (a leaf atom/string)
+    each either a :class:`~rpmroute.dsn.tokenizer.Token` (a leaf atom/string)
     or a nested :class:`SExp`.
     """
 

src/rpmroute/geometry/__init__.py

@@ -1,4 +1,4 @@
-"""Planar geometry primitives for freeroute.
+"""Planar geometry primitives for rpmroute.
 
 A port of the subset of FreeRouting's ``geometry/planar`` package the router
 needs, with the exact-arithmetic types preserved. Arithmetic model per type:
@@ -21,7 +21,7 @@ from .direction import Direction, IntDirection
 from .float_point import FloatPoint
 from .limits import CRIT_DOUBLE, CRIT_INT
 from .line import Line
-from .octagon import ceil_sqrt2, overlaps_2d, segment_octagon
+from .octagon import ceil_sqrt2, overlaps_2d, segment_octagon, segment_slab
 from .point import IntPoint, Point, RationalPoint, point, rational_point
 from .polygon import Polygon
 from .polygon_shape import PolygonShape
@@ -59,5 +59,6 @@ __all__ = [
     "shove_segment",
     "ceil_sqrt2",
     "segment_octagon",
+    "segment_slab",
     "overlaps_2d",
 ]

src/rpmroute/geometry/box.py

@@ -231,7 +231,7 @@ class IntBox:
         return [FloatPoint(c.x, c.y) for c in self.corners()]
 
     def to_simplex(self):
-        """Return this box as a :class:`~freeroute.geometry.simplex.Simplex`.
+        """Return this box as a :class:`~rpmroute.geometry.simplex.Simplex`.
 
         Four directed border lines whose common right side is the box interior
         (ports ``IntBox.to_Simplex``).

src/rpmroute/geometry/float_point.py

@@ -6,7 +6,7 @@ Ports ``geometry/planar/FloatPoint.java``.
 keeps ``FloatPoint`` *outside* the exact ``Point`` hierarchy because float math
 is inexact; it is used for distances, rounding, and speed-over-accuracy paths.
 Its :meth:`side_of` has no reliable ``COLLINEAR`` result (numerical noise), so
-exact side tests must go through :class:`~freeroute.geometry.point.Point`.
+exact side tests must go through :class:`~rpmroute.geometry.point.Point`.
 """
 
 from __future__ import annotations
@@ -137,13 +137,13 @@ class FloatPoint:
     # --- rounding to integer points ----------------------------------------
 
     def round(self):
-        """Round to the nearest :class:`~freeroute.geometry.point.IntPoint`."""
+        """Round to the nearest :class:`~rpmroute.geometry.point.IntPoint`."""
         from .point import IntPoint
 
         return IntPoint(_round_half_up(self.x), _round_half_up(self.y))
 
     def bounding_box(self):
-        """Smallest :class:`~freeroute.geometry.box.IntBox` containing this point."""
+        """Smallest :class:`~rpmroute.geometry.box.IntBox` containing this point."""
         from .box import IntBox
 
         return IntBox(

src/rpmroute/geometry/line.py

@@ -2,12 +2,12 @@
 
 Ports ``geometry/planar/Line.java`` (the subset needed for the router's
 half-plane work). Like the upstream class, a ``Line`` is defined by two
-:class:`~freeroute.geometry.point.IntPoint` endpoints.
+:class:`~rpmroute.geometry.point.IntPoint` endpoints.
 
 **Arithmetic model: exact.** :meth:`side_of` uses an exact integer determinant,
-and :meth:`intersection` returns an :class:`~freeroute.geometry.point.IntPoint`
+and :meth:`intersection` returns an :class:`~rpmroute.geometry.point.IntPoint`
 when the crossing is integral and a
-:class:`~freeroute.geometry.point.RationalPoint` otherwise (``z == 0`` when the
+:class:`~rpmroute.geometry.point.RationalPoint` otherwise (``z == 0`` when the
 lines are parallel — the "point at infinity"). :meth:`intersection_approx` is
 the fast ``float`` path.
 """

src/rpmroute/geometry/octagon.py

@@ -29,7 +29,7 @@ from .line import Line
 from .point import IntPoint
 from .simplex import Simplex
 
-__all__ = ["ceil_sqrt2", "segment_octagon", "overlaps_2d"]
+__all__ = ["ceil_sqrt2", "segment_octagon", "segment_slab", "overlaps_2d"]
 
 
 def ceil_sqrt2(radius: int) -> int:
@@ -82,6 +82,46 @@ def segment_octagon(a: IntPoint, b: IntPoint, radius: int) -> Simplex:
     return Simplex.get_instance(lines)
 
 
+def segment_slab(a: IntPoint, b: IntPoint, radius: int) -> Simplex:
+    """Convex cover of segment ``a``-``b`` swept by ``radius``, at any angle.
+
+    The rectangle along the segment, ``radius`` either side, with flush ends
+    like :func:`polyline.segment_box`: the ends of a trace leg sit on a pad or
+    on the square corner tile of the next leg, which cover them. Corners are
+    rounded away from the middle and the radius gets one unit more, so the
+    side bounds never under-report, and it stays tight for a slanted segment
+    off the 45-degree lines (a pin leaving along its pad's axis on a part
+    turned 30 degrees).
+    """
+    dx, dy = b.x - a.x, b.y - a.y
+    length = math.hypot(dx, dy)
+    r = max(radius, 0) + 1
+    if length == 0:
+        return Simplex.from_corners([
+            IntPoint(a.x - r, a.y - r), IntPoint(a.x + r, a.y - r),
+            IntPoint(a.x + r, a.y + r), IntPoint(a.x - r, a.y + r),
+        ])
+    ux, uy = dx / length, dy / length
+    nx, ny = -uy, ux
+    mx, my = (a.x + b.x) / 2, (a.y + b.y) / 2
+
+    def out(x: float, y: float) -> IntPoint:
+        return IntPoint(math.ceil(x) if x >= mx else math.floor(x),
+                        math.ceil(y) if y >= my else math.floor(y))
+
+    corners = [
+        out(a.x + nx * r, a.y + ny * r),
+        out(b.x + nx * r, b.y + ny * r),
+        out(b.x - nx * r, b.y - ny * r),
+        out(a.x - nx * r, a.y - ny * r),
+    ]
+    for winding in (corners, corners[::-1]):
+        slab = Simplex.from_corners(winding)
+        if not slab.is_empty():
+            return slab
+    return Simplex(())
+
+
 def overlaps_2d(shape_a, shape_b) -> bool:
     """True if the two convex tiles share 2-D area (a real clearance overlap).
 

src/rpmroute/geometry/polygon.py

@@ -1,7 +1,7 @@
 """``Polygon`` — a normalized corner list (no duplicate or collinear corners).
 
 Ports ``geometry/planar/Polygon.java``. Used as the corner normalizer behind
-:class:`~freeroute.geometry.polygon_shape.PolygonShape`.
+:class:`~rpmroute.geometry.polygon_shape.PolygonShape`.
 
 **Arithmetic model:** corner de-duplication and collinearity removal are
 **exact** (exact ``Point.side_of``); the winding-number test is approximate

src/rpmroute/geometry/polygon_shape.py

@@ -2,7 +2,7 @@
 
 Ports ``geometry/planar/PolygonShape.java``, in particular the recursive
 ``split_to_convex`` that decomposes a simple polygon into convex
-:class:`~freeroute.geometry.simplex.Simplex` tiles — the decomposition the
+:class:`~rpmroute.geometry.simplex.Simplex` tiles — the decomposition the
 router's search tree relies on.
 
 **Arithmetic model:** corner orientation / convexity tests are **exact**

src/rpmroute/geometry/polyline.py

@@ -7,7 +7,7 @@ trace half-width — the copper region — as a set of exact convex tiles.
 
 **Arithmetic model: exact, integer.** The router that uses this routes
 *orthogonally* (axis-aligned segments), so each swept segment is an exact
-:class:`~freeroute.geometry.box.IntBox` (centreline offset by the half-width,
+:class:`~rpmroute.geometry.box.IntBox` (centreline offset by the half-width,
 squared at the ends). The 45-degree case (which needs ``IntOctagon`` caps to
 stay exact) is deferred; ``segment_box`` returns the axis-aligned bounding box
 for a diagonal segment, which is a *conservative* cover (it never under-reports

src/rpmroute/geometry/simplex.py

@@ -1,10 +1,10 @@
 """``Simplex`` — a convex region as the intersection of directed half-planes.
 
 Ports ``geometry/planar/Simplex.java``. A simplex is defined by an array of
-directed :class:`~freeroute.geometry.line.Line`s sorted by direction angle; the
+directed :class:`~rpmroute.geometry.line.Line`s sorted by direction angle; the
 region is the intersection of the *right* half-plane of each line. Corners are
 the exact intersections of consecutive border lines
-(:meth:`~freeroute.geometry.line.Line.intersection`).
+(:meth:`~rpmroute.geometry.line.Line.intersection`).
 
 **Arithmetic model: exact where it matters.** Corners and all point-containment
 tests are exact (exact line intersection + exact ``side_of``). ``offset`` is

src/rpmroute/geometry/tile.py

@@ -3,11 +3,11 @@
 Ports the concrete (non-abstract) behaviour of ``geometry/planar/TileShape.java``
 that is defined purely in terms of the border lines and corners: point
 containment, area, centre of gravity, and border tests. Concrete subclasses
-(:class:`~freeroute.geometry.simplex.Simplex`) supply ``border_line_count``,
+(:class:`~rpmroute.geometry.simplex.Simplex`) supply ``border_line_count``,
 ``border_line``, ``corner`` and ``corner_approx``.
 
 **Arithmetic model:** containment and ``contains_on_border`` are **exact**
-(they use the exact :meth:`~freeroute.geometry.line.Line.side_of`); ``area`` and
+(they use the exact :meth:`~rpmroute.geometry.line.Line.side_of`); ``area`` and
 ``centre_of_gravity`` are approximate (``float``), as upstream.
 
 A convex tile is the intersection of the right half-planes of its directed

src/rpmroute/geometry/vector.py

@@ -13,7 +13,7 @@ Ports ``geometry/planar/{Vector,IntVector,RationalVector}.java``.
   representing the affine vector ``(x/z, y/z)``; ``z`` is kept non-negative.
   Mirrors the upstream ``BigInteger`` triple. ``BigIntDirection`` is not needed
   because ``int`` is unbounded, so normalized directions are always
-  :class:`~freeroute.geometry.direction.IntDirection`.
+  :class:`~rpmroute.geometry.direction.IntDirection`.
 """
 
 from __future__ import annotations

src/rpmroute/route/__init__.py

@@ -1,9 +1,9 @@
-"""Autorouting for freeroute.
+"""Autorouting for rpmroute.
 
 An MVP grid-based maze router and the DSN-in / SES-out pipeline that makes
-freeroute a Java-free replacement for the ``freerouting.jar`` step::
+rpmroute a Java-free replacement for the ``freerouting.jar`` step::
 
-    from freeroute.route import route
+    from rpmroute.route import route
     ses_text = route(dsn_text)
 
 The router (:class:`GridRouter`) is intentionally simple — single-layer A* over

src/rpmroute/route/exact_router.py

@@ -1,18 +1,18 @@
 """Exact-geometry routing track (orthogonal), built on the search tree.
 
-The grid MVP (:mod:`freeroute.route.grid_router`) approximates clearance with
+The grid MVP (:mod:`rpmroute.route.grid_router`) approximates clearance with
 cell occupancy and emits centrelines with no width-aware DRC check. This track
 keeps the grid's rip-up/multi-layer/via *topology* search (in orthogonal mode,
 so segments are axis-aligned) but replaces the occupancy check with an **exact**
-one: every item's copper is an exact :class:`~freeroute.geometry.IntBox` tile
-indexed in a :class:`~freeroute.board.search_tree.ShapeSearchTree`, and the
+one: every item's copper is an exact :class:`~rpmroute.geometry.IntBox` tile
+indexed in a :class:`~rpmroute.board.search_tree.ShapeSearchTree`, and the
 routed board is verified to have **no clearance violation** by exact tile
 intersection. A net whose copper would violate is dropped, so the output is
 DRC-clean by construction.
 
 **Shove (opt-in, ``shove=True``).** Before a dropped net is abandoned, the
 router tries to make room by *moving an existing trace aside* geometrically
-(:func:`~freeroute.geometry.shove_segment`) rather than dropping the incoming
+(:func:`~rpmroute.geometry.shove_segment`) rather than dropping the incoming
 net. A shove is accepted only if the moved trace still connects its pads, clears
 every other item exactly (via the tree), and stays in the board outline — so
 cleanliness is preserved. Shoves are bounded (``max_shove_depth`` and a
@@ -30,18 +30,21 @@ from __future__ import annotations
 from dataclasses import dataclass, field
 import math
 
-from freeroute.board.board import BasicBoard
-from freeroute.board.items import Pin
-from freeroute.board.search_tree import ShapeSearchTree, TreeShape
-from freeroute.geometry import (
+from rpmroute.board.board import BasicBoard
+from rpmroute.board.items import Pin, Via
+from rpmroute.board.search_tree import ShapeSearchTree, TreeShape
+from rpmroute.geometry import (
     IntBox,
     IntPoint,
     Polyline,
     PolylineShape,
+    Simplex,
     segment_box,
     segment_octagon,
+    segment_slab,
     shove_segment,
 )
+from rpmroute.geometry.polyline import corner_box
 
 from .grid_router import RouteResult, route_board
 
@@ -95,6 +98,16 @@ def route_board_exact(
     resolution: int = 1,
     heuristic_weight: float = 1.0,
     seed: int | None = None,
+    route_first: frozenset | None = None,
+    access_cost: float = 0.0,
+    negotiate: int = 0,
+    rollback: bool = True,
+    tree_nets: bool = True,
+    net_widths: dict[int, int] | None = None,
+    via_drill: int | None = None,
+    hole_to_hole: int = 0,
+    only_nets: frozenset | None = None,
+    bounds: IntBox | None = None,
 ) -> ExactRouteResult:
     """Route ``board`` orthogonally and verify the result with exact geometry.
 
@@ -124,6 +137,16 @@ def route_board_exact(
         resolution=resolution,
         heuristic_weight=heuristic_weight,
         seed=seed,
+        route_first=route_first,
+        access_cost=access_cost,
+        negotiate=negotiate,
+        rollback=rollback,
+        tree_nets=tree_nets,
+        net_widths=net_widths,
+        via_drill=via_drill,
+        hole_to_hole=hole_to_hole,
+        only_nets=only_nets,
+        bounds=bounds,
     )
     edge = 0 if edge_clearance is None else edge_clearance
     outline = board.outline
@@ -132,66 +155,87 @@ def route_board_exact(
     owner = _counter()
 
     # static items: pad and keepout copper (routed=False)
-    for pin in board.get_pins():
-        if pin.shape is None:
-            continue
-        box = pin.shape.bounding_box()
-        if box.is_empty():
-            continue
-        net = pin.net_nos[0] if pin.net_nos else -1
-        pin_layers = frozenset(layer for layer in pin.layers if layer in signal_layers)
-        if pin_layers:
-            tree.insert(TreeShape(next(owner), net, pin_layers, box))
-    for obstacle in board.get_obstacle_areas():
-        if obstacle.layer not in signal_layers:
-            continue
-        blocks = (
-            "all" if obstacle.blocks_wires and obstacle.blocks_vias
-            else "wires" if obstacle.blocks_wires else "vias"
-        )
-        for tile in obstacle.tiles:
-            box = tile.bounding_box()
-            if not box.is_empty():
-                tree.insert(
-                    TreeShape(next(owner), -1, frozenset({obstacle.layer}), box, blocks=blocks)
-                )
+    insert_static_copper(tree, board, signal_layers, owner)
 
     via_layers = frozenset(signal_layers)
     accepted: dict[int, _Accepted] = {}
+    fixed_vias = {
+        (item.net_nos[0], item.location)
+        for item in board.get_items()
+        if isinstance(item, Via) and item.fixed and item.net_nos
+    }
 
     # Verify connection by connection, so one conflicting segment of a
     # 25-pin supply net costs that one connection, not the whole net.
     rejected: list[tuple[int, str, str]] = []
     ends_list = result.connection_ends or [("?", "?", "")] * len(result.connections)
-    for (net_no, wires, vias), ends in sorted(
-        zip(result.connections, ends_list, strict=False), key=lambda c: c[0][0]
+    anchors_list = getattr(result, "connection_anchors", None) or [()] * len(result.connections)
+    # each net is checked at the width it will be written at: its class's
+    # when all of its connections went in at that, else the default
+    net_half = dict(result.net_half)
+    # a connection that ended on another's copper (a T into its net's tree)
+    # dangles if that one is dropped, so it is dropped too; connections come
+    # in commit order, anchors first
+    dropped_at: set[int] = set()
+    for pos, ((net_no, wires, vias), ends, anchors) in sorted(
+        enumerate(zip(result.connections, ends_list, anchors_list, strict=False)),
+        key=lambda c: c[1][0][0],
     ):
-        boxes = _copper_boxes(wires, vias, half_width, via_layers, via_half)
-        wire_count = len(_copper_boxes(wires, [], half_width, via_layers, via_half))
-        if any(
-            tree.clearance_conflict(
-                box, net_no, layer, clearance, "wire" if i < wire_count else "via"
-            )
-            for i, (box, box_layers) in enumerate(boxes)
-            for layer in box_layers
-        ) or (outline is not None and not all(outline.box_clear(b, edge) for b, _ in boxes)):
+        if any(a in dropped_at for a in anchors):
+            dropped_at.add(pos)
             rejected.append((net_no, *ends))
+            continue
+        wire_half = net_half.get(net_no, half_width)
+        pieces = _copper_pieces(wires, vias, wire_half, via_layers, via_half)
+        boxes = [(box, box_layers) for box, box_layers, _ in pieces]
+        wire_count = len(_copper_pieces(wires, [], wire_half, via_layers, via_half))
+        if any(
+            (
+                tree.segment_conflict(*seg, wire_half, net_no, layer, clearance)
+                if seg is not None
+                else tree.clearance_conflict(
+                    box, net_no, layer, clearance, "wire" if i < wire_count else "via"
+                )
+            )
+            for i, (box, box_layers, seg) in enumerate(pieces)
+            for layer in box_layers
+        ) or _end_in_rule_area(tree, wires, wire_half) or (
+            outline is not None and not _inside_outline(
+                outline, boxes[:wire_count], vias, (via_half or wire_half) + edge, edge
+            )
+        ):
+            rejected.append((net_no, *ends))
+            dropped_at.add(pos)
             continue  # exact-clearance conflict -> drop (may be recovered by shove)
         acc = accepted.get(net_no)
         if acc is None:
             acc = accepted[net_no] = _Accepted(wires=[], vias=[])
         acc.wires.extend(wires)
-        acc.vias.extend(vias)
-        for box, box_layers in boxes:
+        # connections of one net that end on the same plane cell share its
+        # via: write it once, and never on top of a via already on the board
+        acc.vias.extend(
+            v for v in dict.fromkeys(vias)
+            if v not in acc.vias and not _on_fixed_via(net_no, v, fixed_vias, via_half)
+        )
+        for box, box_layers, seg in pieces:
             oid = next(owner)
-            tree.insert(TreeShape(oid, net_no, box_layers, box, routed=True))
+            if seg is None:
+                tree.insert(TreeShape(oid, net_no, box_layers, box, routed=True))
+            else:  # a slanted pin exit: its exact copper, rebuilt for the DRC check
+                tree.insert(TreeShape(
+                    oid, net_no, box_layers, box, routed=True,
+                    exact=segment_slab(*seg, wire_half), seg=("slab", *seg, wire_half),
+                ))
             acc.owners.append(oid)
 
     accepted_before_recovery = set(accepted)
     # a net is dropped if it has a real ratsnest (>= 2 pins on a signal layer)
     # but was not accepted — whether the grid failed to route it or its exact
     # copper conflicted.
-    dropped = sorted(_routable_nets(board, signal_layers) - set(accepted))
+    routable = _routable_nets(board, signal_layers)
+    if only_nets is not None:  # a window re-route: the other nets are not ours to route
+        routable &= set(only_nets)
+    dropped = sorted(routable - set(accepted))
 
     shoves = 0
     if shove and dropped:
@@ -216,7 +260,7 @@ def route_board_exact(
 
     if diagonal:
         outline = board.bounding_box
-        for net_no in sorted(_routable_nets(board, signal_layers)):
+        for net_no in sorted(routable):
             _diagonalize(
                 net_no, board, tree, accepted, owner, signal_layers, half_width, clearance, outline
             )
@@ -231,6 +275,17 @@ def route_board_exact(
     for net_no, acc in accepted.items():
         clean.wires[net_no] = acc.wires
         clean.vias[net_no] = acc.vias
+    # shove and the diagonal pass lay copper at the default width: nets they
+    # recovered, and nets whose traces shove pushed aside
+    reshaped = (set(accepted) - accepted_before_recovery) | {
+        net for net, acc in accepted.items() if acc.shove_count
+    }
+    if diagonal:
+        reshaped = set(accepted)
+    clean.net_half = {
+        net: half for net, half in net_half.items() if net in accepted and net not in reshaped
+    }
+    clean.narrowed = list(result.narrowed)
 
     drc_clean = tree.has_violation(clearance) is None
     return ExactRouteResult(result=clean, tree=tree, drc_clean=drc_clean, shoves=shoves)
@@ -239,6 +294,43 @@ def route_board_exact(
 # --- 45-degree (diagonal) recovery -------------------------------------------
 
 
+def insert_static_copper(tree: ShapeSearchTree, board: BasicBoard, signal_layers, owner) -> None:
+    """Index the board's pads, fixed copper and keepouts (``routed=False``) on
+    ``signal_layers``: what routed copper is checked against."""
+    for pin in board.get_pins():
+        if pin.shape is None:
+            continue
+        box = pin.shape.bounding_box()
+        if box.is_empty():
+            continue
+        net = pin.net_nos[0] if pin.net_nos else -1
+        pin_layers = frozenset(layer for layer in pin.layers if layer in signal_layers)
+        if pin_layers:
+            # a rotated pad is checked against its outline, not its box
+            exact = pin.shape if _is_rotated(pin.shape) else None
+            tree.insert(TreeShape(next(owner), net, pin_layers, box, exact=exact))
+    for net, copper_layers, box in board.get_fixed_copper():
+        on = frozenset(layer for layer in copper_layers if layer in signal_layers)
+        if on and not box.is_empty():
+            tree.insert(TreeShape(next(owner), net, on, box))
+    for obstacle in board.get_obstacle_areas():
+        if obstacle.layer not in signal_layers:
+            continue
+        blocks = (
+            "all" if obstacle.blocks_wires and obstacle.blocks_vias
+            else "wires" if obstacle.blocks_wires else "vias"
+        )
+        for tile in obstacle.tiles:
+            box = tile.bounding_box()
+            if not box.is_empty():
+                tree.insert(
+                    TreeShape(
+                        next(owner), -1, frozenset({obstacle.layer}), box,
+                        blocks=blocks, clearance=obstacle.clearance,
+                    )
+                )
+
+
 def _octilinear_candidates(a: IntPoint, b: IntPoint) -> list[list[IntPoint]]:
     """Octilinear (0/45/90/135-degree) polylines from ``a`` to ``b``.
 
@@ -547,7 +639,7 @@ def _conflicting_segment(corners, d_boxes, half_width, clearance):
         horizontal = a.y == b.y
         if not horizontal and a.x != b.x:
             continue  # skip diagonal grid stubs
-        from freeroute.geometry import segment_box
+        from rpmroute.geometry import segment_box
 
         seg = segment_box(a, b, half_width).offset(clearance)
         if any(seg.overlaps(box) for box in d_boxes):
@@ -588,6 +680,47 @@ def _net_boxes(result, net_no, half_width, via_layers, via_half=None):
     )
 
 
+def _end_in_rule_area(tree, wires, half_width) -> bool:
+    """A wire's tiles stop at its end points, but a track ends in a round cap
+    half its width beyond them. Against other copper the pad or via there
+    covers it; a rule area has no clearance to absorb it, so check it."""
+    for layer, points in wires:
+        for end in (points[0], points[-1]):
+            if tree.rule_area_overlap(corner_box(end, half_width), layer):
+                return True
+    return False
+
+
+def _on_fixed_via(net_no, point, fixed_vias, via_half) -> bool:
+    """A routed via that reuses a via already on the board: the grid put it
+    on the fixed via's cell, a little off its centre, and it is not written."""
+    return any(
+        net == net_no and abs(loc.x - point.x) <= via_half and abs(loc.y - point.y) <= via_half
+        for net, loc in fixed_vias
+    )
+
+
+def _copper_pieces(wires, vias, half_width, via_layers, via_half=None):
+    """Like :func:`_copper_boxes`, but a slanted wire segment (a pin leaving
+    along a turned pad's axis) comes with its end points, so it can be checked
+    on its exact copper: ``(box, layers, (a, b) or None)``."""
+    via_half = via_half or half_width
+    pieces: list[tuple[IntBox, frozenset[int], tuple | None]] = []
+    for layer, points in wires:
+        on = frozenset({layer})
+        for a, b in zip(points, points[1:], strict=False):
+            if a.x == b.x or a.y == b.y:
+                pieces.append((segment_box(a, b, half_width), on, None))
+            else:
+                pieces.append((segment_slab(a, b, half_width).bounding_box(), on, (a, b)))
+        for c in points[1:-1]:
+            pieces.append((corner_box(c, half_width), on, None))
+    for loc in vias:
+        vbox = IntBox(loc.x - via_half, loc.y - via_half, loc.x + via_half, loc.y + via_half)
+        pieces.append((vbox, via_layers, None))
+    return pieces
+
+
 def _copper_boxes(wires, vias, half_width, via_layers, via_half=None):
     via_half = via_half or half_width
     boxes: list[tuple[IntBox, frozenset[int]]] = []
@@ -600,6 +733,19 @@ def _copper_boxes(wires, vias, half_width, via_layers, via_half=None):
     return boxes
 
 
+def _inside_outline(outline, wire_boxes, vias, via_reach, edge) -> bool:
+    """Copper inside the board, ``edge`` from its outline. A via is round, as
+    the grid and KiCad take it: its square box would reach past a chamfered
+    corner where the via itself does not."""
+    return all(outline.box_clear(b, edge) for b, _ in wire_boxes) and all(
+        outline.point_clear(v, via_reach) for v in vias
+    )
+
+
+def _is_rotated(shape) -> bool:
+    return isinstance(shape, Simplex) and not shape.is_int_box()
+
+
 def _net_pins(board: BasicBoard, net_no: int, signal_layers) -> list[Pin]:
     return [
         pin

src/rpmroute/route/orders.py

@@ -15,8 +15,8 @@ from __future__ import annotations
 from concurrent.futures import ProcessPoolExecutor
 import os
 
-from freeroute.dsn import parse_dsn
-from freeroute.ses import RoutingResult
+from rpmroute.dsn import parse_dsn
+from rpmroute.ses import RoutingResult
 
 from .pipeline import build_exact_routing_result, build_routing_result
 
@@ -65,3 +65,34 @@ def best_of_orders(
     scores = [score(r) for r in results]
     best = min(range(len(seeds)), key=lambda i: (scores[i], i))
     return results[best], seeds[best], list(zip(seeds, scores, strict=True))
+
+
+def promote_failures(
+    dsn_text: str,
+    engine: str,
+    options: dict,
+    *,
+    rounds: int,
+    seed: int | None = None,
+) -> tuple[RoutingResult, list[tuple[int, int]]]:
+    """Route, then route again with every connection that has failed so far
+    moved to the front, keeping the rest in their order. Returns the best
+    round's result and every round's score.
+
+    The promoted set only grows, so a connection that failed once keeps its
+    early place and two groups cannot take turns failing. Stops early when a
+    round routes everything or fails nothing new."""
+    numbers = {n.name: i + 1 for i, n in enumerate(parse_dsn(dsn_text).nets)}
+    first: frozenset = frozenset()
+    best: RoutingResult | None = None
+    scores: list[tuple[int, int]] = []
+    for _ in range(max(int(rounds), 1)):
+        result = route_once(dsn_text, engine, {**options, "route_first": first}, seed)
+        scores.append(score(result))
+        if best is None or scores[-1] < score(best):
+            best = result
+        failed = {(numbers.get(name), a, b) for name, a, b, zone in result.unrouted if not zone}
+        if not failed or failed <= first:
+            break
+        first = first | failed
+    return best, scores

src/rpmroute/route/pipeline.py

@@ -12,13 +12,18 @@ to DSN units (dividing by the resolution) for the SES ``(wire (path ...))`` and
 
 from __future__ import annotations
 
-from freeroute.board import build_board
-from freeroute.dsn import DsnBoard, parse_dsn
-from freeroute.ses import RoutedVia, RoutedWire, RoutingResult, write_ses
+import re
+import time
+
+from rpmroute.board import build_board
+from rpmroute.dsn import DsnBoard, parse_dsn
+from rpmroute.ses import RoutedVia, RoutedWire, RoutingResult, write_ses
 
 from .exact_router import ExactRouteResult, route_board_exact
 from .grid_router import RouteResult, route_board
 from .room_router import route_board_rooms
+from .vias import reduce_vias as reduce_vias_stage
+from .window import window_reroute as window_reroute_stage
 
 __all__ = ["route", "route_dsn_board", "build_routing_result"]
 
@@ -34,6 +39,25 @@ def _rule_width_dsn(dsn: DsnBoard) -> float:
     return rules[0].value if rules else _DEFAULT_WIDTH_DSN
 
 
+def _net_widths_board(dsn: DsnBoard, scale: int) -> dict[int, int]:
+    """Track width of every net whose class asks for more than the default,
+    in board units, by net number (build_board numbers nets in DSN order)."""
+    default = _rule_width_dsn(dsn)
+    by_name: dict[str, float] = {}
+    for net_class in dsn.net_classes:
+        if not net_class.width_rules:
+            continue
+        width = net_class.width_rules[0].value
+        if width > default:
+            for name in net_class.net_names:
+                by_name[name] = max(by_name.get(name, 0.0), width)
+    return {
+        i + 1: round(by_name[net.name] * scale)
+        for i, net in enumerate(dsn.nets)
+        if net.name in by_name
+    }
+
+
 def _rule_clearance_dsn(dsn: DsnBoard) -> float:
     for rule in dsn.structure_rules.clearance_rules:
         if not rule.class_pairs:  # the layer-wide default clearance
@@ -53,6 +77,20 @@ def _mm_to_board(dsn: DsnBoard, scale: int, value_mm: float | None) -> int | Non
     return round(value_mm / unit_mm * scale)
 
 
+def _via_drill_board(dsn: DsnBoard, scale: int) -> int | None:
+    """The via's drill in board units, from KiCad's padstack name
+    (``Via[0-1]_600:300_um`` is a 600 um pad with a 300 um drill); None when
+    the name does not say, and the pad size stands in for it."""
+    match = re.search(r"_([\d.]+):([\d.]+)_um", _via_padstack(dsn))
+    if not match:
+        return None
+    return round(float(match.group(2)) * _dsn_units_per_um(dsn) * scale)
+
+
+def _dsn_units_per_um(dsn: DsnBoard) -> float:
+    return {"um": 1.0, "mm": 0.001, "mil": 1 / 25.4, "inch": 1 / 25400}.get(dsn.unit, 1.0)
+
+
 def _via_half_board(dsn: DsnBoard, scale: int) -> int | None:
     """Half the via pad's size in board units, from the DSN's via padstack.
 
@@ -81,6 +119,13 @@ def route_dsn_board(
     rip_up: bool = True,
     max_passes: int = 10,
     seed: int | None = None,
+    route_first: frozenset | None = None,
+    access_cost: float = 0.0,
+    negotiate: int = 0,
+    hole_to_hole_mm: float = 0.25,
+    rollback: bool = True,
+    tree_nets: bool = True,
+    via_cost: float = 10.0,
 ) -> tuple[RouteResult, int, list[str]]:
     """Route a parsed :class:`DsnBoard`; return the board-unit result, the scale,
     and the layer names. ``layers`` restricts routing to those signal-layer
@@ -102,6 +147,15 @@ def route_dsn_board(
         rip_up=rip_up,
         max_passes=max_passes,
         seed=seed,
+        route_first=route_first,
+        access_cost=access_cost,
+        negotiate=negotiate,
+        rollback=rollback,
+        tree_nets=tree_nets,
+        net_widths=_net_widths_board(dsn, scale),
+        via_drill=_via_drill_board(dsn, scale),
+        hole_to_hole=_mm_to_board(dsn, scale, hole_to_hole_mm) or 0,
+        via_cost=via_cost,
     )
     return result, scale, [layer.name for layer in dsn.layers]
 
@@ -116,6 +170,9 @@ def _to_routing_result(route, dsn: DsnBoard, scale: int, layer_names: list[str])
     result = RoutingResult()
     for net_no, segments in route.wires.items():
         name = numbers_to_names.get(net_no, str(net_no))
+        # its class's width when every connection of the net went in at it
+        half = getattr(route, "net_half", {}).get(net_no)
+        net_width = 2 * half / scale if half else width_dsn
         for layer_index, path in segments:
             layer_name = layer_names[layer_index] if layer_index < len(layer_names) else "F.Cu"
             coords: list[float] = []
@@ -123,7 +180,7 @@ def _to_routing_result(route, dsn: DsnBoard, scale: int, layer_names: list[str])
                 coords.append(point.x / scale)
                 coords.append(point.y / scale)
             if len(coords) >= 4:
-                result.add_wire(name, RoutedWire(layer=layer_name, width=width_dsn, coords=coords))
+                result.add_wire(name, RoutedWire(layer=layer_name, width=net_width, coords=coords))
     for net_no, locations in route.vias.items():
         name = numbers_to_names.get(net_no, str(net_no))
         for loc in locations:
@@ -131,6 +188,9 @@ def _to_routing_result(route, dsn: DsnBoard, scale: int, layer_names: list[str])
     result.unrouted = [
         (numbers_to_names.get(n, str(n)), a, b, zone) for n, a, b, zone in getattr(route, "failed", [])
     ]
+    result.narrowed = [
+        (numbers_to_names.get(n, str(n)), a, b) for n, a, b in getattr(route, "narrowed", [])
+    ]
     return result
 
 
@@ -143,11 +203,25 @@ def build_routing_result(
     max_passes: int = 10,
     edge_clearance_mm: float | None = None,
     seed: int | None = None,
+    route_first: frozenset | None = None,
+    access_cost: float = 0.0,
+    negotiate: int = 0,
+    hole_to_hole_mm: float = 0.25,
+    rollback: bool = True,
+    tree_nets: bool = True,
+    via_cost: float = 10.0,
 ) -> RoutingResult:
     """Route ``dsn`` (grid track) and convert to a DSN-unit RoutingResult."""
     route, scale, layer_names = route_dsn_board(
         dsn, layers=layers, rip_up=rip_up, max_passes=max_passes,
         edge_clearance_mm=edge_clearance_mm, resolution=resolution, seed=seed,
+        route_first=route_first,
+        access_cost=access_cost,
+        negotiate=negotiate,
+        hole_to_hole_mm=hole_to_hole_mm,
+        rollback=rollback,
+        tree_nets=tree_nets,
+        via_cost=via_cost,
     )
     return _to_routing_result(route, dsn, scale, layer_names)
 
@@ -164,6 +238,21 @@ def route_dsn_board_exact(
     shove: bool = False,
     diagonal: bool = False,
     seed: int | None = None,
+    route_first: frozenset | None = None,
+    access_cost: float = 0.0,
+    negotiate: int = 0,
+    hole_to_hole_mm: float = 0.25,
+    rollback: bool = True,
+    tree_nets: bool = True,
+    window_reroute: int = 0,
+    window_resolution: int = 4,
+    window_margin_mm: float = 1.5,
+    window_budget: float = 0.25,
+    window_cap: int = 40,
+    reduce_vias: bool = False,
+    reduce_vias_budget: float = 0.5,
+    reduce_vias_margin_mm: float = 2.0,
+    via_cost: float = 10.0,
 ) -> tuple[ExactRouteResult, int, list[str]]:
     """Route a parsed :class:`DsnBoard` with the exact-geometry (orthogonal,
     DRC-verified) track; return the exact result, the scale, and layer names.
@@ -175,21 +264,61 @@ def route_dsn_board_exact(
     edge_clearance_board = _mm_to_board(dsn, scale, edge_clearance_mm)
     width_board = round(_rule_width_dsn(dsn) * scale)
     clearance_board = round(_rule_clearance_dsn(dsn) * scale)
+    # the settings a window re-route repeats, at its own resolution
+    common = {
+        "heuristic_weight": heuristic_weight,
+        "via_half": _via_half_board(dsn, scale),
+        "edge_clearance": edge_clearance_board,
+        "trace_width": width_board,
+        "clearance": clearance_board,
+        "layers": layers,
+        "max_passes": max_passes,
+        "rip_up": rip_up,
+        "shove": shove,
+        "diagonal": diagonal,
+        "rollback": rollback,
+        "tree_nets": tree_nets,
+        "net_widths": _net_widths_board(dsn, scale),
+        "via_drill": _via_drill_board(dsn, scale),
+        "hole_to_hole": _mm_to_board(dsn, scale, hole_to_hole_mm) or 0,
+        "via_cost": via_cost,
+    }
+    started = time.monotonic()
     exact = route_board_exact(
         board,
         resolution=resolution,
-        heuristic_weight=heuristic_weight,
-        via_half=_via_half_board(dsn, scale),
-        edge_clearance=edge_clearance_board,
-        trace_width=width_board,
-        clearance=clearance_board,
-        layers=layers,
-        max_passes=max_passes,
-        rip_up=rip_up,
-        shove=shove,
-        diagonal=diagonal,
         seed=seed,
+        route_first=route_first,
+        access_cost=access_cost,
+        negotiate=negotiate,
+        **common,
     )
+    if window_reroute > 0:
+        via_half = common["via_half"] or max(width_board // 2, 1)
+        exact.result = window_reroute_stage(
+            dsn, exact.result, common,
+            rounds=window_reroute,
+            resolution=max(int(window_resolution), resolution),
+            margin=_mm_to_board(dsn, scale, window_margin_mm) or 0,
+            via_half=via_half,
+            via_drill=common["via_drill"] or 2 * via_half,
+            via_name=_via_padstack(dsn),
+            # a share of what the routing itself took
+            budget_s=max(float(window_budget), 0.0) * (time.monotonic() - started),
+            max_windows=window_cap,
+        )
+    if reduce_vias:
+        via_half = common["via_half"] or max(width_board // 2, 1)
+        exact.result = reduce_vias_stage(
+            dsn, exact.result, common,
+            resolution=resolution,
+            margin=_mm_to_board(dsn, scale, reduce_vias_margin_mm) or 0,
+            via_half=via_half,
+            via_drill=common["via_drill"] or 2 * via_half,
+            via_name=_via_padstack(dsn),
+            # a share of what the routing itself took
+            budget_s=max(float(reduce_vias_budget), 0.0) * (time.monotonic() - started),
+        )
     return exact, scale, [layer.name for layer in dsn.layers]
 
 
@@ -205,6 +334,21 @@ def build_exact_routing_result(
     max_passes: int = 10,
     edge_clearance_mm: float | None = None,
     seed: int | None = None,
+    route_first: frozenset | None = None,
+    access_cost: float = 0.0,
+    negotiate: int = 0,
+    hole_to_hole_mm: float = 0.25,
+    rollback: bool = True,
+    tree_nets: bool = True,
+    window_reroute: int = 0,
+    window_resolution: int = 4,
+    window_margin_mm: float = 1.5,
+    window_budget: float = 0.25,
+    window_cap: int = 40,
+    reduce_vias: bool = False,
+    reduce_vias_budget: float = 0.5,
+    reduce_vias_margin_mm: float = 2.0,
+    via_cost: float = 10.0,
 ) -> RoutingResult:
     """Route ``dsn`` (exact track) and convert to a DSN-unit RoutingResult."""
     exact, scale, layer_names = route_dsn_board_exact(
@@ -218,6 +362,21 @@ def build_exact_routing_result(
         resolution=resolution,
         heuristic_weight=heuristic_weight,
         seed=seed,
+        route_first=route_first,
+        access_cost=access_cost,
+        negotiate=negotiate,
+        hole_to_hole_mm=hole_to_hole_mm,
+        rollback=rollback,
+        tree_nets=tree_nets,
+        window_reroute=window_reroute,
+        window_resolution=window_resolution,
+        window_margin_mm=window_margin_mm,
+        window_budget=window_budget,
+        window_cap=window_cap,
+        reduce_vias=reduce_vias,
+        reduce_vias_budget=reduce_vias_budget,
+        reduce_vias_margin_mm=reduce_vias_margin_mm,
+        via_cost=via_cost,
     )
     return _to_routing_result(exact.result, dsn, scale, layer_names)
 

src/rpmroute/route/room_router.py

@@ -30,10 +30,10 @@ from __future__ import annotations
 from dataclasses import dataclass, field
 import heapq
 
-from freeroute.board.board import BasicBoard
-from freeroute.board.items import Pin
-from freeroute.board.search_tree import ShapeSearchTree, TreeShape
-from freeroute.geometry import IntBox, IntPoint, Polyline, PolylineShape, shove_segment
+from rpmroute.board.board import BasicBoard
+from rpmroute.board.items import Pin
+from rpmroute.board.search_tree import ShapeSearchTree, TreeShape
+from rpmroute.geometry import IntBox, IntPoint, Polyline, PolylineShape, shove_segment
 
 from .exact_router import ExactRouteResult, _routable_nets
 from .grid_router import RouteResult
@@ -56,7 +56,7 @@ class _Accepted:
     ``wires`` / ``vias`` are the *same* list objects as ``RouteResult.wires`` /
     ``.vias`` for this net, so rewriting a shoved wire in place also updates the
     routed output. ``wire_owners`` is parallel to ``wires``: each entry is the
-    list of :class:`~freeroute.board.search_tree.TreeShape` owner ids for that
+    list of :class:`~rpmroute.board.search_tree.TreeShape` owner ids for that
     wire's copper tiles, so a later shove can locate, remove, and roll back a
     specific wire without disturbing a multi-wire net's other connections.
     """
@@ -515,6 +515,10 @@ def route_board_rooms(
         pin_layers = frozenset(layer for layer in pin.layers if layer in signal_layers)
         if pin_layers:
             tree.insert(TreeShape(next(owner), net, pin_layers, box))
+    for net, copper_layers, box in board.get_fixed_copper():
+        on = frozenset(layer for layer in copper_layers if layer in signal_layers)
+        if on and not box.is_empty():
+            tree.insert(TreeShape(next(owner), net, on, box))
     for obstacle in board.get_obstacle_areas():
         if obstacle.layer not in signal_layers:
             continue

src/rpmroute/route/shove.py

@@ -1,6 +1,6 @@
 """Shared orthogonal shove primitives for the exact and room routers.
 
-The exact-geometry router (:mod:`freeroute.route.exact_router`) grew the first
+The exact-geometry router (:mod:`rpmroute.route.exact_router`) grew the first
 shove implementation; the continuous room router reuses its geometry so both
 tracks agree on how a blocking trace's conflicting segment is found, how the
 perpendicular displacement ladder is generated, and how a reshaped trace is
@@ -19,8 +19,8 @@ from __future__ import annotations
 
 from collections.abc import Iterator
 
-from freeroute.board.search_tree import ShapeSearchTree, TreeShape
-from freeroute.geometry import IntBox, IntPoint, Polyline, PolylineShape
+from rpmroute.board.search_tree import ShapeSearchTree, TreeShape
+from rpmroute.geometry import IntBox, IntPoint, Polyline, PolylineShape
 
 from .exact_router import _conflicting_segment as conflicting_segment
 

src/rpmroute/route/smooth.py

@@ -0,0 +1,542 @@
+"""Smoothing: a last stage that turns grid staircases into octilinear runs.
+
+The grid search moves one cell at a time along the axes, so a route that
+heads off at an angle comes out as a staircase of short legs. Nothing goes
+back over a path once it connects. This stage does, wire by wire, on the
+finished result:
+
+1. a run of legs between two of its points is replaced by the octilinear
+   shape joining them (one straight leg, or a straight leg and a 45-degree
+   one), the furthest such point first;
+2. the right-angle corners left are cut to 45-degree chamfers;
+3. legs running on in the same direction are merged.
+
+Same nets, same layers, same vias. A wire keeps its ends, every via of its
+net, every point where another wire of its net ends on it, and any leg
+across a pad of its own net that it does not end on; only what lies between
+those moves. Every new leg and corner is checked against the other nets'
+copper, pads and keepouts on the exact shapes the exact engine uses, and
+against the board edge; a wire is changed only when all of its new copper
+is clear. Fixed wiring from the DSN is not part of the result and is never
+touched; it is checked against like any other copper.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass, field
+import itertools
+import math
+
+from rpmroute.board import build_board
+from rpmroute.board.search_tree import ShapeSearchTree, TreeShape
+from rpmroute.dsn.model import DsnBoard
+from rpmroute.geometry import IntBox, IntPoint, overlaps_2d, segment_box, segment_slab
+from rpmroute.geometry.polyline import corner_box
+from rpmroute.ses.model import RoutingResult
+
+from .exact_router import insert_static_copper
+from .pipeline import _dsn_units_per_um, _mm_to_board, _rule_clearance_dsn, _via_half_board
+
+#: how many points ahead a staircase collapse looks from each point
+LOOKAHEAD = 64
+#: a 45-degree leg at least this many track widths long: a shorter one is a
+#: kink beside its end's pad, where a refilled pour leaves a copper sliver
+MIN_DIAGONAL_WIDTHS = 2
+
+
+@dataclass
+class Shape:
+    """What a set of wires looks like: legs, right-angle corners, length."""
+
+    segments: int = 0
+    right_angles: int = 0
+    length_mm: dict[str, float] = field(default_factory=dict)
+
+    @property
+    def total_mm(self) -> float:
+        return sum(self.length_mm.values())
+
+
+@dataclass
+class SmoothReport:
+    before: Shape
+    after: Shape
+    wires_changed: int = 0
+    wires: int = 0
+    #: True when the finished check found more violations than before and
+    #: the smoothing was thrown away (never expected; a guard)
+    reverted: bool = False
+
+    def line(self) -> str:
+        b, a = self.before, self.after
+        if self.reverted:
+            return "smoothing reverted: it would have added a clearance violation"
+        return (
+            f"smoothed {self.wires_changed} of {self.wires} wires: segments {b.segments} -> "
+            f"{a.segments}, right-angle corners {b.right_angles} -> {a.right_angles}, "
+            f"length {b.total_mm:.1f} -> {a.total_mm:.1f} mm"
+        )
+
+    def table(self) -> list[str]:
+        rows = [f"  {'layer':10} {'before mm':>10} {'after mm':>10}"]
+        for layer in sorted(set(self.before.length_mm) | set(self.after.length_mm)):
+            rows.append(
+                f"  {layer:10} {self.before.length_mm.get(layer, 0.0):>10.1f} "
+                f"{self.after.length_mm.get(layer, 0.0):>10.1f}"
+            )
+        return rows
+
+
+def _shape_of(wires, mm_per_unit: float) -> Shape:
+    """``wires``: (layer name, points) pairs in board units."""
+    out = Shape()
+    for layer, pts in wires:
+        out.segments += max(len(pts) - 1, 0)
+        out.length_mm[layer] = out.length_mm.get(layer, 0.0) + mm_per_unit * sum(
+            math.hypot(q.x - p.x, q.y - p.y) for p, q in zip(pts, pts[1:], strict=False)
+        )
+        for a, b, c in zip(pts, pts[1:], pts[2:], strict=False):
+            if (b.x - a.x) * (c.x - b.x) + (b.y - a.y) * (c.y - b.y) == 0:
+                out.right_angles += 1
+    return out
+
+
+def _sign(v: int) -> int:
+    return (v > 0) - (v < 0)
+
+
+def _octilinear(a: IntPoint, b: IntPoint) -> bool:
+    dx, dy = b.x - a.x, b.y - a.y
+    return dx == 0 or dy == 0 or abs(dx) == abs(dy)
+
+
+def _candidates(a: IntPoint, b: IntPoint) -> list[list[IntPoint]]:
+    """The octilinear ways from ``a`` to ``b``: straight when the two lie on
+    an axis or a diagonal, else the 45-degree leg first or last."""
+    if _octilinear(a, b):
+        return [[a, b]]
+    dx, dy = b.x - a.x, b.y - a.y
+    m = min(abs(dx), abs(dy))
+    sx, sy = _sign(dx), _sign(dy)
+    return [
+        [a, IntPoint(a.x + sx * m, a.y + sy * m), b],
+        [a, IntPoint(b.x - sx * m, b.y - sy * m), b],
+    ]
+
+
+def _too_short(a: IntPoint, b: IntPoint, half: int) -> bool:
+    """A slanted leg shorter than MIN_DIAGONAL_WIDTHS track widths."""
+    if a.x == b.x or a.y == b.y:
+        return False
+    return (b.x - a.x) ** 2 + (b.y - a.y) ** 2 < (MIN_DIAGONAL_WIDTHS * 2 * half) ** 2
+
+
+def _dedupe(pts: list[IntPoint]) -> list[IntPoint]:
+    out: list[IntPoint] = []
+    for p in pts:
+        if not out or (out[-1].x, out[-1].y) != (p.x, p.y):
+            out.append(p)
+    return out
+
+
+def _merge_collinear(pts: list[IntPoint], keep: set[tuple[int, int]]) -> list[IntPoint]:
+    """Drop points where the wire runs straight on, except the ones in ``keep``."""
+    pts = _dedupe(pts)
+    out = pts[:1]
+    for i in range(1, len(pts) - 1):
+        a, b, c = out[-1], pts[i], pts[i + 1]
+        straight = (b.x - a.x) * (c.y - b.y) - (b.y - a.y) * (c.x - b.x) == 0 and (
+            (b.x - a.x) * (c.x - b.x) + (b.y - a.y) * (c.y - b.y) > 0
+        )
+        if straight and (b.x, b.y) not in keep:
+            continue
+        out.append(b)
+    if len(pts) > 1:
+        out.append(pts[-1])
+    return out
+
+
+def _on_segment(p: IntPoint, a: IntPoint, b: IntPoint, reach: int) -> IntPoint | None:
+    """The point of axis leg ``a``-``b`` within ``reach`` of ``p`` (across the
+    leg), or None. Slanted legs only count ``p`` that lies exactly on them."""
+    if a.x == b.x:
+        lo, hi = sorted((a.y, b.y))
+        if abs(p.x - a.x) <= reach and lo <= p.y <= hi:
+            return IntPoint(a.x, p.y)
+        return None
+    if a.y == b.y:
+        lo, hi = sorted((a.x, b.x))
+        if abs(p.y - a.y) <= reach and lo <= p.x <= hi:
+            return IntPoint(p.x, a.y)
+        return None
+    cross = (b.x - a.x) * (p.y - a.y) - (b.y - a.y) * (p.x - a.x)
+    within = min(a.x, b.x) <= p.x <= max(a.x, b.x) and min(a.y, b.y) <= p.y <= max(a.y, b.y)
+    return IntPoint(p.x, p.y) if cross == 0 and within else None
+
+
+class _Smoother:
+    def __init__(self, tree, outline, edge: int, clearance: int) -> None:
+        self.tree = tree
+        self.outline = outline
+        self.edge = edge
+        self.clearance = clearance
+
+    def _inside(self, box: IntBox) -> bool:
+        return self.outline is None or self.outline.box_clear(box, self.edge)
+
+    def leg_clear(self, a: IntPoint, b: IntPoint, half: int, net: int, layer: int) -> bool:
+        if a.x == b.x or a.y == b.y:
+            box = segment_box(a, b, half)
+            return self._inside(box) and not self.tree.clearance_conflict(
+                box, net, layer, self.clearance
+            )
+        copper = segment_slab(a, b, half)
+        if not self._inside(copper.bounding_box()):
+            return False
+        # Both ways round, as the finished check counts a pair: this leg's
+        # copper grown by the clearance against the other's copper, and the
+        # other's clearance region (a box grown square, so wider at its
+        # corners) against this leg's copper.
+        grown = segment_slab(a, b, half + self.clearance)
+        for shape in self.tree.overlapping(copper.bounding_box().offset(self.clearance)):
+            if shape.net_no == net or not shape.on_layer(layer):
+                continue
+            if shape.blocks not in ("all", "wires"):
+                continue
+            theirs = shape.exact if shape.exact is not None else shape.tile
+            if not shape.clearance:
+                if overlaps_2d(copper, theirs):
+                    return False
+            elif overlaps_2d(grown, theirs) or overlaps_2d(
+                shape.clearance_region(self.clearance), copper
+            ):
+                return False
+        return True
+
+    def corner_clear(self, c: IntPoint, half: int, net: int, layer: int) -> bool:
+        box = corner_box(c, half)
+        return self._inside(box) and not self.tree.clearance_conflict(
+            box, net, layer, self.clearance
+        )
+
+    def path_clear(self, path: list[IntPoint], half: int, net: int, layer: int) -> bool:
+        """New legs and new corners of ``path`` (its ends are kept points)."""
+        if any(_too_short(p, q, half) for p, q in zip(path, path[1:], strict=False)):
+            return False
+        return all(
+            self.leg_clear(p, q, half, net, layer) for p, q in zip(path, path[1:], strict=False)
+        ) and all(self.corner_clear(c, half, net, layer) for c in path[1:-1])
+
+    def collapse(self, pts: list[IntPoint], half: int, net: int, layer: int) -> list[IntPoint]:
+        """Step 1 on one section (both ends kept): from each point, jump to
+        the furthest later point an octilinear path reaches cleanly."""
+        out = [pts[0]]
+        i, n = 0, len(pts)
+        while i < n - 1:
+            jumped = False
+            for j in range(min(n - 1, i + LOOKAHEAD), i + 1, -1):
+                for path in _candidates(pts[i], pts[j]):
+                    if self.path_clear(path, half, net, layer):
+                        out.extend(path[1:])
+                        i, jumped = j, True
+                        break
+                if jumped:
+                    break
+            if not jumped:
+                out.append(pts[i + 1])
+                i += 1
+        return out
+
+    def miter(
+        self, pts: list[IntPoint], half: int, net: int, layer: int, keep: set[tuple[int, int]]
+    ) -> list[IntPoint]:
+        """Step 2: cut each right-angle corner between two axis legs to a
+        45-degree chamfer, as long a one as fits, at least a track width."""
+        pts = list(pts)
+        i = 1
+        while i < len(pts) - 1:
+            a, c, b = pts[i - 1], pts[i], pts[i + 1]
+            if (c.x, c.y) in keep or not (
+                (a.x == c.x or a.y == c.y) and (c.x == b.x or c.y == b.y)
+            ):
+                i += 1
+                continue
+            ux, uy = _sign(c.x - a.x), _sign(c.y - a.y)
+            vx, vy = _sign(b.x - c.x), _sign(b.y - c.y)
+            if ux * vx + uy * vy != 0:
+                i += 1
+                continue
+            len_in = abs(c.x - a.x) + abs(c.y - a.y)
+            len_out = abs(b.x - c.x) + abs(b.y - c.y)
+            # leave half of a leg for the corner at its other end, unless that
+            # end stays where it is anyway
+            cap_in = len_in if (a.x, a.y) in keep or i == 1 else len_in // 2
+            cap_out = len_out if (b.x, b.y) in keep or i == len(pts) - 2 else len_out // 2
+            d = min(cap_in, cap_out)
+            done = False
+            # the chamfer's leg is d * sqrt(2) long
+            while d * d * 2 >= (MIN_DIAGONAL_WIDTHS * 2 * half) ** 2:
+                p = IntPoint(c.x - ux * d, c.y - uy * d)
+                q = IntPoint(c.x + vx * d, c.y + vy * d)
+                corners = [x for x in (p, q) if (x.x, x.y) not in ((a.x, a.y), (b.x, b.y))]
+                if self.leg_clear(p, q, half, net, layer) and all(
+                    self.corner_clear(x, half, net, layer) for x in corners
+                ):
+                    pts[i : i + 1] = [p, q]
+                    pts = _dedupe(pts)
+                    done = True
+                    break
+                d = d * 3 // 4 if d * 3 // 4 < d else d - 1
+            i += 2 if done else 1
+        return pts
+
+
+def smooth(
+    dsn: DsnBoard, result: RoutingResult, *, edge_clearance_mm: float | None = None
+) -> SmoothReport:
+    """Smooth ``result``'s wires in place; return what changed."""
+    board = build_board(dsn)
+    scale = max(dsn.resolution.value, 1)
+    clearance = round(_rule_clearance_dsn(dsn) * scale)
+    edge = _mm_to_board(dsn, scale, edge_clearance_mm) or 0
+    mm_per_unit = 1 / (_dsn_units_per_um(dsn) * 1000 * scale)
+    signal_layers = [i for i, layer in enumerate(dsn.layers) if layer.is_signal]
+    layer_index = {layer.name: i for i, layer in enumerate(dsn.layers)}
+    via_layers = frozenset(signal_layers)
+    net_numbers = {n.name: i + 1 for i, n in enumerate(dsn.nets)}
+    via_half = _via_half_board(dsn, scale)
+
+    tree = ShapeSearchTree()
+    owner = itertools.count(1)
+    insert_static_copper(tree, board, signal_layers, owner)
+
+    def to_points(wire) -> list[IntPoint]:
+        c = wire.coords
+        return [IntPoint(round(c[i] * scale), round(c[i + 1] * scale)) for i in range(0, len(c) - 1, 2)]
+
+    # own-net pads per (net, layer): legs across one the wire does not end on stay
+    pads: dict[tuple[int, int], list[IntBox]] = {}
+    for pin in board.get_pins():
+        if pin.shape is None or not pin.net_nos:
+            continue
+        box = pin.shape.bounding_box()
+        for layer in pin.layers:
+            pads.setdefault((pin.net_nos[0], layer), []).append(box)
+
+    # every routed wire and via into the tree, each wire under owners of its own
+    wires: list[tuple[int, object, int, int, list[IntPoint], list[int]]] = []
+    for net in result.nets:
+        net_no = net_numbers.get(net.name)
+        if net_no is None:
+            continue
+        for wire in net.wires:
+            layer = layer_index.get(wire.layer)
+            if layer is None or layer not in signal_layers or wire.fixed:
+                continue
+            half = max(round(wire.width * scale / 2), 1)
+            pts = to_points(wire)
+            wires.append((net_no, wire, layer, half, pts, _insert(tree, owner, pts, half, net_no, layer)))
+        for via in net.vias:
+            vh = via_half or max(round(max((w.width for w in net.wires), default=0) * scale / 2), 1)
+            x, y = round(via.x * scale), round(via.y * scale)
+            tree.insert(TreeShape(
+                next(owner), net_no, via_layers, IntBox(x - vh, y - vh, x + vh, y + vh), routed=True,
+            ))
+
+    before_pairs = len(tree.violation_pairs(clearance))
+    before = _shape_of(
+        [(dsn.layers[w[2]].name, w[4]) for w in wires], mm_per_unit
+    )
+
+    # the points of each net another of its wires or a via meets
+    joints: dict[int, list[IntPoint]] = {}
+    for net in result.nets:
+        net_no = net_numbers.get(net.name)
+        if net_no is None:
+            continue
+        for via in net.vias:
+            joints.setdefault(net_no, []).append(IntPoint(round(via.x * scale), round(via.y * scale)))
+    for net_no, _wire, _layer, _half, pts, _owners in wires:
+        joints.setdefault(net_no, []).extend((pts[0], pts[-1]))
+
+    pins_of: dict[int, list] = {}
+    for pin in board.get_pins():
+        if pin.shape is not None and pin.net_nos:
+            pins_of.setdefault(pin.net_nos[0], []).append(pin)
+    vias_of = {
+        net_numbers[net.name]: [IntPoint(round(v.x * scale), round(v.y * scale)) for v in net.vias]
+        for net in result.nets
+        if net.name in net_numbers
+    }
+    by_net: dict[int, list[int]] = {}
+    for k, w in enumerate(wires):
+        by_net.setdefault(w[0], []).append(k)
+
+    smoother = _Smoother(tree, board.outline, edge, clearance)
+    changed = 0
+    originals = []
+    for net_no, ks in by_net.items():
+        groups_before = _pad_groups(
+            [wires[k] for k in ks], pins_of.get(net_no, []), vias_of.get(net_no, [])
+        )
+        undo = []
+        for k in ks:
+            _, wire, layer, half, pts, owners = wires[k]
+            if len(pts) < 3:
+                continue
+            keep_pts, keep = _kept_points(
+                pts, joints.get(net_no, []), half, pads.get((net_no, layer), [])
+            )
+            new = _merge_collinear(keep_pts, keep)
+            out: list[IntPoint] = [new[0]]
+            start = 0
+            for i in range(1, len(new)):
+                if (new[i].x, new[i].y) in keep or i == len(new) - 1:
+                    section = smoother.collapse(new[start : i + 1], half, net_no, layer)
+                    out.extend(section[1:])
+                    start = i
+            out = smoother.miter(_merge_collinear(out, keep), half, net_no, layer, keep)
+            out = _merge_collinear(out, keep)
+            if [(p.x, p.y) for p in out] == [(p.x, p.y) for p in pts]:
+                continue
+            # the wire's own old copper is the same net and never in the way,
+            # so it can go once the new copper is in
+            for oid in owners:
+                tree.remove_owner(oid)
+            new_owners = _insert(tree, owner, out, half, net_no, layer)
+            undo.append((k, wires[k], list(wire.coords)))
+            wire.coords = [v / scale for p in out for v in (p.x, p.y)]
+            wires[k] = (net_no, wire, layer, half, out, new_owners)
+        if not undo:
+            continue
+        groups_after = _pad_groups(
+            [wires[k] for k in ks], pins_of.get(net_no, []), vias_of.get(net_no, [])
+        )
+        if groups_after != groups_before:
+            # a pad lost (or gained) its way to the rest of the net: keep the
+            # net as it was routed
+            for k, old, coords in reversed(undo):
+                for oid in wires[k][5]:
+                    tree.remove_owner(oid)
+                old[1].coords = coords
+                wires[k] = (*old[:5], _insert(tree, owner, old[4], old[3], net_no, old[2]))
+            continue
+        originals.extend((old[1], coords) for _k, old, coords in undo)
+        changed += len(undo)
+
+    report = SmoothReport(
+        before=before,
+        after=_shape_of([(dsn.layers[w[2]].name, w[4]) for w in wires], mm_per_unit),
+        wires_changed=changed,
+        wires=len(wires),
+    )
+    if changed and len(tree.violation_pairs(clearance)) > before_pairs:
+        for wire, coords in originals:
+            wire.coords = coords
+        report.after, report.wires_changed, report.reverted = before, 0, True
+    return report
+
+
+def _insert(tree, owner, pts, half, net_no, layer) -> list[int]:
+    """A wire's copper into ``tree`` as the exact engine models it: legs (on
+    their exact slab when slanted) and a square at each inner corner."""
+    on = frozenset({layer})
+    owners = []
+    for a, b in zip(pts, pts[1:], strict=False):
+        oid = next(owner)
+        if a.x == b.x or a.y == b.y:
+            tree.insert(TreeShape(oid, net_no, on, segment_box(a, b, half), routed=True))
+        else:
+            slab = segment_slab(a, b, half)
+            tree.insert(TreeShape(
+                oid, net_no, on, slab.bounding_box(), routed=True, exact=slab, seg=("slab", a, b, half),
+            ))
+        owners.append(oid)
+    for c in pts[1:-1]:
+        oid = next(owner)
+        tree.insert(TreeShape(oid, net_no, on, corner_box(c, half), routed=True))
+        owners.append(oid)
+    return owners
+
+
+def _kept_points(
+    pts: list[IntPoint], joints: list[IntPoint], half: int, own_pads: list[IntBox]
+) -> tuple[list[IntPoint], set[tuple[int, int]]]:
+    """The wire with a point added wherever another wire of its net or a via
+    meets it, and the set of points that must stay: those, its ends, and the
+    ends of any leg across an own-net pad it does not end on."""
+    keep = {(pts[0].x, pts[0].y), (pts[-1].x, pts[-1].y)}
+    out = [pts[0]]
+    for a, b in zip(pts, pts[1:], strict=False):
+        hits = []
+        for j in joints:
+            p = _on_segment(j, a, b, half)
+            if p is not None:
+                hits.append(p)
+                keep.add((p.x, p.y))
+        hits.sort(key=lambda p: abs(p.x - a.x) + abs(p.y - a.y))
+        out.extend(h for h in hits if (h.x, h.y) not in ((a.x, a.y), (b.x, b.y)))
+        out.append(b)
+    end_pads = [box for box in own_pads if _in(pts[0], box) or _in(pts[-1], box)]
+    for box in own_pads:
+        if any(box is e for e in end_pads):
+            continue
+        for a, b in zip(out, out[1:], strict=False):
+            if segment_box(a, b, 0).overlaps(box):
+                keep.add((a.x, a.y))
+                keep.add((b.x, b.y))
+    return _dedupe(out), keep
+
+
+def _near(p: IntPoint, pts: list[IntPoint], reach: int) -> bool:
+    """Whether ``p`` lies on the copper of the wire through ``pts`` (``reach``
+    its half width), squared at the corners as the copper is modelled."""
+    for a, b in zip(pts, pts[1:], strict=False):
+        dx, dy = b.x - a.x, b.y - a.y
+        n2 = dx * dx + dy * dy
+        t = 0.0 if n2 == 0 else max(0.0, min(1.0, ((p.x - a.x) * dx + (p.y - a.y) * dy) / n2))
+        cx, cy = a.x + t * dx, a.y + t * dy
+        if math.hypot(p.x - cx, p.y - cy) <= reach + 1:
+            return True
+    return False
+
+
+def _pad_groups(wires, pins, vias) -> set[frozenset[int]]:
+    """Which of a net's pads its copper joins, as groups of pad indices: a
+    wire's end on a pad, on another wire, or on a via; a via on a pad."""
+    parent = list(range(len(pins) + len(wires) + len(vias)))
+
+    def find(x: int) -> int:
+        while parent[x] != x:
+            parent[x] = parent[parent[x]]
+            x = parent[x]
+        return x
+
+    def join(x: int, y: int) -> None:
+        parent[find(x)] = find(y)
+
+    boxes = [p.shape.bounding_box() for p in pins]
+    w0, v0 = len(pins), len(pins) + len(wires)
+    for i, (_n, _w, layer, half, pts, _o) in enumerate(wires):
+        for end in (pts[0], pts[-1]):
+            for j, pin in enumerate(pins):
+                if layer in pin.layers and _in(end, boxes[j]):
+                    join(w0 + i, j)
+            for k, (_n2, _w2, layer2, half2, pts2, _o2) in enumerate(wires):
+                if k != i and layer2 == layer and _near(end, pts2, half2):
+                    join(w0 + i, w0 + k)
+            for v, loc in enumerate(vias):
+                if (end.x, end.y) == (loc.x, loc.y) or _near(loc, pts, half):
+                    join(w0 + i, v0 + v)
+    for v, loc in enumerate(vias):
+        for j in range(len(pins)):
+            if _in(loc, boxes[j]):
+                join(v0 + v, j)
+    groups: dict[int, set[int]] = {}
+    for j in range(len(pins)):
+        groups.setdefault(find(j), set()).add(j)
+    return {frozenset(g) for g in groups.values()}
+
+
+def _in(p: IntPoint, box: IntBox) -> bool:
+    return box.ll.x <= p.x <= box.ur.x and box.ll.y <= p.y <= box.ur.y

src/rpmroute/route/verify.py

@@ -0,0 +1,151 @@
+"""Check routed copper that no engine has checked.
+
+The exact engine verifies every connection against exact pad and copper
+shapes before it accepts it. The grid and room engines do not: they route on
+approximations, and their output can short or crowd another net with nothing
+in their report to say so. :func:`verify_result` puts a finished
+:class:`RoutingResult` through the same exact geometry the exact engine uses
+(its pads, fixed copper and keepouts, wires as boxes or slanted slabs, vias as
+their pads) and lists what it finds.
+
+A violation is a pair of different-net coppers on a shared layer, at least one
+of them routed, closer than the board's clearance rule. It is a short when the
+coppers themselves overlap (or routed copper sits inside a keepout), else a
+clearance violation. Pairs are counted per routed segment or via, as KiCad's
+DRC counts per item pair; pads already too close to each other in the design
+are not the router's and are not counted.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass, field
+import itertools
+
+from rpmroute.board import build_board
+from rpmroute.board.search_tree import ShapeSearchTree, TreeShape
+from rpmroute.dsn.model import DsnBoard
+from rpmroute.geometry import IntBox, IntPoint, segment_box, segment_slab
+from rpmroute.geometry.polyline import corner_box
+from rpmroute.ses.model import RoutingResult
+
+from .exact_router import insert_static_copper
+from .pipeline import _dsn_units_per_um, _rule_clearance_dsn, _via_half_board
+
+# examples kept per kind; the counts are always complete
+MAX_EXAMPLES = 5
+
+
+@dataclass
+class Violation:
+    """One offending pair: the routed copper's net, what it came too close
+    to, the layer, and roughly where (mm, DSN coordinates)."""
+
+    net: str
+    other: str
+    layer: str
+    x_mm: float
+    y_mm: float
+
+    def __str__(self) -> str:
+        return f"{self.net} x {self.other} on {self.layer} at ({self.x_mm:.2f}, {self.y_mm:.2f}) mm"
+
+
+@dataclass
+class VerifyReport:
+    shorts: int = 0
+    clearance: int = 0
+    short_examples: list[Violation] = field(default_factory=list)
+    clearance_examples: list[Violation] = field(default_factory=list)
+
+    @property
+    def clean(self) -> bool:
+        return not (self.shorts or self.clearance)
+
+
+def verify_result(dsn: DsnBoard, result: RoutingResult) -> VerifyReport:
+    """Check ``result``'s copper against ``dsn``'s pads, keepouts and each
+    other, with the board's clearance rule."""
+    board = build_board(dsn)
+    scale = max(dsn.resolution.value, 1)
+    clearance = round(_rule_clearance_dsn(dsn) * scale)
+    signal_layers = [i for i, layer in enumerate(dsn.layers) if layer.is_signal]
+    layer_index = {layer.name: i for i, layer in enumerate(dsn.layers)}
+    via_layers = frozenset(signal_layers)
+    net_numbers = {n.name: i + 1 for i, n in enumerate(dsn.nets)}
+    names = {number: name for name, number in net_numbers.items()}
+
+    tree = ShapeSearchTree()
+    owner = itertools.count(1)
+    insert_static_copper(tree, board, signal_layers, owner)
+    static_names: dict[int, str] = {}
+    for shape in tree.all_shapes():
+        static_names[shape.owner] = "keepout" if shape.net_no == -1 else f"pad of {names.get(shape.net_no, '?')}"
+
+    via_default = _via_half_board(dsn, scale)
+    for net in result.nets:
+        net_no = net_numbers.get(net.name)
+        if net_no is None:
+            continue
+        for wire in net.wires:
+            layer = layer_index.get(wire.layer)
+            if layer is None or layer not in signal_layers:
+                continue
+            half = max(round(wire.width * scale / 2), 1)
+            pts = [
+                IntPoint(round(wire.coords[i] * scale), round(wire.coords[i + 1] * scale))
+                for i in range(0, len(wire.coords) - 1, 2)
+            ]
+            on = frozenset({layer})
+            for a, b in zip(pts, pts[1:], strict=False):
+                oid = next(owner)
+                if a.x == b.x or a.y == b.y:
+                    tree.insert(TreeShape(oid, net_no, on, segment_box(a, b, half), routed=True))
+                else:  # a 45-degree or slanted segment, on its exact copper
+                    slab = segment_slab(a, b, half)
+                    tree.insert(TreeShape(
+                        oid, net_no, on, slab.bounding_box(), routed=True,
+                        exact=slab, seg=("slab", a, b, half),
+                    ))
+                # the round end where it meets the next segment, with this one
+                tree.insert(TreeShape(oid, net_no, on, corner_box(b, half), routed=True))
+        for via in net.vias:
+            half = via_default or max(round(_wire_width(net) * scale / 2), 1)
+            x, y = round(via.x * scale), round(via.y * scale)
+            tree.insert(TreeShape(
+                next(owner), net_no, via_layers, IntBox(x - half, y - half, x + half, y + half), routed=True,
+            ))
+
+    mm_per_unit = 1 / (_dsn_units_per_um(dsn) * 1000 * scale)
+    # one entry per pair of items, however many of their tiles meet; a short
+    # if any of them overlap
+    by_pair: dict[tuple[int, int], tuple[TreeShape, TreeShape, bool]] = {}
+    for shape, other, touching in tree.violation_pairs(clearance):
+        key = (min(shape.owner, other.owner), max(shape.owner, other.owner))
+        seen = by_pair.get(key)
+        if seen is None or (touching and not seen[2]):
+            by_pair[key] = (shape, other, touching)
+
+    report = VerifyReport()
+    for shape, other, touching in by_pair.values():
+        layer = min(shape.layers & other.layers)
+        box = shape.tile.intersection(other.tile.offset(clearance))
+        if box.is_empty():
+            box = shape.tile
+        what = names.get(other.net_no, "?") if other.routed else static_names.get(other.owner, "?")
+        found = Violation(
+            names.get(shape.net_no, "?"), what, dsn.layers[layer].name,
+            (box.ll.x + box.ur.x) / 2 * mm_per_unit, (box.ll.y + box.ur.y) / 2 * mm_per_unit,
+        )
+        if touching:
+            report.shorts += 1
+            if len(report.short_examples) < MAX_EXAMPLES:
+                report.short_examples.append(found)
+        else:
+            report.clearance += 1
+            if len(report.clearance_examples) < MAX_EXAMPLES:
+                report.clearance_examples.append(found)
+    return report
+
+
+def _wire_width(net) -> float:
+    return max((w.width for w in net.wires), default=0.0)

src/rpmroute/route/vias.py

@@ -0,0 +1,128 @@
+"""Via reduction: a last stage that routes each net again with vias made dear.
+
+The main search prices a layer change at a few millimetres of track, which
+is right while the board is crowded and wrong once it is routed: a net that
+hopped layers to slip past a route can often stay on one layer around it.
+So each net that has vias is ripped and routed again on its own, everything
+else held as fixed copper, with the via cost raised; the new copper is kept
+only if the net loses no connection and ends with fewer vias.
+
+It reuses the window stage's board: the net's own items and copper, and of
+everything else only what lies near the box the net is routed in. The nets
+with the most vias go first, and no new net starts once ``budget_s`` is
+spent.
+"""
+
+from __future__ import annotations
+
+import time
+from typing import Any
+
+from rpmroute.board import build_board
+from rpmroute.dsn import DsnBoard
+from rpmroute.geometry import IntBox
+
+from .exact_router import route_board_exact
+from .grid_router import RouteResult
+from .window import Copper, _inside, _item_box, _open, _window_board
+
+
+def _net_box(copper: Copper, pins: list, grow: int) -> IntBox | None:
+    wires, vias = copper
+    points = [p for _layer, path in wires for p in path] + list(vias) + pins
+    if not points:
+        return None
+    xs, ys = [p.x for p in points], [p.y for p in points]
+    return IntBox(min(xs) - grow, min(ys) - grow, max(xs) + grow, max(ys) + grow)
+
+
+def reduce_vias(
+    dsn: DsnBoard,
+    result: RouteResult,
+    route_args: dict[str, Any],
+    *,
+    resolution: int,
+    margin: int,
+    via_half: int,
+    via_drill: int,
+    via_name: str,
+    via_cost_factor: float = 8.0,
+    budget_s: float | None = None,
+) -> RouteResult:
+    """Route each net with vias again with vias ``via_cost_factor`` times dearer;
+    keep a net's new copper only when it fails nothing new and has fewer vias.
+
+    ``route_args`` are the exact engine's settings for the whole board.
+    ``margin`` grows the box around the net's pins and copper that it is
+    routed in, so it may go round what it used to hop over."""
+    started = time.monotonic()
+    copper: dict[int, Copper] = {
+        net: (list(result.wires.get(net, [])), list(result.vias.get(net, [])))
+        for net in set(result.wires) | set(result.vias)
+    }
+    todo = sorted((n for n, c in copper.items() if c[1]), key=lambda n: -len(set(copper[n][1])))
+    if not todo:
+        return result
+    default_half = result.half_width
+    half = dict(result.net_half)
+    failed = list(result.failed)
+    base = build_board(dsn)
+    base_items = [(item, _item_box(item)) for item in base.get_items()]
+    layers = route_args.get("layers") or [
+        i for i, layer in enumerate(base.layer_structure.arr) if layer.is_signal
+    ]
+    pins_of: dict[int, list] = {}
+    for pin in base.get_pins():
+        for net in pin.net_nos:
+            pins_of.setdefault(net, []).append(pin.location)
+    context = 2 * (route_args["trace_width"] + route_args["clearance"]) + 2 * via_half + (
+        route_args.get("edge_clearance") or 0
+    )
+    args = dict(route_args)
+    args["via_cost"] = float(route_args.get("via_cost", 10.0)) * via_cost_factor
+
+    changed = False
+    for net in todo:
+        if budget_s is not None and time.monotonic() - started >= budget_s:
+            break
+        old_vias = len(set(copper[net][1]))
+        window = _net_box(copper[net], pins_of.get(net, []), margin)
+        if window is None:
+            continue
+        before = _open(f for f in failed if f[0] == net)
+        view = IntBox(window.ll.x - context, window.ll.y - context,
+                      window.ur.x + context, window.ur.y + context)
+        keep = set(copper) - {net}
+        board = _window_board(base, base_items, view, {net}, copper, keep, half,
+                              default_half, via_half, via_drill, layers, via_name)
+        sub = route_board_exact(
+            board, **args, resolution=resolution, only_nets=frozenset({net}), bounds=window,
+        ).result
+        after = _open(f for f in sub.failed if f[0] == net)
+        new = (sub.wires.get(net, []), sub.vias.get(net, []))
+        if len(after) > len(before) or len(set(new[1])) >= old_vias:
+            continue
+        # the board left out what lies away from the box, so copper reaching
+        # out of it was never checked against that
+        if (new[0] or new[1]) and not _inside(new, window):
+            continue
+        copper[net] = (list(new[0]), list(new[1]))
+        half.pop(net, None)
+        if net in sub.net_half:
+            half[net] = sub.net_half[net]
+        failed = [f for f in failed if f[0] != net] + [f for f in sub.failed if f[0] == net]
+        changed = True
+
+    if not changed:
+        return result
+    out = RouteResult(default_half)
+    for net, (wires, vias) in copper.items():
+        for layer, path in wires:
+            out.add_wire(net, layer, path)
+        for location in dict.fromkeys(vias):
+            out.add_via(net, location)
+    out.failed = failed
+    out.unrouted = len(_open(failed))
+    out.net_half = half
+    out.narrowed = list(result.narrowed)
+    return out

src/rpmroute/route/window.py

@@ -0,0 +1,248 @@
+"""Window re-route: a last stage for the connections still unrouted.
+
+Around each stuck connection a window is cut: the box of its two end pins
+plus a margin. Every net whose routed copper lies wholly inside it is
+ripped; everything else stays, as fixed copper. The window is then routed
+again on its own, on a finer grid than the whole board can afford, the
+stuck connection's net and the ripped nets only. The result is kept only
+if fewer connections are left unrouted than before; otherwise the board is
+as it was. Each round doubles the margin for the connections still stuck.
+
+It is a last stage, so it is kept cheap: a window's board holds only what
+the window needs (every pin and piece of copper of the nets it reroutes,
+so their connectivity is unchanged, and of the other items only those near
+the window), the smallest windows go first, at most ``max_windows`` run per
+round, and no new window starts once ``budget_s`` seconds are spent.
+
+What makes it differ from re-running the same search near the failure: the
+finer grid finds gaps the board's grid steps over, and the ripped nets go in
+again in a new order around the stuck one. A finer grid on the whole board
+costs routes elsewhere (its cells are slower and its order changes); inside
+a small window it only ever replaces what it can improve.
+"""
+
+from __future__ import annotations
+
+import time
+from typing import Any
+
+from rpmroute.board import BasicBoard, build_board
+from rpmroute.board.items import ObstacleArea, Pin, Trace, Via
+from rpmroute.dsn import DsnBoard
+from rpmroute.geometry import IntBox, IntPoint
+
+from .exact_router import route_board_exact
+from .grid_router import RouteResult
+
+Copper = tuple[list[tuple[int, list[IntPoint]]], list[IntPoint]]
+
+
+def _pin_labels(board) -> dict[tuple[int, str], IntPoint]:
+    """Each pin's location by (net, label), the label a failure names it by."""
+    found: dict[tuple[int, str], IntPoint] = {}
+    for pin in board.get_pins():
+        for net in pin.net_nos:
+            found.setdefault((net, f"{pin.component_ref}-{pin.name}"), pin.location)
+    return found
+
+
+def _end_point(labels, net: int, label: str) -> IntPoint | None:
+    """Where a failure's end is: the first pin its label names."""
+    return labels.get((net, label.split("/")[0]))
+
+
+def _inside(copper: Copper, window: IntBox) -> bool:
+    wires, vias = copper
+    points = [p for _layer, path in wires for p in path] + list(vias)
+    return bool(points) and all(
+        window.ll.x <= p.x <= window.ur.x and window.ll.y <= p.y <= window.ur.y for p in points
+    )
+
+
+def _item_box(item) -> IntBox | None:
+    if isinstance(item, (Pin, Via)):
+        return item.shape.bounding_box() if item.shape is not None else None
+    if isinstance(item, ObstacleArea):
+        return item.bounding_box()
+    if isinstance(item, Trace) and item.corners:
+        h = item.half_width
+        xs, ys = [p.x for p in item.corners], [p.y for p in item.corners]
+        return IntBox(min(xs) - h, min(ys) - h, max(xs) + h, max(ys) + h)
+    return None
+
+
+def _meets(box: IntBox | None, view: IntBox) -> bool:
+    return box is not None and box.ll.x <= view.ur.x and view.ll.x <= box.ur.x and (
+        box.ll.y <= view.ur.y and view.ll.y <= box.ur.y
+    )
+
+
+def _path_box(path: list[IntPoint], grow: int) -> IntBox:
+    xs, ys = [p.x for p in path], [p.y for p in path]
+    return IntBox(min(xs) - grow, min(ys) - grow, max(xs) + grow, max(ys) + grow)
+
+
+def _window_board(
+    base: BasicBoard, base_items: list, view: IntBox, affected: set[int],
+    copper: dict[int, Copper], keep: set[int], half: dict[int, int], default_half: int,
+    via_half: int, via_drill: int, layers: list[int], via_name: str,
+) -> BasicBoard:
+    """The board a window is routed on: the base board's items of the nets
+    being rerouted and those near ``view``, plus the routed copper being kept
+    (all of an affected net's, so its connectivity is the whole board's, and
+    of other nets only what is near ``view``), as fixed copper."""
+    board = BasicBoard(base.layer_structure, base.nets, base.clearance_matrix, base.bounding_box)
+    board.outline = base.outline
+    for item, box in base_items:
+        if (item.net_nos and item.net_nos[0] in affected) or _meets(box, view):
+            board.insert(item)
+    for net in keep:
+        wires, vias = copper.get(net, ([], []))
+        width = half.get(net, default_half)
+        mine = net in affected
+        for layer, path in wires:
+            if len(path) >= 2 and (mine or _meets(_path_box(path, width), view)):
+                board.insert(Trace(net_nos=[net], fixed=True, layer=layer, half_width=width, corners=list(path)))
+        for location in dict.fromkeys(vias):
+            shape = IntBox(location.x - via_half, location.y - via_half,
+                           location.x + via_half, location.y + via_half)
+            if mine or _meets(shape, view):
+                board.insert(Via(
+                    net_nos=[net], fixed=True, padstack_name=via_name, drill=via_drill,
+                    location=location, layers=list(layers), shape=shape,
+                ))
+    return board
+
+
+def _open(failed) -> list:
+    """Failures that are real opens, not connections left to a zone fill."""
+    return [f for f in failed if not (len(f) > 3 and f[3])]
+
+
+def window_reroute(
+    dsn: DsnBoard,
+    result: RouteResult,
+    route_args: dict[str, Any],
+    *,
+    rounds: int,
+    resolution: int,
+    margin: int,
+    via_half: int,
+    via_drill: int,
+    via_name: str,
+    budget_s: float | None = None,
+    max_windows: int = 40,
+) -> RouteResult:
+    """Re-route a window around each still-failing connection; keep only gains.
+
+    ``route_args`` are the exact engine's settings for the whole board (width,
+    clearance, layers, shove, ...); the window runs them at ``resolution``.
+    ``margin`` is the first round's window margin in board units. No new
+    window starts once ``budget_s`` seconds have gone by (None: no limit),
+    and at most ``max_windows`` run per round."""
+    started = time.monotonic()
+    if rounds < 1 or not _open(result.failed):
+        return result
+    default_half = result.half_width
+    copper: dict[int, Copper] = {
+        net: (list(result.wires.get(net, [])), list(result.vias.get(net, [])))
+        for net in set(result.wires) | set(result.vias)
+    }
+    half = dict(result.net_half)
+    failed = list(result.failed)
+    base = build_board(dsn)
+    base_items = [(item, _item_box(item)) for item in base.get_items()]
+    layers = route_args.get("layers") or [
+        i for i, layer in enumerate(base.layer_structure.arr) if layer.is_signal
+    ]
+    labels = _pin_labels(base)
+    # the copper a window's routing can feel from outside it
+    context = 2 * (route_args["trace_width"] + route_args["clearance"]) + 2 * via_half + (
+        route_args.get("edge_clearance") or 0
+    )
+
+    def window_of(entry, reach: int) -> IntBox | None:
+        ends = [_end_point(labels, entry[0], label) for label in entry[1:3]]
+        ends = [p for p in ends if p is not None]
+        if not ends:
+            return None
+        return IntBox(
+            min(p.x for p in ends) - reach, min(p.y for p in ends) - reach,
+            max(p.x for p in ends) + reach, max(p.y for p in ends) + reach,
+        )
+
+    def area(box: IntBox | None) -> float:
+        return float("inf") if box is None else (box.ur.x - box.ll.x) * (box.ur.y - box.ll.y)
+
+    changed = out_of_time = False
+    for rnd in range(rounds):
+        reach = margin * (2 ** rnd)
+
+        # the cheap wins first: the smallest windows
+        todo = sorted(_open(list(failed)), key=lambda f: area(window_of(f, reach)))
+        for entry in todo[:max(int(max_windows), 1)]:
+            if budget_s is not None and time.monotonic() - started >= budget_s:
+                out_of_time = True
+                break
+            if entry not in failed:
+                continue  # an earlier window routed it
+            net = entry[0]
+            window = window_of(entry, reach)
+            if window is None:
+                continue
+            victims = {n for n, c in copper.items() if _inside(c, window)}
+            affected = victims | {net}
+            before = _open(f for f in failed if f[0] in affected)
+            keep = set(copper) - victims
+            view = IntBox(window.ll.x - context, window.ll.y - context,
+                          window.ur.x + context, window.ur.y + context)
+            board = _window_board(base, base_items, view, affected, copper, keep, half,
+                                  default_half, via_half, via_drill, layers, via_name)
+            sub = route_board_exact(
+                board, **route_args, resolution=resolution,
+                only_nets=frozenset(affected), bounds=window,
+                route_first=frozenset((f[0], f[1], f[2]) for f in before),
+            ).result
+            after = _open(f for f in sub.failed if f[0] in affected)
+            if len(after) >= len(before):
+                continue
+            # the window board left out what lies away from it, so copper
+            # reaching out of the window was never checked against it
+            if any(not _inside((sub.wires.get(n, []), sub.vias.get(n, [])), window)
+                   for n in affected if sub.wires.get(n) or sub.vias.get(n)):
+                continue
+            # a net keeping some of its copper is written at one width: the
+            # window's new copper has to have gone in at that width too
+            if any(
+                n not in victims and copper.get(n) and (sub.wires.get(n) or sub.vias.get(n))
+                and sub.net_half.get(n, default_half) != half.get(n, default_half)
+                for n in affected
+            ):
+                continue
+            for n in affected:
+                kept_wires, kept_vias = copper.get(n, ([], [])) if n not in victims else ([], [])
+                copper[n] = (kept_wires + sub.wires.get(n, []), kept_vias + sub.vias.get(n, []))
+                if n in victims:
+                    half.pop(n, None)
+                    if n in sub.net_half:
+                        half[n] = sub.net_half[n]
+            failed = [f for f in failed if f[0] not in affected] + [
+                f for f in sub.failed if f[0] in affected
+            ]
+            changed = True
+        if out_of_time or not _open(failed):
+            break
+
+    if not changed:
+        return result
+    out = RouteResult(default_half)
+    for net, (wires, vias) in copper.items():
+        for layer, path in wires:
+            out.add_wire(net, layer, path)
+        for location in dict.fromkeys(vias):
+            out.add_via(net, location)
+    out.failed = failed
+    out.unrouted = len(_open(failed))
+    out.net_half = half
+    out.narrowed = list(result.narrowed)
+    return out

src/rpmroute/ses/__init__.py

@@ -1,9 +1,9 @@
-"""Specctra SES (session) writing for freeroute.
+"""Specctra SES (session) writing for rpmroute.
 
 Public API::
 
-    from freeroute.dsn import parse_dsn
-    from freeroute.ses import write_ses, RoutingResult, RoutedWire, RoutedVia
+    from rpmroute.dsn import parse_dsn
+    from rpmroute.ses import write_ses, RoutingResult, RoutedWire, RoutedVia
 
     board = parse_dsn(dsn_text)
     ses_text = write_ses(board)                 # valid no-op session

src/rpmroute/ses/model.py

@@ -60,6 +60,9 @@ class RoutingResult:
     #: connections the router could not make: (net name, one end, other end,
     #: the zone both ends sit in or "") -- a zone's fill may join the latter
     unrouted: list[tuple[str, str, str, str]] = field(default_factory=list)
+    #: connections of a wider net class that only fitted at the default width
+    #: (net name, one end, other end); their net is written at the default
+    narrowed: list[tuple[str, str, str]] = field(default_factory=list)
 
     def net(self, name: str, *, create: bool = False) -> RoutedNet | None:
         """Return the :class:`RoutedNet` with ``name`` (creating it if asked)."""

src/rpmroute/ses/writer.py

@@ -1,8 +1,8 @@
 """Specctra SES session-file writer.
 
 Ports the write path of FreeRouting's ``io/specctra/SesWriter.java`` to operate
-on this project's parsed :class:`~freeroute.dsn.model.DsnBoard` plus an
-in-memory :class:`~freeroute.ses.model.RoutingResult`. The emitted structure is::
+on this project's parsed :class:`~rpmroute.dsn.model.DsnBoard` plus an
+in-memory :class:`~rpmroute.ses.model.RoutingResult`. The emitted structure is::
 
     (session <name>
       (base_design <name>)
@@ -30,8 +30,8 @@ from __future__ import annotations
 
 import math
 
-from freeroute.dsn.model import DsnBoard
-from freeroute.dsn.shapes import Circle, Path, Polygon, Rectangle, Shape
+from rpmroute.dsn.model import DsnBoard
+from rpmroute.dsn.shapes import Circle, Path, Polygon, Rectangle, Shape
 
 from .indent import Identifier, IndentWriter
 from .model import RoutedNet, RoutedVia, RoutedWire, RoutingResult

tests/board/test_board.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from freeroute.board import (
+from rpmroute.board import (
     ClearanceMatrix,
     CoordinateTransform,
     Layer,

tests/board/test_build.py

@@ -15,9 +15,9 @@ import sys
 
 import pytest
 
-from freeroute.board import BasicBoard, ObstacleArea, Pin, build_board
-from freeroute.dsn import parse_dsn
-from freeroute.geometry import IntPoint
+from rpmroute.board import BasicBoard, ObstacleArea, Pin, build_board
+from rpmroute.dsn import parse_dsn
+from rpmroute.geometry import IntPoint
 
 sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
 
@@ -184,7 +184,7 @@ def test_place_keepout_does_not_block_routing():
 
 
 def test_grid_router_leaves_the_interior_of_a_ring_keepout_open():
-    from freeroute.route.pipeline import route_dsn_board
+    from rpmroute.route.pipeline import route_dsn_board
 
     ring_only = "\n".join(
         line for line in _RING_DSN.splitlines() if "wire_keepout" not in line
@@ -251,6 +251,40 @@ def test_oval_pad_keeps_its_width():
 
 
 def test_via_size_comes_from_the_via_padstack():
-    from freeroute.route.pipeline import _via_half_board
+    from rpmroute.route.pipeline import _via_half_board
 
     assert _via_half_board(parse_dsn(_PAD_DSN), 10) == 3000   # 0.6 mm via, board units
+
+
+# --- rule areas: overlap only ------------------------------------------------
+
+_CHANNEL_DSN = """(pcb channel.dsn
+  (parser (string_quote ")) (resolution um 10) (unit um)
+  (structure
+    (layer F.Cu (type signal)) (layer B.Cu (type signal))
+    (boundary (path pcb 0  0 0  40000 0  40000 -30000  0 -30000  0 0))
+    (keepout "{name}top" (polygon signal 0  18000 0  22000 0  22000 -14750  18000 -14750))
+    (keepout "{name}bottom" (polygon signal 0  18000 -15250  22000 -15250  22000 -30000  18000 -30000))
+    (rule (width 250) (clearance 150)))
+  (placement (component P (place P1 5000 -15000 front 0) (place P2 35000 -15000 front 0)))
+  (library (image P (pin pad 1 0 0)) (padstack pad (shape (circle F.Cu 600)) (attach off)))
+  (network (net N (pins P1-1 P2-1))))"""
+
+
+def test_a_keepout_named_rule_area_takes_no_clearance():
+    named = _areas(_CHANNEL_DSN.format(name="rule_area_"))
+    plain = _areas(_CHANNEL_DSN.format(name=""))
+    assert named and not any(a.clearance for a in named)
+    assert plain and all(a.clearance for a in plain)
+
+
+def _route_channel(name):
+    from rpmroute.route.pipeline import build_exact_routing_result
+
+    return build_exact_routing_result(parse_dsn(_CHANNEL_DSN.format(name=name)), resolution=2)
+
+
+def test_a_trace_may_run_beside_a_rule_area_closer_than_clearance():
+    # the 0.5 mm channel fits a 0.25 mm trace, but not with 0.15 mm each side
+    assert _route_channel("rule_area_").unrouted == []
+    assert _route_channel("").unrouted != []

tests/board/test_search_tree.py

@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from freeroute.board import ShapeSearchTree, TreeShape
-from freeroute.geometry import IntBox
+from rpmroute.board import ShapeSearchTree, TreeShape
+from rpmroute.geometry import IntBox
 
 
 def shape(owner, net, layer, box, routed=False):
@@ -62,3 +62,37 @@ def test_has_violation_ignores_static_pad_pairs():
     # a routed trace of net 3 within clearance of pad net 1 -> violation
     tree.insert(shape(2, 3, 0, IntBox(11, 0, 20, 10), routed=True))
     assert tree.has_violation(clearance=20) is not None
+
+
+def test_a_rule_area_conflicts_only_on_overlap():
+    tree = ShapeSearchTree()
+    tree.insert(TreeShape(1, -1, frozenset({0}), IntBox(100, 0, 200, 100), clearance=False))
+    near = IntBox(0, 0, 95, 100)  # 5 short of the area, well inside clearance 50
+    over = IntBox(0, 0, 105, 100)
+    assert not tree.clearance_conflict(near, 7, 0, 50)
+    assert tree.clearance_conflict(over, 7, 0, 50)
+
+
+def test_an_ordinary_keepout_still_needs_clearance():
+    tree = ShapeSearchTree()
+    tree.insert(TreeShape(1, -1, frozenset({0}), IntBox(100, 0, 200, 100)))
+    assert tree.clearance_conflict(IntBox(0, 0, 95, 100), 7, 0, 50)
+
+
+def test_the_routed_board_check_treats_a_rule_area_the_same_way():
+    tree = ShapeSearchTree()
+    tree.insert(TreeShape(1, -1, frozenset({0}), IntBox(100, 0, 200, 100), clearance=False))
+    tree.insert(TreeShape(2, 7, frozenset({0}), IntBox(0, 0, 95, 100), routed=True))
+    assert tree.has_violation(50) is None
+    tree.insert(TreeShape(3, 7, frozenset({0}), IntBox(150, 0, 160, 100), routed=True))
+    assert tree.has_violation(50) is not None
+
+
+
+def test_rule_area_overlap_sees_only_rule_areas():
+    tree = ShapeSearchTree()
+    tree.insert(TreeShape(1, -1, frozenset({0}), IntBox(100, 0, 200, 100), clearance=False))
+    tree.insert(TreeShape(2, -1, frozenset({0}), IntBox(300, 0, 400, 100)))
+    assert tree.rule_area_overlap(IntBox(90, 40, 110, 60), 0)
+    assert not tree.rule_area_overlap(IntBox(290, 40, 310, 60), 0)
+    assert not tree.rule_area_overlap(IntBox(90, 40, 110, 60), 1)

tests/dsn/test_reader.py

@@ -6,10 +6,10 @@ from pathlib import Path
 
 import pytest
 
-from freeroute.dsn import parse_dsn
-from freeroute.dsn.reader import DsnParseError
-from freeroute.dsn.shapes import Circle, Rectangle
-from freeroute.dsn.shapes import Path as DsnPath
+from rpmroute.dsn import parse_dsn
+from rpmroute.dsn.reader import DsnParseError
+from rpmroute.dsn.shapes import Circle, Rectangle
+from rpmroute.dsn.shapes import Path as DsnPath
 
 FIXTURES = Path(__file__).parent / "fixtures"
 
@@ -156,3 +156,26 @@ def test_unplaced_component_has_no_coords():
     place = board.placements[0].places[0]
     assert place.name == "U9"
     assert place.x is None and place.y is None
+
+
+# --- string_quote ----------------------------------------------------------
+
+_QUOTED = """(pcb q.dsn
+  (parser (string_quote {q}) (space_in_quoted_tokens on))
+  (resolution um 10) (unit um)
+  (structure (layer F.Cu (type signal)) (boundary (path pcb 0 0 0 1000 0 1000 1000 0 1000 0 0)))
+  (placement (component "SW1" (place SW1 100 100 front 0 (PN {pn}))))
+  (library)
+  (network)
+)"""
+
+
+def test_a_bare_apostrophe_is_an_atom_when_the_file_quotes_with_double_quotes():
+    # KiCad declares " and writes a keycap's part number as a bare '
+    board = parse_dsn(_QUOTED.format(q='"', pn="'"))
+    assert board.parser.string_quote == '"'
+
+
+def test_the_declared_quote_character_is_the_one_that_opens_strings():
+    board = parse_dsn(_QUOTED.format(q="'", pn="'10k 1%'").replace('"SW1"', "'SW1'"))
+    assert board.parser.string_quote == "'"

tests/dsn/test_sexp.py

@@ -4,8 +4,8 @@ from __future__ import annotations
 
 import pytest
 
-from freeroute.dsn.sexp import SExp, parse
-from freeroute.dsn.tokenizer import DsnSyntaxError, Token
+from rpmroute.dsn.sexp import SExp, parse
+from rpmroute.dsn.tokenizer import DsnSyntaxError, Token
 
 
 def test_parse_simple_head_and_values():

tests/dsn/test_shapes.py

@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from freeroute.dsn.sexp import parse
-from freeroute.dsn.shapes import (
+from rpmroute.dsn.sexp import parse
+from rpmroute.dsn.shapes import (
     Circle,
     Path,
     Polygon,

tests/dsn/test_tokenizer.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import pytest
 
-from freeroute.dsn.tokenizer import DsnSyntaxError, TokenKind, tokenize
+from rpmroute.dsn.tokenizer import DsnSyntaxError, TokenKind, tokenize
 
 
 def kinds(text: str) -> list[TokenKind]:

tests/geometry/test_box.py

@@ -6,7 +6,7 @@ containment and degenerate (empty / point / segment) tiles.
 
 from __future__ import annotations
 
-from freeroute.geometry import IntBox, IntPoint, IntVector, RationalPoint
+from rpmroute.geometry import IntBox, IntPoint, IntVector, RationalPoint
 
 
 def test_measures():

tests/geometry/test_direction.py

@@ -5,7 +5,7 @@ Oracles hand-derived from ``geometry/planar/{Direction,IntDirection}.java``.
 
 from __future__ import annotations
 
-from freeroute.geometry import Direction, IntDirection, IntPoint, IntVector, Side
+from rpmroute.geometry import Direction, IntDirection, IntPoint, IntVector, Side
 
 
 def test_normalized_direction_reduces_by_gcd():

tests/geometry/test_line.py

@@ -5,7 +5,7 @@ Oracles hand-derived from ``geometry/planar/Line.java``.
 
 from __future__ import annotations
 
-from freeroute.geometry import IntPoint, Line, RationalPoint, Side
+from rpmroute.geometry import IntPoint, Line, RationalPoint, Side
 
 
 def test_side_of_point():
@@ -79,7 +79,7 @@ def test_intersection_approx_matches_exact():
 def test_translate_and_opposite():
     line = Line.from_coords(0, 0, 4, 0)
     assert line.opposite().direction().equals(line.direction()) is False
-    from freeroute.geometry import IntVector
+    from rpmroute.geometry import IntVector
 
     moved = line.translate_by(IntVector(0, 5))
     assert moved.side_of(IntPoint(2, 5)) == Side.COLLINEAR

tests/geometry/test_octagon.py

@@ -7,7 +7,7 @@ import random
 
 import pytest
 
-from freeroute.geometry import IntBox, IntPoint, ceil_sqrt2, overlaps_2d, segment_octagon
+from rpmroute.geometry import IntBox, IntPoint, ceil_sqrt2, overlaps_2d, segment_octagon
 
 
 @pytest.mark.parametrize("r", [0, 1, 2, 3, 1000, 2000, 3000, 12345, 999999])

tests/geometry/test_point_vector.py

@@ -8,7 +8,7 @@ Java ``long``, and rational equality.
 
 from __future__ import annotations
 
-from freeroute.geometry import (
+from rpmroute.geometry import (
     IntPoint,
     IntVector,
     RationalPoint,
@@ -139,7 +139,7 @@ def test_rational_point_infinite():
 
 
 def test_rational_point_contained_in_box_exact():
-    from freeroute.geometry import IntBox
+    from rpmroute.geometry import IntBox
 
     box = IntBox(0, 0, 2, 2)
     assert RationalPoint(3, 2, 2).is_contained_in(box)  # (1.5, 1.0) inside

tests/geometry/test_polygon.py

@@ -13,9 +13,9 @@ from __future__ import annotations
 
 import pytest
 
-from freeroute.geometry import IntPoint, Side
-from freeroute.geometry.polygon import Polygon
-from freeroute.geometry.polygon_shape import PolygonShape
+from rpmroute.geometry import IntPoint, Side
+from rpmroute.geometry.polygon import Polygon
+from rpmroute.geometry.polygon_shape import PolygonShape
 
 
 def pts(*coords):

tests/geometry/test_polyline.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from freeroute.geometry import (
+from rpmroute.geometry import (
     IntBox,
     IntPoint,
     Polyline,

tests/geometry/test_simplex.py

@@ -16,7 +16,7 @@ Source: ``geometry/planar/{TileShape,Simplex}.java``.
 
 from __future__ import annotations
 
-from freeroute.geometry import IntBox, IntPoint, Line, Side, Simplex
+from rpmroute.geometry import IntBox, IntPoint, Line, Side, Simplex
 
 
 def _grid(lo: int, hi: int):
@@ -162,7 +162,7 @@ def test_get_instance_detects_empty_from_opposing_halfplanes():
 
 def test_translate_preserves_shape():
     tri = right_triangle()
-    from freeroute.geometry import IntVector
+    from rpmroute.geometry import IntVector
 
     moved = tri.translate_by(IntVector(100, 50))
     for p in _grid(-3, 13):

tests/oracle.py

@@ -1,8 +1,8 @@
 """FreeRouting JAR oracle for behaviour-level validation.
 
-**Dev/test only — not part of the shipped package** (freeroute is Java-free by
+**Dev/test only — not part of the shipped package** (rpmroute is Java-free by
 design). This runs the reference FreeRouting JAR to route a Specctra DSN so that
-freeroute's own output can be diffed against the reference implementation. There
+rpmroute's own output can be diffed against the reference implementation. There
 are no unit-test oracles for FreeRouting's geometry/router, so the oracle is how
 we validate at the behaviour level: same DSN in, compare routed connectivity.
 
@@ -10,7 +10,7 @@ Tests that use this skip automatically when a Java 21+ runtime or the JAR is not
 available (e.g. CI without a JVM), so the normal suite stays Java-free.
 
 Overrides:
-- ``FREEROUTE_ORACLE_JAVA`` — explicit path to a ``java`` binary.
+- ``RPMROUTE_ORACLE_JAVA`` (or the older ``FREEROUTE_ORACLE_JAVA``) — explicit path to a ``java`` binary.
 - ``FREEROUTING_JAR`` — explicit path to a freerouting JAR.
 """
 
@@ -27,7 +27,7 @@ import tempfile
 
 import pytest
 
-from freeroute.dsn.sexp import parse
+from rpmroute.dsn.sexp import parse
 
 _MIN_JAVA_MAJOR = 21
 _REPO_ROOT = Path(__file__).resolve().parents[1]
@@ -60,7 +60,7 @@ def _java_major(java: str) -> int:
 def find_java() -> str | None:
     """Return a path to a Java >= 21 runtime, or None."""
     candidates: list[str] = []
-    override = os.environ.get("FREEROUTE_ORACLE_JAVA")
+    override = os.environ.get("RPMROUTE_ORACLE_JAVA") or os.environ.get("FREEROUTE_ORACLE_JAVA")
     if override:
         candidates.append(override)
     java_home = os.environ.get("JAVA_HOME")

tests/route/test_axis_escapes.py

@@ -0,0 +1,113 @@
+"""Pins of a fine-pitch part turned off the grid axes leave along their pads.
+
+A QFN at 45 degrees has no straight exit: every horizontal or vertical step
+from a pin passes its neighbours closer than the clearance (0.35 mm away on
+each axis at 0.5 mm pitch). The grid leaves along the pad's own axis first,
+past the pin row, and the exact engine checks that slanted leg on its exact
+copper. Found on th-eda's lift ESC, where a QFN-24 at 45 degrees left 15
+connections unroutable on an empty board.
+"""
+
+from __future__ import annotations
+
+import math
+
+import pytest
+
+from rpmroute.board import build_board
+from rpmroute.dsn import parse_dsn
+from rpmroute.geometry import IntPoint, overlaps_2d, segment_slab
+from rpmroute.route.grid_router import GridRouter
+from rpmroute.route.pipeline import (
+    _rule_clearance_dsn,
+    _rule_width_dsn,
+    _via_half_board,
+    build_exact_routing_result,
+)
+
+
+def _qfn_side_dsn(rotation: float) -> str:
+    """Two rows of five 0.25 x 0.8 mm pads at 0.5 mm pitch (one side of a
+    QFN and its opposite side), turned by ``rotation``; each pin of the top
+    row is its own net, routed to a pad 4.5 mm out, the pads fanned 1.5 mm
+    apart."""
+    cx, cy = 100000, -100000
+    t = math.radians(rotation)
+    out = (-math.sin(t), math.cos(t))  # the pads' outward axis after turning
+    along = (math.cos(t), math.sin(t))  # the pin row
+    pins, targets, nets = [], [], []
+    for i in range(5):
+        x = -1000 + 500 * i
+        pins += [f"(pin P {i + 1} {x} 1000)", f"(pin P {i + 6} {x} -1000)"]
+        px = cx + x * math.cos(t) - 1000 * math.sin(t)
+        py = cy + x * math.sin(t) + 1000 * math.cos(t)
+        spread = 1500 * (i - 2) - x  # fan the far pads out to 1.5 mm apart
+        tx = px + 4500 * out[0] + spread * along[0]
+        ty = py + 4500 * out[1] + spread * along[1]
+        targets.append(f"(place T{i + 1} {round(tx)} {round(ty)} front 0)")
+        nets.append(f"(net N{i} (pins U1-{i + 1} T{i + 1}-1))")
+    return f"""(pcb qfn (parser) (resolution um 10) (unit um)
+  (structure
+    (layer F.Cu (type signal)) (layer B.Cu (type signal))
+    (boundary (path pcb 0  115000 -115000  85000 -115000  85000 -85000  115000 -85000
+      115000 -115000))
+    (via "Via[0-1]_450:200_um")
+    (rule (width 150) (clearance 150)))
+  (placement
+    (component Q (place U1 {cx} {cy} front {rotation}))
+    (component T {" ".join(targets)}))
+  (library
+    (image Q {" ".join(pins)})
+    (image T (pin t 1 0 0))
+    (padstack P (shape (rect F.Cu -125 -400 125 400)) (attach off))
+    (padstack t (shape (rect F.Cu -300 -300 300 300)) (attach off))
+    (padstack "Via[0-1]_450:200_um" (shape (circle F.Cu 450)) (shape (circle B.Cu 450))
+      (attach off)))
+  (network {" ".join(nets)}))"""
+
+
+@pytest.mark.parametrize("rotation", [45, 30, -45])
+def test_a_turned_fine_pitch_part_gets_its_pins_out(rotation):
+    result = build_exact_routing_result(parse_dsn(_qfn_side_dsn(rotation)), resolution=2, shove=True)
+    assert result.unrouted == []
+
+
+def test_the_exit_runs_along_the_pad_axis_and_clears_the_neighbours():
+    dsn = parse_dsn(_qfn_side_dsn(45))
+    s = dsn.resolution.value
+    board = build_board(dsn)
+    router = GridRouter(
+        board,
+        trace_width=round(_rule_width_dsn(dsn) * s),
+        clearance=round(_rule_clearance_dsn(dsn) * s),
+        via_half=_via_half_board(dsn, s),
+        orthogonal=True,
+    )
+    pins = {p.name: p for p in board.get_pins() if p.component_ref == "U1"}
+    pin = pins["3"]
+    exit_point = router._axis_exit(pin)
+    assert exit_point is not None
+    dx, dy = exit_point.x - pin.location.x, exit_point.y - pin.location.y
+    assert abs(abs(dx) - abs(dy)) <= 2  # along the 45-degree axis
+    leg = segment_slab(pin.location, exit_point, router.half_width + router.clearance)
+    for name in ("2", "4"):
+        assert not overlaps_2d(leg, pins[name].shape)
+
+
+def test_a_pad_on_the_grid_axes_keeps_the_usual_exits():
+    dsn = parse_dsn(_qfn_side_dsn(0))
+    s = dsn.resolution.value
+    board = build_board(dsn)
+    router = GridRouter(board, trace_width=round(_rule_width_dsn(dsn) * s),
+                        clearance=round(_rule_clearance_dsn(dsn) * s), via_half=_via_half_board(dsn, s))
+    pin = next(p for p in board.get_pins() if p.component_ref == "U1" and p.name == "3")
+    assert router._axis_exit(pin) is None
+
+
+def test_a_slanted_slab_is_tight_where_a_bounding_box_is_not():
+    slab = segment_slab(IntPoint(0, 0), IntPoint(10000, 10000), 750)
+    # a point beside the diagonal but inside its bounding box
+    from rpmroute.geometry import IntBox
+
+    assert not overlaps_2d(slab, IntBox(8000, 0, 8100, 100))
+    assert overlaps_2d(slab, IntBox(4900, 4900, 5100, 5100))

tests/route/test_diagonal.py

@@ -16,11 +16,11 @@ from pathlib import Path
 
 import pytest
 
-from freeroute.board import build_board
-from freeroute.dsn import parse_dsn
-from freeroute.dsn.sexp import parse
-from freeroute.geometry import IntBox, IntPoint, overlaps_2d, segment_octagon
-from freeroute.route import route, route_dsn_board_exact
+from rpmroute.board import build_board
+from rpmroute.dsn import parse_dsn
+from rpmroute.dsn.sexp import parse
+from rpmroute.geometry import IntBox, IntPoint, overlaps_2d, segment_octagon
+from rpmroute.route import route, route_dsn_board_exact
 
 FIXTURES = Path(__file__).resolve().parent.parent / "dsn" / "fixtures"
 DIAGONAL_WIN = FIXTURES / "diagonal_win.dsn"
@@ -55,7 +55,7 @@ def _pins_by_net(fixture):
 
 
 def _rule_clearance_board(fixture):
-    from freeroute.route.pipeline import _rule_clearance_dsn
+    from rpmroute.route.pipeline import _rule_clearance_dsn
 
     dsn = parse_dsn(fixture.read_text())
     return round(_rule_clearance_dsn(dsn) * max(dsn.resolution.value, 1))

tests/route/test_exact_router.py

@@ -15,12 +15,12 @@ import sys
 
 import pytest
 
-from freeroute.board import ShapeSearchTree, TreeShape, build_board
-from freeroute.dsn import parse_dsn
-from freeroute.dsn.sexp import parse
-from freeroute.geometry import IntBox, Polyline, PolylineShape
-from freeroute.route import route, route_dsn_board, route_dsn_board_exact
-from freeroute.route.pipeline import _rule_clearance_dsn, _rule_width_dsn
+from rpmroute.board import ShapeSearchTree, TreeShape, build_board
+from rpmroute.dsn import parse_dsn
+from rpmroute.dsn.sexp import parse
+from rpmroute.geometry import IntBox, Polyline, PolylineShape
+from rpmroute.route import route, route_dsn_board, route_dsn_board_exact
+from rpmroute.route.pipeline import _rule_clearance_dsn, _rule_width_dsn
 
 sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
 

tests/route/test_fixed_wiring.py

@@ -0,0 +1,108 @@
+"""Tracks and vias already on the board (the DSN's wiring) are fixed copper."""
+
+from __future__ import annotations
+
+from rpmroute.board import build_board
+from rpmroute.dsn import parse_dsn
+from rpmroute.route.pipeline import route_dsn_board_exact
+
+_DSN = """(pcb wired (parser) (resolution um 10) (unit um)
+  (structure
+    (layer F.Cu (type signal)) (layer B.Cu (type signal))
+    (boundary (path pcb 0  0 0  30000 0  30000 -20000  0 -20000  0 0))
+    (via "Via[0-1]_600:300_um") (rule (width 250) (clearance 200)))
+  (placement (component S (place A1 5000 -10000 front 0) (place A2 25000 -10000 front 0)))
+  (library
+    (image S (pin smd 1 0 0))
+    (padstack smd (shape (rect F.Cu -400 -400 400 400)) (attach off))
+    (padstack "Via[0-1]_600:300_um" (shape (circle F.Cu 600)) (shape (circle B.Cu 600)) (attach off)))
+  (network (net SIG (pins A1-1 A2-1)) (net GND))
+  (wiring
+    (wire (path F.Cu 400  15000 0  15000 -20000) (net GND) (type route))
+    (via "Via[0-1]_600:300_um"  8000 -14000 (net GND) (type route))))"""
+
+
+def test_wiring_is_read_with_its_nets():
+    dsn = parse_dsn(_DSN)
+    assert [(w.net, w.layer, w.width) for w in dsn.wires] == [("GND", "F.Cu", 400.0)]
+    assert [(v.net, v.x, v.y) for v in dsn.vias] == [("GND", 8000.0, -14000.0)]
+
+
+def test_wiring_is_fixed_copper_and_not_a_connection_to_route():
+    board = build_board(parse_dsn(_DSN))
+    copper = board.get_fixed_copper()
+    gnd = next(n.net_number for n in board.nets if n.name == "GND")
+    assert copper and all(net == gnd for net, _, _ in copper)
+    assert not any(gnd in p.net_nos for p in board.get_pins())
+
+
+def test_other_nets_route_around_a_fixed_track():
+    dsn = parse_dsn(_DSN)
+    exact, scale, names = route_dsn_board_exact(dsn, resolution=2)
+    sig = next(i + 1 for i, n in enumerate(dsn.nets) if n.name == "SIG")
+    assert sig in exact.result.routed_net_numbers
+    assert exact.drc_clean
+    wall = 15000 * scale
+    for layer, pts in exact.result.wires.get(sig, []):
+        if names[layer] != "F.Cu":
+            continue
+        for p, q in zip(pts, pts[1:], strict=False):
+            assert not (min(p.x, q.x) < wall < max(p.x, q.x)), "crossed the GND track on F.Cu"
+
+
+# --- fixed wiring as connectivity ------------------------------------------
+
+_FANOUT = """(pcb fanout (parser) (resolution um 10) (unit um)
+  (structure
+    (layer F.Cu (type signal)) (layer In1.Cu (type power)) (layer In2.Cu (type power))
+    (layer B.Cu (type signal))
+    (boundary (path pcb 0  0 0  30000 0  30000 -20000  0 -20000  0 0))
+    (plane GND (polygon In1.Cu 0  500 -500  29500 -500  29500 -19500  500 -19500  500 -500))
+    (via "Via[0-3]_600:300_um") (rule (width 150) (clearance 150)))
+  (placement (component S (place G1 5000 -10000 front 0) (place A 10000 -10000 front 0)
+                          (place B 25000 -11500 back 0)))
+  (library
+    (image S (pin smd 1 0 0))
+    (padstack smd (shape (rect F.Cu -300 -300 300 300)) (attach off))
+    (padstack "Via[0-3]_600:300_um" (shape (circle F.Cu 600)) (shape (circle B.Cu 600)) (attach off)))
+  (network (net GND (pins G1-1)) (net SIG (pins A-1 B-1)))
+  (wiring
+    (wire (path F.Cu 150  5000 -10000  5000 -11500) (net GND) (type route))
+    (via "Via[0-3]_600:300_um"  5000 -11500 (net GND) (type route))
+    (wire (path F.Cu 150  10000 -10000  10000 -11500) (net SIG) (type route))
+    (via "Via[0-3]_600:300_um"  10000 -11500 (net SIG) (type route))
+    (wire (path F.Cu 300  2000 -2000  8000 -2000) (net GND) (type route))))"""
+
+
+def test_a_pad_fanned_out_to_its_plane_needs_no_route():
+    dsn = parse_dsn(_FANOUT)
+    exact, _scale, _names = route_dsn_board_exact(dsn, resolution=2)
+    gnd = next(i + 1 for i, n in enumerate(dsn.nets) if n.name == "GND")
+    assert exact.result.failed == []
+    assert not exact.result.vias.get(gnd) and not exact.result.wires.get(gnd)
+
+
+def test_a_fanned_out_signal_is_routed_from_its_via():
+    # B is on the bottom face, level with A's fan-out via: starting from that
+    # via on B.Cu is the cheapest way, and needs no via of its own
+    dsn = parse_dsn(_FANOUT)
+    exact, scale, names = route_dsn_board_exact(dsn, resolution=2)
+    sig = next(i + 1 for i, n in enumerate(dsn.nets) if n.name == "SIG")
+    assert sig in exact.result.routed_net_numbers
+    assert not exact.result.vias.get(sig), "the fan-out via is already there"
+    assert {names[layer] for layer, _ in exact.result.wires[sig]} == {"B.Cu"}
+
+
+def test_the_session_never_repeats_copper_already_on_the_board():
+    # the JAR writes the DSN's wiring back into its session, and an applier
+    # then adds it a second time on top of itself; rpmroute writes only
+    # what it routed
+    from rpmroute.route.pipeline import build_exact_routing_result
+
+    fixed_vias = {(5000.0, -11500.0), (10000.0, -11500.0)}
+    fixed_paths = {(5000.0, -10000.0, 5000.0, -11500.0), (10000.0, -10000.0, 10000.0, -11500.0),
+                   (2000.0, -2000.0, 8000.0, -2000.0)}
+    result = build_exact_routing_result(parse_dsn(_FANOUT), resolution=2)
+    for net in result.nets:
+        assert not {(v.x, v.y) for v in net.vias} & fixed_vias
+        assert not {tuple(w.coords) for w in net.wires} & fixed_paths

tests/route/test_grid_exact_agreement.py

@@ -0,0 +1,284 @@
+"""The grid must not believe copper legal that the exact check then refuses.
+
+Each case is one way the two used to disagree on roomba-ESP12E: a rotated oval
+pad modelled as an inflated box (and opened to its own net), a via shared by
+two connections of a net losing its footprint when one of them is ripped, and
+a wider net class searched as if it were the default width.
+"""
+
+from __future__ import annotations
+
+import math
+
+import pytest
+
+from rpmroute.board import build_board
+from rpmroute.dsn import parse_dsn
+from rpmroute.geometry import IntBox, Simplex
+from rpmroute.route.grid_router import GridRouter
+from rpmroute.route.pipeline import (
+    _rule_clearance_dsn,
+    _rule_width_dsn,
+    _via_half_board,
+    build_exact_routing_result,
+)
+
+# --- rotated oval pads -------------------------------------------------------
+
+
+def _socket_dsn(rotation: float, layout: str) -> str:
+    """A 1x4 2.54 mm socket strip (rect pin 1, oval pins 2-4) at ``rotation``,
+    each pin its own net, routed to a small SMD pad 0.9 mm away."""
+    cx, cy = 100000, -100000
+    t = math.radians(rotation)
+    ax = (math.cos(t), math.sin(t))
+    perp = (-math.sin(t), math.cos(t))
+    places = []
+    for i in range(4):
+        px, py = cx + 2540 * i * ax[0], cy + 2540 * i * ax[1]
+        side = 1 if i % 2 == 0 else -1
+        if layout == "y":
+            tx, ty = px, py + side * 9000
+        else:
+            tx, ty = px + side * 8000 * perp[0], py + side * 8000 * perp[1]
+        places.append(f"(place T{i + 1} {round(tx)} {round(ty)} front 0)")
+    nets = " ".join(f"(net N{i} (pins P3-{i + 1} T{i + 1}-1))" for i in range(4))
+    return f"""(pcb socket (parser) (resolution um 10) (unit um)
+  (structure
+    (layer F.Cu (type signal)) (layer B.Cu (type signal))
+    (boundary (path pcb 0  125000 -115000  85000 -115000  85000 -75000  125000 -75000
+      125000 -115000))
+    (via "Via[0-1]_800:400_um")
+    (rule (width 300) (clearance 250)))
+  (placement
+    (component S (place P3 {cx} {cy} front {rotation}))
+    (component T {" ".join(places)}))
+  (library
+    (image S (pin R 1 0 0) (pin O 2 2540 0) (pin O 3 5080 0) (pin O 4 7620 0))
+    (image T (pin t 1 0 0))
+    (padstack O (shape (path F.Cu 1727.2 0 -152.4 0 152.4))
+      (shape (path B.Cu 1727.2 0 -152.4 0 152.4)) (attach off))
+    (padstack R (shape (rect F.Cu -863.6 -1016 863.6 1016))
+      (shape (rect B.Cu -863.6 -1016 863.6 1016)) (attach off))
+    (padstack t (shape (rect F.Cu -500 -500 500 500)) (attach off))
+    (padstack "Via[0-1]_800:400_um" (shape (circle F.Cu 800)) (shape (circle B.Cu 800))
+      (attach off)))
+  (network {nets}
+    (class c N0 N1 N2 N3 (circuit (use_via "Via[0-1]_800:400_um"))
+      (rule (width 300) (clearance 250)))))"""
+
+
+def test_a_rotated_oval_pad_is_its_outline_not_its_bounding_box():
+    board = build_board(parse_dsn(_socket_dsn(60, "y")))
+    oval = next(p for p in board.get_pins() if p.component_ref == "P3" and p.name == "2")
+    assert isinstance(oval.shape, Simplex) and not oval.shape.is_int_box()
+    box = oval.shape.bounding_box()
+    assert oval.shape.contains(oval.location)
+    assert not oval.shape.contains(box.ll) and not oval.shape.contains(box.ur)
+
+
+@pytest.mark.parametrize("layout", ["y", "perp"])
+def test_routes_leaving_a_rotated_socket_pass_the_exact_check(layout):
+    result = build_exact_routing_result(
+        parse_dsn(_socket_dsn(60, layout)), resolution=2, shove=True
+    )
+    assert result.unrouted == []
+
+
+# --- a via two connections share --------------------------------------------
+
+_SHARED_VIA = """(pcb shared (parser) (resolution um 10) (unit um)
+  (structure
+    (layer Top (type signal)) (layer Bottom (type signal))
+    (boundary (path pcb 0  0 0  20000 0  20000 -20000  0 -20000  0 0))
+    (via "Via[0-1]_800:400_um")
+    (rule (width 300) (clearance 250)))
+  (library
+    (padstack p (shape (rect Top -400 -400 400 400)) (attach off))
+    (padstack "Via[0-1]_800:400_um" (shape (circle Top 800)) (shape (circle Bottom 800))
+      (attach off))
+    (image PAD (pin p 1 0 0)))
+  (placement (component PAD
+    (place G1 3000 -5000 front 0) (place G2 3000 -15000 front 0)
+    (place G3 17000 -10000 front 0) (place S1 3000 -10000 front 0)
+    (place S2 17000 -3000 front 0)))
+  (network (net GND (pins G1-1 G2-1 G3-1)) (net SIG (pins S1-1 S2-1))))"""
+
+
+def _line(a, b, layer):
+    (x, y), (x1, y1) = a, b
+    out = [(x, y, layer)]
+    while x != x1:
+        x += 1 if x1 > x else -1
+        out.append((x, y, layer))
+    while y != y1:
+        y += 1 if y1 > y else -1
+        out.append((x, y, layer))
+    return out
+
+
+def test_a_shared_via_keeps_its_footprint_when_one_user_is_ripped():
+    dsn = parse_dsn(_SHARED_VIA)
+    s = dsn.resolution.value
+    router = GridRouter(
+        build_board(dsn),
+        trace_width=round(_rule_width_dsn(dsn) * s),
+        clearance=round(_rule_clearance_dsn(dsn) * s),
+        via_half=_via_half_board(dsn, s),
+    )
+    conns = router._conns = router._build_connections()
+    gnd = [c for c in conns if len({c.a.component_ref, c.b.component_ref} & {"G1", "G2", "G3"})]
+    sig = next(c for c in conns if c not in gnd)
+    first, second = gnd
+    g3 = router._cell_of(next(p for p in router.board.get_pins() if p.component_ref == "G3").location)
+    via = (g3[0] - 10, g3[1])
+
+    def through_via(conn):
+        a, b = router._cell_of(conn.a.location), router._cell_of(conn.b.location)
+        return _line(a, via, 0) + _line(via, b, 1)
+
+    router._commit(first, through_via(first))
+    router._commit(second, through_via(second))
+    footprint = [c for c in router._via_cells(via) if c != via]
+    router._rip(first)
+
+    assert second.routed and via in second.via_cells
+    assert all(router._via_claims.get(c) == [second.index] for c in footprint)
+    # another net still keeps its distance from the via that is left
+    assert all(router._enter_cost_base(c, 0, sig.net_no, False, conns) is None for c in footprint)
+
+
+def test_a_route_through_a_shared_via_rips_every_user():
+    """Two connections of a net share a via. Another net routed through it
+    in rip-up mode has to rip both, or the one left keeps its via under the
+    new trace and the exact check throws one of them out."""
+    dsn = parse_dsn(_SHARED_VIA)
+    s = dsn.resolution.value
+    router = GridRouter(
+        build_board(dsn),
+        trace_width=round(_rule_width_dsn(dsn) * s),
+        clearance=round(_rule_clearance_dsn(dsn) * s),
+        via_half=_via_half_board(dsn, s),
+    )
+    conns = router._conns = router._build_connections()
+    gnd = [c for c in conns if len({c.a.component_ref, c.b.component_ref} & {"G1", "G2", "G3"})]
+    sig = next(c for c in conns if c not in gnd)
+    first, second = gnd
+    g3 = router._cell_of(next(p for p in router.board.get_pins() if p.component_ref == "G3").location)
+    via = (g3[0] - 10, g3[1])
+
+    def through_via(conn):
+        a, b = router._cell_of(conn.a.location), router._cell_of(conn.b.location)
+        return _line(a, via, 0) + _line(via, b, 1)
+
+    router._commit(first, through_via(first))
+    router._commit(second, through_via(second))
+    # the via's copper alone: footprint cells no trace or trace halo covers
+    crossing = [
+        node
+        for c in router._via_cells(via)
+        for node in ((*c, 0), (*c, 1))
+        if node not in router._cell_owner and node not in router._halo
+    ]
+    assert crossing
+
+    assert router._crossed_owners(crossing, sig.net_no, conns) == {first.index, second.index}
+
+
+# --- a wider net class --------------------------------------------------------
+
+_WIDE = """(pcb wide (parser) (resolution um 10) (unit um)
+  (structure
+    (layer F.Cu (type signal))
+    (boundary (path pcb 0  0 0  20000 0  20000 -10000  0 -10000  0 0))
+    (rule (width 300) (clearance 250)))
+  (placement (component S (place P1 2000 -5000 front 0) (place P2 18000 -5000 front 0)
+     (place Q1 10000 {ylo} front 0) (place Q2 10000 {yhi} front 0)
+     (place Q3 10000 -1000 front 0) (place Q4 10000 -9000 front 0)))
+  (library (image S (pin pad 1 0 0)) (padstack pad (shape (rect F.Cu -600 -600 600 600)) (attach off)))
+  (network (net PWR (pins P1-1 P2-1)) (net SIG (pins Q1-1 Q3-1)) (net SIG2 (pins Q2-1 Q4-1))
+    (class Power PWR (rule (width 500) (clearance 250)))))"""
+
+
+@pytest.mark.parametrize("resolution", [1, 2])
+@pytest.mark.parametrize("gap", [900, 1000, 1075])
+def test_a_wide_net_past_pads_it_does_not_fit_between_is_not_refused(gap, resolution):
+    # 0.3 mm fits the gap between the two pads, 0.5 mm does not: the grid
+    # must see that, rather than lay it wide and have the exact check drop it
+    ylo, yhi = -5000 - gap // 2 - 600, -5000 + gap // 2 + 600
+    result = build_exact_routing_result(
+        parse_dsn(_WIDE.format(ylo=ylo, yhi=yhi)), resolution=resolution
+    )
+    assert result.unrouted == []
+
+
+def _wide_router():
+    dsn = parse_dsn(_WIDE.format(ylo=-6050, yhi=-3950))
+    s = dsn.resolution.value
+    pwr = next(i for i, net in enumerate(dsn.nets, 1) if net.name == "PWR")
+    return GridRouter(
+        build_board(dsn),
+        trace_width=round(_rule_width_dsn(dsn) * s),
+        clearance=round(_rule_clearance_dsn(dsn) * s),
+        resolution=2,
+        net_widths={pwr: 5000},
+    ), pwr
+
+
+def test_a_wide_trace_keeps_clear_of_a_default_one_at_the_grid_diagonal():
+    router, _pwr = _wide_router()
+    # 0.5 mm against 0.3 mm needs 0.25 + 0.25 + 0.15 = 0.65 mm between centres,
+    # on either axis, since the exact check compares boxes
+    need = 2500 + router.clearance + router.half_width
+    for dx, dy in [(2, 2), (2, 1), (1, 2)]:
+        assert max(dx, dy) * router.step < need
+        assert (dx, dy) in router._halo_for(2500)
+
+
+def test_a_wide_rip_up_route_counts_what_its_extra_width_crosses():
+    router, pwr_net = _wide_router()
+    conns = router._conns = router._build_connections()
+    pwr = next(c for c in conns if c.net_no == pwr_net)
+    other = next(c for c in conns if c.net_no != pwr_net)
+    # a default-width trace two cells from the wide route's path
+    x, y = 20, 5
+    router._commit(other, _line((x - 3, y + 2), (x + 3, y + 2), 0))
+    path = _line((x - 3, y), (x + 3, y), 0)
+    spread = router._spread_for(2500)
+    assert other.index not in router._crossed_owners(path, pwr.net_no, conns)
+    assert other.index in router._crossed_owners(path, pwr.net_no, conns, spread)
+
+
+def test_a_pad_cell_check_uses_the_rotated_outline():
+    board = build_board(parse_dsn(_socket_dsn(60, "y")))
+    router = GridRouter(board, trace_width=3000, clearance=2500, resolution=2)
+    oval = next(p for p in board.get_pins() if p.component_ref == "P3" and p.name == "2")
+    box = oval.shape.bounding_box()
+    margin = router.clearance + router.half_width
+    exact = set(router._pad_cells(oval.shape, box, margin))
+    boxed = set(router._cells_in_box(box, margin))
+    assert exact < boxed
+    for cell in boxed - exact:
+        c = router._cell_center(cell)
+        square = IntBox(c.x - margin, c.y - margin, c.x + margin, c.y + margin)
+        assert oval.shape.intersection(square).dimension() != 2
+
+
+def test_a_via_by_a_chamfered_corner_is_judged_round():
+    """The grid keeps a via's centre its radius plus the edge clearance from
+    the outline. The exact check used the via's square, whose corner reaches
+    past a 45-degree chamfer where the round via does not."""
+    from rpmroute.board.outline import BoardOutline
+    from rpmroute.geometry import IntBox, IntPoint
+    from rpmroute.route.exact_router import _inside_outline
+
+    # a 10 mm square with its lower-left corner cut at 45 degrees
+    outline = BoardOutline([IntPoint(*p) for p in
+                            [(30, 0), (100, 0), (100, 100), (0, 100), (0, 30)]])
+    half, edge = 4, 1
+    via = IntPoint(19, 20)  # its centre 6.4 from the chamfer x + y = 30
+    square = IntBox(via.x - half, via.y - half, via.x + half, via.y + half)
+    assert not outline.box_clear(square, edge)  # the square's corner: 0.7 away
+    assert _inside_outline(outline, [], [via], half + edge, edge)
+    # 4.2 from the chamfer: the round via itself is too close
+    assert not _inside_outline(outline, [], [IntPoint(18, 18)], half + edge, edge)

tests/route/test_negotiate.py

@@ -0,0 +1,65 @@
+"""--negotiate: PathFinder-style rounds on the empty board before routing."""
+
+from __future__ import annotations
+
+from pathlib import Path
+
+import pytest
+
+from rpmroute.board import build_board
+from rpmroute.dsn import parse_dsn
+from rpmroute.route.grid_router import GridRouter
+from rpmroute.route.pipeline import _rule_clearance_dsn, _rule_width_dsn, route_dsn_board
+
+FIXTURES = Path(__file__).resolve().parent.parent / "dsn" / "fixtures"
+
+
+def _router(name, negotiate):
+    dsn = parse_dsn((FIXTURES / name).read_text())
+    s = dsn.resolution.value
+    return GridRouter(
+        build_board(dsn),
+        trace_width=round(_rule_width_dsn(dsn) * s),
+        clearance=round(_rule_clearance_dsn(dsn) * s),
+        negotiate=negotiate,
+    )
+
+
+def test_negotiation_leaves_the_board_empty_and_the_ends_as_they_were():
+    router = _router("true_density.dsn", 3)
+    conns = router._conns = router._build_connections()
+    ends = [(c.a_end, c.b_end) for c in conns]
+    router._negotiate(list(conns), conns)
+    assert router._history  # a dense board has contested cells
+    assert not router._cell_owner and not router._halo and not router._via_claims
+    assert not any(c.routed for c in conns)
+    assert [(c.a_end, c.b_end) for c in conns] == ends
+    assert router._present is None
+
+
+def test_sharing_is_priced_only_for_other_nets():
+    router = _router("true_density.dsn", 1)
+    node = (3, 4, 0)
+    router._history[node] = 2.0
+    router._present, router._present_cost = {node: {7: 1, 9: 2}}, 0.5
+    assert router._congestion(node, 7) == pytest.approx(2.5)  # one other net
+    assert router._congestion(node, 5) == pytest.approx(3.0)  # two other nets
+    router._present = None
+    assert router._congestion(node, 5) == pytest.approx(2.0)  # history only, after
+
+
+@pytest.mark.parametrize("name", ["ripup_needed.dsn", "true_density.dsn", "kicad_routable.dsn"])
+def test_negotiated_routing_keeps_the_occupancy_honest(name):
+    """Only routed connections hold cells afterwards, as without negotiation."""
+    router = _router(name, 3)
+    router.route()
+    conns = router._conns
+    assert all(conns[i].routed for i in router._cell_owner.values())
+    assert all(conns[i].routed for claims in router._halo.values() for i in claims)
+
+
+def test_option_reaches_the_router_and_is_off_by_default():
+    text = (FIXTURES / "kicad_routable.dsn").read_text()
+    plain, _, _ = route_dsn_board(parse_dsn(text))
+    again, _, _ = route_dsn_board(parse_dsn(text), negotiate=0)
+    assert plain.unrouted == again.unrouted

tests/route/test_net_widths.py

@@ -0,0 +1,42 @@
+"""Net classes wider than the default are routed at their width where it fits."""
+
+from __future__ import annotations
+
+from rpmroute.dsn import parse_dsn
+from rpmroute.route.pipeline import build_exact_routing_result
+
+_BOARD = """(pcb widths (parser) (resolution um 10) (unit um)
+  (structure
+    (layer F.Cu (type signal))
+    (boundary (path pcb 0  0 0  20000 0  20000 -10000  0 -10000  0 0))
+    {keepouts}
+    (rule (width 150) (clearance 150)))
+  (placement (component S (place P1 2000 -5000 front 0) (place P2 18000 -5000 front 0)))
+  (library (image S (pin pad 1 0 0)) (padstack pad (shape (rect F.Cu -600 -600 600 600)) (attach off)))
+  (network (net PWR (pins P1-1 P2-1))
+    (class Power PWR (rule (width 400) (clearance 150)))))"""
+
+# two keepouts leave a 0.65 mm channel: room for 0.15 mm (0.45), not for 0.4 mm (0.7)
+_CHANNEL = (
+    '(keepout "" (polygon F.Cu 0  9000 0  11000 0  11000 -4675  9000 -4675))\n'
+    '    (keepout "" (polygon F.Cu 0  9000 -5325  11000 -5325  11000 -10000  9000 -10000))'
+)
+
+
+def _route(keepouts=""):
+    return build_exact_routing_result(parse_dsn(_BOARD.format(keepouts=keepouts)), resolution=2)
+
+
+def test_a_wider_class_is_routed_and_written_at_its_width():
+    result = _route()
+    assert result.unrouted == [] and result.narrowed == []
+    widths = {w.width for net in result.nets for w in net.wires}
+    assert widths == {400.0}
+
+
+def test_a_wider_class_that_does_not_fit_falls_back_to_the_default():
+    result = _route(_CHANNEL)
+    assert result.unrouted == []
+    assert [net for net, _a, _b in result.narrowed] == ["PWR"]
+    widths = {w.width for net in result.nets for w in net.wires}
+    assert widths == {150.0}

tests/route/test_orders.py

@@ -4,8 +4,14 @@ from __future__ import annotations
 
 from pathlib import Path
 
-from freeroute.cli import main
-from freeroute.route.orders import best_of_orders, candidate_seeds, route_once, score
+from rpmroute.cli import main
+from rpmroute.route.orders import (
+    best_of_orders,
+    candidate_seeds,
+    promote_failures,
+    route_once,
+    score,
+)
 
 FIXTURES = Path(__file__).resolve().parent.parent / "dsn" / "fixtures"
 # Greedy (no rip-up), the default order strands a net here and seeds 1 to 3 do not.
@@ -42,3 +48,31 @@ def test_cli_orders_writes_the_best_session(tmp_path, capsys):
     assert "tried 3 orders, kept --seed 1" in err
     assert "not routed" not in err
     assert out.read_text().startswith("(session")
+
+
+def test_promoting_the_failed_connection_routes_it():
+    best, rounds = promote_failures(RIPUP, "grid", GREEDY, rounds=3)
+    assert rounds == [(1, 0), (0, 0)]  # stops once nothing fails
+    assert score(best) == (0, 0)
+
+
+def test_nothing_promoted_is_the_plain_order():
+    plain = route_once(RIPUP, "grid", {}, None)
+    empty = route_once(RIPUP, "grid", {"route_first": frozenset()}, None)
+    assert plain == empty
+
+
+def test_cli_promote_failures(tmp_path, capsys):
+    out = tmp_path / "p.ses"
+    rc = main(
+        [
+            str(FIXTURES / "ripup_needed.dsn"),
+            "--no-rip-up",
+            "--promote-failures",
+            "3",
+            "-do",
+            str(out),
+        ]
+    )
+    assert rc == 0
+    assert "2 rounds, unrouted 1, 0" in capsys.readouterr().err

tests/route/test_real_board_geometry.py

@@ -6,9 +6,9 @@ import math
 
 import pytest
 
-from freeroute.board import build_board
-from freeroute.dsn import parse_dsn
-from freeroute.route.pipeline import route_dsn_board_exact
+from rpmroute.board import build_board
+from rpmroute.dsn import parse_dsn
+from rpmroute.route.pipeline import route_dsn_board_exact
 
 # 20 x 20 mm board whose corners are rounded with a 3 mm radius, as polylines
 _R = 3000.0
@@ -51,23 +51,26 @@ def test_routes_keep_edge_clearance_at_a_rounded_corner():
                 assert outline.edge_distance(p) >= half + 500 * scale - 1
 
 
-@pytest.mark.parametrize(("resolution", "escape"), [(1, 2), (4, 5)])
-def test_every_pin_of_a_half_millimetre_pitch_row_escapes(resolution, escape):
+@pytest.mark.parametrize("resolution", [1, 4])
+def test_every_pin_of_a_half_millimetre_pitch_row_escapes(resolution):
     # Five 0.3 mm pads at 0.5 mm pitch, each wired to its own pad 8 mm away.
     # Between two neighbours a trace's centre has a legal band only 0.15 mm
-    # wide. At resolution 1 the 0.4 mm grid misses most bands; at 4 its
-    # 0.1 mm columns cannot, and every pin gets out, as the JAR manages.
+    # wide. At resolution 4 the 0.1 mm columns cannot miss it. At resolution
+    # 1 the 0.4 mm grid misses most bands, but a stub leaves its pin straight
+    # along the band and jogs to the column only past the pads, so every pin
+    # gets out there too, as the JAR manages (only 2 did before).
     places = " ".join(f"(place R{i} {6000 + 500 * i} -6000 front 0)" for i in range(5))
     places += " " + " ".join(f"(place F{i} {6000 + 500 * i} -14000 front 0)" for i in range(5))
     nets = " ".join(f"(net N{i} (pins R{i}-1 F{i}-1))" for i in range(5))
     result, _, _ = route_dsn_board_exact(
         parse_dsn(_dsn(f"(component P {places})", nets)), resolution=resolution
     )
-    assert len(result.routed_net_numbers) == escape
+    assert len(result.routed_net_numbers) == 5
+    assert result.drc_clean
 
 
 def test_resolution_one_has_no_halo_so_the_grid_is_unchanged():
-    from freeroute.route.grid_router import GridRouter
+    from rpmroute.route.grid_router import GridRouter
 
     board = build_board(parse_dsn(_dsn("", "")))
     assert GridRouter(board, trace_width=2500, clearance=1500)._halo_offsets == []
@@ -98,7 +101,7 @@ def test_heuristic_weight_bounds_route_length():
 
 # --- copper zones (DSN planes) -----------------------------------------------
 # rc4 power stage: pads inside "keep router off" pours connect through the pour,
-# and freeroute, not knowing zones, dropped every such connection.
+# and rpmroute, not knowing zones, dropped every such connection.
 
 _ZONE = "(plane N (polygon F.Cu 0  4000 -4000  10000 -4000  10000 -10000  4000 -10000  4000 -4000))"
 _NO_TRACKS = "(wire_keepout \"pour\" (polygon F.Cu 0  4000 -4000  10000 -4000  10000 -10000  4000 -10000))"
@@ -118,7 +121,7 @@ def test_planes_are_read_and_are_not_obstacles():
 
 
 def test_pads_in_one_zone_need_no_route_between_them():
-    from freeroute.route.grid_router import _connected_groups
+    from rpmroute.route.grid_router import _connected_groups
 
     board = build_board(_zone_board())
     pins = sorted(board.get_pins(), key=lambda p: p.component_ref)
@@ -152,7 +155,7 @@ def test_a_pour_other_nets_can_cross_is_not_trusted_to_connect():
 
 def test_cli_names_the_connections_it_could_not_route(tmp_path, capsys):
     # a keepout wall across the board on both layers: A and B cannot be joined
-    from freeroute.cli import main
+    from rpmroute.cli import main
 
     wall = " ".join(
         f"(keepout \"wall\" (polygon {layer} 0  9000 1000  11000 1000  11000 -21000  9000 -21000))"
@@ -202,8 +205,20 @@ def test_smd_pads_reach_an_inner_plane_by_their_own_via():
     assert all(names[layer] in ("F.Cu", "B.Cu") for segs in result.result.wires.values() for layer, _ in segs)
 
 
+def test_a_pad_outside_the_plane_routes_to_it():
+    # G1 sits left of a plane that covers only the right half, so its route
+    # has to reach the plane's cells: those ends are the plane, not a pin
+    dsn_text = _four_layer_dsn().replace(
+        "(plane GND (polygon In1.Cu 0  500 -500  29500 -500  29500 -29500  500 -29500  500 -500))",
+        "(plane GND (polygon In1.Cu 0  15000 -500  29500 -500  29500 -29500  15000 -29500  15000 -500))",
+    )
+    result, _scale, _names = route_dsn_board_exact(parse_dsn(dsn_text))
+    gnd = next(i + 1 for i, n in enumerate(parse_dsn(dsn_text).nets) if n.name == "GND")
+    assert gnd in result.result.routed_net_numbers
+
+
 def test_a_through_hole_pad_inside_a_plane_needs_no_route():
-    from freeroute.route.grid_router import _connected_groups
+    from rpmroute.route.grid_router import _connected_groups
 
     board = build_board(parse_dsn(_four_layer_dsn()))
     plane = [z for z in board.get_conduction_areas() if z.name == "GND"]
@@ -211,3 +226,29 @@ def test_a_through_hole_pad_inside_a_plane_needs_no_route():
     groups = _connected_groups(gnd_pins, plane, frozenset(id(z) for z in plane))
     hub = next(g for g in groups if g[1])
     assert [p.component_ref for p in hub[0]] == ["GT"]
+
+
+def test_a_pad_inside_a_via_keepout_reaches_the_plane_by_a_via_outside_it():
+    # a sensor's GND pad: vias are forbidden under the body, so the route
+    # has to leave on the top layer and drop to the plane past the keepout
+    dsn = parse_dsn("""(pcb repro (parser) (resolution um 10) (unit um)
+  (structure
+    (layer F.Cu (type signal)) (layer In1.Cu (type power)) (layer In2.Cu (type power))
+    (layer B.Cu (type signal))
+    (boundary (path pcb 0  0 0  20000 0  20000 -20000  0 -20000  0 0))
+    (plane GND (polygon In1.Cu 0  500 -500  19500 -500  19500 -19500  500 -19500  500 -500))
+    (via_keepout "" (polygon signal 0  8500 -8500  11500 -8500  11500 -11500  8500 -11500  8500 -8500))
+    (via "Via[0-3]_600:300_um") (rule (width 150) (clearance 150)))
+  (placement (component S (place G1 10000 -10000 front 0)))
+  (library
+    (image S (pin smd 1 0 0))
+    (padstack smd (shape (rect F.Cu -175 -300 175 300)) (attach off))
+    (padstack "Via[0-3]_600:300_um" (shape (circle F.Cu 600)) (shape (circle B.Cu 600)) (attach off)))
+  (network (net GND (pins G1-1))))""")
+    exact, scale, _names = route_dsn_board_exact(dsn, resolution=2)
+    assert exact.result.failed == []
+    (via,) = exact.result.vias[1]
+    half = 300 * scale  # the via's radius
+    outside = (via.x + half <= 8500 * scale or via.x - half >= 11500 * scale
+               or via.y - half >= -8500 * scale or via.y + half <= -11500 * scale)
+    assert outside, f"via at {via} is inside the via keepout"

tests/route/test_reduce_vias.py

@@ -0,0 +1,123 @@
+"""Via reduction: each net with vias is routed again with vias made dear,
+kept only when it fails nothing new and has fewer vias."""
+
+from __future__ import annotations
+
+from rpmroute.board import build_board
+from rpmroute.dsn import parse_dsn
+from rpmroute.geometry import IntPoint
+from rpmroute.route.grid_router import RouteResult
+from rpmroute.route.pipeline import (
+    _rule_clearance_dsn,
+    _rule_width_dsn,
+    _via_half_board,
+    route_dsn_board_exact,
+)
+from rpmroute.route.vias import reduce_vias
+
+VIA = "Via[0-1]_600:300_um"
+
+
+def _board(second_on_bottom: bool = False) -> str:
+    """Two pads 14 mm apart on an empty two-layer board; the second on the
+    bottom layer when ``second_on_bottom``."""
+    p2_stack = "Bot_Pad" if second_on_bottom else "Top_Pad"
+    return f"""(pcb "vias.dsn"
+  (parser (string_quote ") (space_in_quoted_tokens on) (host_cad "t") (host_version "1"))
+  (resolution um 10)
+  (unit um)
+  (structure
+    (layer F.Cu (type signal) (property (index 0)))
+    (layer B.Cu (type signal) (property (index 1)))
+    (boundary (path pcb 0  0 0  20000 0  20000 -10000  0 -10000  0 0))
+    (via "{VIA}")
+    (rule (width 200) (clearance 200))
+  )
+  (library
+    (padstack Top_Pad (shape (rect F.Cu -300 -300 300 300)) (attach off))
+    (padstack Bot_Pad (shape (rect B.Cu -300 -300 300 300)) (attach off))
+    (padstack "{VIA}" (shape (circle F.Cu 600)) (shape (circle B.Cu 600)) (attach off))
+    (image TOP (pin Top_Pad 1 0 0))
+    (image SECOND (pin {p2_stack} 1 0 0))
+  )
+  (placement
+    (component TOP (place P1 3000 -5000 front 0))
+    (component SECOND (place P2 17000 -5000 front 0))
+  )
+  (network
+    (net N (pins P1-1 P2-1))
+    (class default (rule (width 200) (clearance 200)))
+  )
+  (wiring)
+)
+"""
+
+
+def _route_args(dsn) -> dict:
+    scale = max(dsn.resolution.value, 1)
+    return {
+        "heuristic_weight": 1.0,
+        "via_half": _via_half_board(dsn, scale),
+        "edge_clearance": None,
+        "trace_width": round(_rule_width_dsn(dsn) * scale),
+        "clearance": round(_rule_clearance_dsn(dsn) * scale),
+        "layers": None,
+        "max_passes": 10,
+        "rip_up": True,
+        "shove": False,
+        "diagonal": False,
+        "rollback": True,
+        "tree_nets": True,
+        "net_widths": {},
+        "via_drill": None,
+        "hole_to_hole": 0,
+        "via_cost": 10.0,
+    }
+
+
+def _reduce(text: str, result: RouteResult) -> RouteResult:
+    dsn = parse_dsn(text)
+    args = _route_args(dsn)
+    return reduce_vias(
+        dsn, result, args, resolution=1, margin=20000,
+        via_half=args["via_half"], via_drill=2 * args["via_half"], via_name=VIA,
+    )
+
+
+def _pins(text: str) -> tuple[IntPoint, IntPoint]:
+    pins = {p.component_ref: p.location for p in build_board(parse_dsn(text)).get_pins()}
+    return pins["P1"], pins["P2"]
+
+
+def test_a_needless_via_pair_is_routed_out():
+    text = _board()
+    a, b = _pins(text)
+    # a detour: down to the bottom layer and back up, for no reason
+    v1, v2 = IntPoint(a.x + 40000, a.y), IntPoint(b.x - 40000, b.y)
+    detour = RouteResult(1000)
+    detour.add_wire(1, 0, [a, v1])
+    detour.add_via(1, v1)
+    detour.add_wire(1, 1, [v1, v2])
+    detour.add_via(1, v2)
+    detour.add_wire(1, 0, [v2, b])
+    out = _reduce(text, detour)
+    assert out.failed == []
+    assert sum(len(v) for v in out.vias.values()) == 0
+    assert out.wires.get(1)
+
+
+def test_a_needed_via_stays():
+    text = _board(second_on_bottom=True)
+    exact, _scale, _layers = route_dsn_board_exact(parse_dsn(text), resolution=1)
+    routed = exact.result
+    assert routed.failed == []
+    vias_before = sum(len(set(v)) for v in routed.vias.values())
+    assert vias_before >= 1
+    out = _reduce(text, routed)
+    assert out.failed == []
+    assert sum(len(set(v)) for v in out.vias.values()) == vias_before
+
+
+def test_the_flag_runs_the_stage_end_to_end():
+    exact, _scale, _layers = route_dsn_board_exact(parse_dsn(_board()), resolution=1, reduce_vias=True)
+    assert exact.result.failed == []

tests/route/test_rollback.py

@@ -0,0 +1,43 @@
+"""--rollback: a rip-up that loses connections is undone, leaving no trace."""
+
+from __future__ import annotations
+
+from pathlib import Path
+
+import pytest
+
+from rpmroute.board import build_board
+from rpmroute.dsn import parse_dsn
+from rpmroute.route.grid_router import GridRouter
+from rpmroute.route.pipeline import _rule_clearance_dsn, _rule_width_dsn, route_dsn_board
+
+FIXTURES = Path(__file__).resolve().parent.parent / "dsn" / "fixtures"
+
+
+def _routed_router(name):
+    dsn = parse_dsn((FIXTURES / name).read_text())
+    s = dsn.resolution.value
+    router = GridRouter(
+        build_board(dsn),
+        trace_width=round(_rule_width_dsn(dsn) * s),
+        clearance=round(_rule_clearance_dsn(dsn) * s),
+        rollback=True,
+    )
+    return router, router.route()
+
+
+@pytest.mark.parametrize("name", ["ripup_needed.dsn", "true_density.dsn", "kicad_routable.dsn"])
+def test_occupancy_only_holds_routed_connections(name):
+    router, _ = _routed_router(name)
+    conns = router._conns
+    assert all(conns[i].routed for i in router._cell_owner.values())
+    assert all(conns[i].routed for claims in router._via_claims.values() for i in claims)
+    assert all(conns[i].routed for claims in router._halo.values() for i in claims)
+
+
+@pytest.mark.parametrize("name", ["ripup_needed.dsn", "true_density.dsn", "kicad_routable.dsn"])
+def test_rollback_never_routes_fewer_than_plain_rip_up(name):
+    text = (FIXTURES / name).read_text()
+    plain, _, _ = route_dsn_board(parse_dsn(text), rollback=False)
+    undo, _, _ = route_dsn_board(parse_dsn(text))
+    assert undo.unrouted <= plain.unrouted

tests/route/test_room_pack.py

@@ -23,11 +23,11 @@ from pathlib import Path
 
 import pytest
 
-from freeroute.dsn import parse_dsn
-from freeroute.dsn.sexp import parse
-from freeroute.geometry import Polyline, PolylineShape
-from freeroute.route import route, route_dsn_board_rooms
-from freeroute.route.pipeline import _rule_clearance_dsn
+from rpmroute.dsn import parse_dsn
+from rpmroute.dsn.sexp import parse
+from rpmroute.geometry import Polyline, PolylineShape
+from rpmroute.route import route, route_dsn_board_rooms
+from rpmroute.route.pipeline import _rule_clearance_dsn
 
 FIXTURES = Path(__file__).resolve().parent.parent / "dsn" / "fixtures"
 CHANNEL_PACK = FIXTURES / "channel_pack.dsn"
@@ -134,7 +134,7 @@ def test_channel_pack_is_deterministic():
 def test_channel_pack_endpoints_stay_on_pads():
     dsn = parse_dsn(CHANNEL_PACK.read_text())
     board_pins: dict[int, set[tuple[int, int]]] = {}
-    from freeroute.board import build_board
+    from rpmroute.board import build_board
 
     for pin in build_board(dsn).get_pins():
         for net_no in pin.net_nos:

tests/route/test_room_router.py

@@ -13,11 +13,11 @@ import sys
 
 import pytest
 
-from freeroute.board import build_board
-from freeroute.dsn import parse_dsn
-from freeroute.dsn.sexp import parse
-from freeroute.geometry import Polyline
-from freeroute.route import route, route_dsn_board_exact, route_dsn_board_rooms
+from rpmroute.board import build_board
+from rpmroute.dsn import parse_dsn
+from rpmroute.dsn.sexp import parse
+from rpmroute.geometry import Polyline
+from rpmroute.route import route, route_dsn_board_exact, route_dsn_board_rooms
 
 sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
 
@@ -31,7 +31,7 @@ WIDE_DOOR = FIXTURES / "rooms_wide_door.dsn"
 
 
 def _clearance(dsn, scale):
-    from freeroute.route.pipeline import _rule_clearance_dsn
+    from rpmroute.route.pipeline import _rule_clearance_dsn
 
     return round(_rule_clearance_dsn(dsn) * scale)
 

tests/route/test_room_shove.py

@@ -32,12 +32,12 @@ import sys
 
 import pytest
 
-from freeroute.board import build_board
-from freeroute.dsn import parse_dsn
-from freeroute.dsn.sexp import parse
-from freeroute.geometry import IntBox, IntPoint, Polyline, PolylineShape
-from freeroute.route import route, route_dsn_board_exact, route_dsn_board_rooms
-from freeroute.route.pipeline import _rule_clearance_dsn
+from rpmroute.board import build_board
+from rpmroute.dsn import parse_dsn
+from rpmroute.dsn.sexp import parse
+from rpmroute.geometry import IntBox, IntPoint, Polyline, PolylineShape
+from rpmroute.route import route, route_dsn_board_exact, route_dsn_board_rooms
+from rpmroute.route.pipeline import _rule_clearance_dsn
 
 
 def _emitted_drc_violations(result, clearance):
@@ -265,8 +265,8 @@ def test_shove_is_byte_identical_on_foundation_fixtures(fixture):
 
 
 def test_project_gate_reduces_to_clamp_without_occupancy():
-    from freeroute.board.search_tree import ShapeSearchTree
-    from freeroute.route.room_router import _Door, _edge_gate, _project_gate
+    from rpmroute.board.search_tree import ShapeSearchTree
+    from rpmroute.route.room_router import _Door, _edge_gate, _project_gate
 
     door = _Door(other=1, kind="edge", lo=IntPoint(0, 100), hi=IntPoint(200, 100))
     tree = ShapeSearchTree()
@@ -277,8 +277,8 @@ def test_project_gate_reduces_to_clamp_without_occupancy():
 
 
 def test_project_gate_avoids_other_net_copper_on_the_door():
-    from freeroute.board.search_tree import ShapeSearchTree, TreeShape
-    from freeroute.route.room_router import _Door, _project_gate
+    from rpmroute.board.search_tree import ShapeSearchTree, TreeShape
+    from rpmroute.route.room_router import _Door, _project_gate
 
     door = _Door(other=1, kind="edge", lo=IntPoint(0, 100), hi=IntPoint(200, 100))
     tree = ShapeSearchTree()
@@ -293,7 +293,7 @@ def test_project_gate_avoids_other_net_copper_on_the_door():
 
 
 def test_free_intervals_splits_around_forbidden_band():
-    from freeroute.route.room_router import _best_free_point, _free_intervals
+    from rpmroute.route.room_router import _best_free_point, _free_intervals
 
     free = _free_intervals(0, 200, [(87, 113)])
     assert free == [(0, 87), (113, 200)]

tests/route/test_router.py

@@ -16,11 +16,11 @@ import sys
 
 import pytest
 
-from freeroute.board import build_board
-from freeroute.dsn import parse_dsn
-from freeroute.dsn.sexp import parse
-from freeroute.route import route, route_dsn_board
-from freeroute.ses.writer import ses_scale
+from rpmroute.board import build_board
+from rpmroute.dsn import parse_dsn
+from rpmroute.dsn.sexp import parse
+from rpmroute.route import route, route_dsn_board
+from rpmroute.ses.writer import ses_scale
 
 sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
 
@@ -287,11 +287,11 @@ def test_connectivity_parity_on_congested_board():
     if not HAS_ORACLE:
         pytest.skip("FreeRouting oracle unavailable")
     our_nets = routed_net_set(route(RIPUP.read_text()))
-    assert our_nets == {"NET_A", "NET_B"}  # freeroute connects both via rip-up
+    assert our_nets == {"NET_A", "NET_B"}  # rpmroute connects both via rip-up
     oracle_nets = routed_net_set(route_dsn(RIPUP, max_passes=3, timeout=300))
     if not oracle_nets:
         # the reference JAR does not route this synthetic single-signal-layer
-        # board (it expects a routing/via layer); freeroute's rip-up connecting
+        # board (it expects a routing/via layer); rpmroute's rip-up connecting
         # both nets is already asserted above and by the fast tests.
         pytest.skip("reference JAR routed nothing on the synthetic single-layer board")
     assert oracle_nets <= our_nets  # rip-up matches the JAR's connectivity
@@ -306,7 +306,7 @@ def test_connectivity_parity_on_crossing_board():
     our_nets = routed_net_set(route(CROSSING.read_text()))
     oracle_nets = routed_net_set(route_dsn(CROSSING, max_passes=3, timeout=300))
     assert oracle_nets, "oracle routed nothing on a routable board"
-    assert oracle_nets <= our_nets  # freeroute connects every net the JAR does
+    assert oracle_nets <= our_nets  # rpmroute connects every net the JAR does
 
 
 @pytest.mark.oracle

tests/route/test_shove.py

@@ -17,10 +17,10 @@ import sys
 
 import pytest
 
-from freeroute.dsn import parse_dsn
-from freeroute.dsn.sexp import parse
-from freeroute.route import route, route_dsn_board_exact
-from freeroute.route.pipeline import _rule_clearance_dsn
+from rpmroute.dsn import parse_dsn
+from rpmroute.dsn.sexp import parse
+from rpmroute.route import route, route_dsn_board_exact
+from rpmroute.route.pipeline import _rule_clearance_dsn
 
 sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
 
@@ -66,7 +66,7 @@ def test_shove_result_is_deterministic():
 
 
 def test_shoved_trace_endpoints_still_on_pads():
-    from freeroute.board import build_board
+    from rpmroute.board import build_board
 
     on, _, _ = route_dsn_board_exact(parse_dsn(SHOVE.read_text()), rip_up=False, shove=True)
     board = build_board(parse_dsn(SHOVE.read_text()))

tests/route/test_smooth.py

@@ -0,0 +1,162 @@
+"""Smoothing: staircases become octilinear runs, corners are chamfered, and
+nothing it keeps (ends, vias, joints, pads it crosses) moves."""
+
+from __future__ import annotations
+
+from rpmroute.dsn import parse_dsn
+from rpmroute.route.smooth import smooth
+from rpmroute.route.verify import verify_result
+from rpmroute.ses.model import RoutedVia, RoutedWire, RoutingResult
+
+VIA = "Via[0-1]_600:300_um"
+
+
+def _board(extra_pads: str = "", extra_places: str = "", nets: str = "") -> str:
+    """A 30 x 30 mm two-layer board, units um, 0.2 mm track and clearance.
+    A1 at (2, -2) mm and A2 at (22, -22) mm are net SIG."""
+    return f"""(pcb "smooth.dsn"
+  (parser (string_quote ") (space_in_quoted_tokens on) (host_cad "t") (host_version "1"))
+  (resolution um 10)
+  (unit um)
+  (structure
+    (layer F.Cu (type signal) (property (index 0)))
+    (layer B.Cu (type signal) (property (index 1)))
+    (boundary (path pcb 0  0 0  30000 0  30000 -30000  0 -30000  0 0))
+    (via "{VIA}")
+    (rule (width 200) (clearance 200))
+  )
+  (library
+    (padstack P (shape (rect F.Cu -300 -300 300 300)) (attach off))
+    (padstack "{VIA}" (shape (circle F.Cu 600)) (shape (circle B.Cu 600)) (attach off))
+    (image PAD (pin P 1 0 0))
+    {extra_pads}
+  )
+  (placement
+    (component PAD (place A1 2000 -2000 front 0) (place A2 22000 -22000 front 0) {extra_places})
+  )
+  (network
+    (net SIG (pins A1-1 A2-1))
+    {nets}
+    (class default (rule (width 200) (clearance 200)))
+  )
+  (wiring)
+)
+"""
+
+
+def _staircase(a, b, step):
+    """Points from ``a`` to ``b`` (DSN um) in alternating x and y steps."""
+    (x, y), (bx, by) = a, b
+    pts = [(x, y)]
+    sx = step if bx > x else -step
+    sy = step if by > y else -step
+    while (x, y) != (bx, by):
+        if x != bx:
+            x = x + sx if abs(bx - x) > step else bx
+            pts.append((x, y))
+        if y != by:
+            y = y + sy if abs(by - y) > step else by
+            pts.append((x, y))
+    return pts
+
+
+def _wire(pts, layer="F.Cu", fixed=False):
+    return RoutedWire(layer=layer, width=200, coords=[v for p in pts for v in p], fixed=fixed)
+
+
+def _points(wire):
+    c = wire.coords
+    return [(round(c[i]), round(c[i + 1])) for i in range(0, len(c), 2)]
+
+
+def _result(*wires, vias=(), net="SIG"):
+    result = RoutingResult()
+    for w in wires:
+        result.add_wire(net, w)
+    for x, y in vias:
+        result.net(net, create=True).vias.append(RoutedVia(padstack=VIA, x=x, y=y))
+    return result
+
+
+def test_a_staircase_becomes_one_diagonal():
+    dsn = parse_dsn(_board())
+    stair = _staircase((2000, -2000), (22000, -22000), 1000)
+    result = _result(_wire(stair))
+    report = smooth(dsn, result)
+    pts = _points(result.nets[0].wires[0])
+    assert pts == [(2000, -2000), (22000, -22000)]
+    assert report.wires_changed == 1 and report.after.right_angles == 0
+    assert report.after.total_mm < report.before.total_mm
+    assert verify_result(dsn, result).clean
+
+
+def test_a_pad_in_the_way_is_gone_round():
+    # another net's pad sits on the diagonal shortcut of an L-shaped route
+    dsn = parse_dsn(_board(extra_places="(place B1 12000 -12000 front 0) (place B2 28000 -28000 front 0)",
+                           nets="(net OTHER (pins B1-1 B2-1))"))
+    result = _result(_wire([(2000, -2000), (22000, -2000), (22000, -22000)]))
+    report = smooth(dsn, result)
+    pts = _points(result.nets[0].wires[0])
+    assert pts[0] == (2000, -2000) and pts[-1] == (22000, -22000)
+    assert report.wires_changed == 1  # the corner is chamfered, short of the pad
+    assert verify_result(dsn, result).clean
+
+
+def test_a_joint_and_a_via_stay():
+    dsn = parse_dsn(_board(extra_places="(place A3 22000 -2000 front 0)",
+                           nets="").replace("(pins A1-1 A2-1)", "(pins A1-1 A2-1 A3-1)"))
+    stair = _staircase((2000, -2000), (22000, -22000), 1000)
+    joint = stair[11]  # A3's leg ends here, on the staircase
+    leg = _wire([(22000, -2000), (joint[0], -2000), joint])
+    via = stair[25]
+    result = _result(_wire(stair), leg, vias=[via])
+    smooth(dsn, result)
+    pts = _points(result.nets[0].wires[0])
+    assert joint in pts and via in pts
+    assert pts[0] == (2000, -2000) and pts[-1] == (22000, -22000)
+    assert verify_result(dsn, result).clean
+
+
+def test_the_board_edge_is_kept_clear_of():
+    # a staircase hugging the top edge: a chamfer may not push copper over it
+    dsn = parse_dsn(_board(extra_places="(place A3 22000 -500 front 0)").replace(
+        "(pins A1-1 A2-1)", "(pins A1-1 A3-1)"))
+    wire = _wire([(2000, -2000), (2000, -500), (22000, -500)])
+    result = _result(wire)
+    smooth(dsn, result, edge_clearance_mm=0.3)
+    for _x, y in _points(result.nets[0].wires[0]):
+        assert -y >= 300 + 100  # half width + edge clearance from y = 0
+
+
+def test_fixed_wiring_is_left_alone():
+    dsn = parse_dsn(_board())
+    stair = _staircase((2000, -2000), (22000, -22000), 1000)
+    result = _result(_wire(stair, fixed=True))
+    report = smooth(dsn, result)
+    assert _points(result.nets[0].wires[0]) == stair
+    assert report.wires == 0
+
+
+def test_a_detour_with_nothing_in_its_way_is_straightened():
+    dsn = parse_dsn(_board(extra_places="(place A3 22000 -2000 front 0)").replace(
+        "(pins A1-1 A2-1)", "(pins A3-1 A2-1)"))
+    # a U out to x = 12 mm and back, with nothing between its ends
+    result = _result(_wire([(22000, -2000), (12000, -2000), (12000, -22000), (22000, -22000)]))
+    report = smooth(dsn, result)
+    assert _points(result.nets[0].wires[0]) == [(22000, -2000), (22000, -22000)]
+    assert (report.before.right_angles, report.after.right_angles) == (2, 0)
+    assert verify_result(dsn, result).clean
+
+
+def test_a_jog_too_small_for_a_long_diagonal_stays_square():
+    # a 0.1 mm jog halfway: its 45-degree leg would be shorter than two track
+    # widths, a kink beside the copper that leaves pour slivers
+    dsn = parse_dsn(_board(extra_places="(place A3 2100 -22000 front 0)").replace(
+        "(pins A1-1 A2-1)", "(pins A1-1 A3-1)"))
+    wire = [(2000, -2000), (2000, -12000), (2100, -12000), (2100, -22000)]
+    result = _result(_wire(wire))
+    smooth(dsn, result)
+    pts = _points(result.nets[0].wires[0])
+    for a, b in zip(pts, pts[1:], strict=False):
+        if a[0] != b[0] and a[1] != b[1]:
+            assert (b[0] - a[0]) ** 2 + (b[1] - a[1]) ** 2 >= (2 * 200) ** 2

tests/route/test_straight_pin_exits.py

@@ -0,0 +1,58 @@
+"""Pins of a 1.27 mm pitch row routed at 1.0 mm (the RN2483 module on the
+TTN Enschede mote). A trace centre has to stay within 0.06 mm of a pin's
+centreline to pass its neighbours, which no grid column hits, so a route
+leaves each pin straight along that line and only jogs to its column once
+past the pads. FreeRouting routes this row in full the same way."""
+
+from __future__ import annotations
+
+import pytest
+
+from rpmroute.board import build_board
+from rpmroute.board.items import Pin
+from rpmroute.dsn import parse_dsn
+from rpmroute.geometry import IntPoint
+from rpmroute.route.grid_router import GridRouter
+from rpmroute.route.pipeline import route_dsn_board_exact
+
+
+def _row(x0: int, pins: int = 6, skew: int = 3000) -> str:
+    places = " ".join(f"(place R{i} {x0 + 1270 * i} -5000 front 0)" for i in range(pins))
+    places += " " + " ".join(
+        f"(place T{i} {x0 + 1270 * i + skew} -15000 front 0)" for i in range(pins)
+    )
+    nets = " ".join(f"(net N{i} (pins R{i}-1 T{i}-1))" for i in range(pins))
+    return f"""(pcb t (parser) (resolution um 10) (unit um)
+  (structure (layer F.Cu (type signal)) (layer B.Cu (type signal))
+    (boundary (path pcb 0 0 0 30000 0 30000 -20000 0 -20000 0 0))
+    (via "Via[0-1]_600:400_um") (rule (width 1000) (clearance 200)))
+  (placement (component P {places}))
+  (library (image P (pin pad 1 0 0))
+    (padstack pad (shape (rect F.Cu -508 -762 508 762)) (attach off))
+    (padstack "Via[0-1]_600:400_um" (shape (circle F.Cu 600)) (shape (circle B.Cu 600))
+      (attach off)))
+  (network {nets}))"""
+
+
+@pytest.mark.parametrize("x0", [5000, 5150, 5300])
+def test_every_pin_of_a_row_leaves_straight_and_routes(x0):
+    # three offsets of the row against the grid; before, 2 or 3 of 6 routed
+    result, _, _ = route_dsn_board_exact(parse_dsn(_row(x0)), resolution=2)
+    assert len(result.routed_net_numbers) == 6
+    assert result.drc_clean
+
+
+def test_a_walled_in_pin_may_escape_to_the_column_either_side():
+    # two pins side by side leaving the same way can then jog apart
+    board = build_board(parse_dsn(_row(5000)))
+    router = GridRouter(board, trace_width=10000, clearance=2000, orthogonal=True, resolution=2)
+    router._conns = router._build_connections()
+    pin = next(
+        p for p in board.get_items()
+        if isinstance(p, Pin) and p.location == IntPoint(50000 + 2 * 12700, -50000)
+    )
+    net = pin.net_nos[0]
+    cx, cy = router._cell_of(pin.location)
+    nodes = router._escape_nodes(pin, net, router._conns, [0], (cx, cy))
+    columns = {x for x, y, _ in nodes if y != cy}
+    assert {cx - 1, cx, cx + 1} <= columns

tests/route/test_tree_nets.py

@@ -0,0 +1,170 @@
+"""Multi-pin nets: spanning-tree pairs, and connections that end on copper
+their net has already routed (a T into the tree)."""
+
+from __future__ import annotations
+
+import pytest
+
+from rpmroute.board import build_board
+from rpmroute.dsn import parse_dsn
+from rpmroute.route import exact_router
+from rpmroute.route.grid_router import GridRouter, RouteResult
+from rpmroute.route.pipeline import _rule_clearance_dsn, _rule_width_dsn
+
+# P1 and P2 are nearest each other, so the tree pairs them first; P3 sits
+# under the middle of that leg, 50 mm below it and 90 mm from either pin.
+TEE = """(pcb "tee.dsn"
+  (parser (string_quote ") (space_in_quoted_tokens on) (host_cad "t") (host_version "1"))
+  (resolution um 10)
+  (unit um)
+  (structure
+    (layer F.Cu (type signal) (property (index 0)))
+    (boundary (path pcb 0  0 0  200000 0  200000 -100000  0 -100000  0 0))
+    (rule (width 2000) (clearance 2000))
+  )
+  (library
+    (padstack Rect_Pad (shape (rect F.Cu -1000 -1000 1000 1000)) (attach off))
+    (image PAD (pin Rect_Pad 1 0 0))
+  )
+  (placement
+    (component PAD
+      (place P1 60000 -20000 front 0)
+      (place P2 140000 -20000 front 0)
+      (place P3 100000 -70000 front 0)
+    )
+  )
+  (network
+    (net N (pins P1-1 P2-1 P3-1))
+    (class default (rule (width 2000) (clearance 2000)))
+  )
+  (wiring)
+)
+"""
+
+
+def _router(tree_nets=True, text=TEE):
+    dsn = parse_dsn(text)
+    s = dsn.resolution.value
+    return GridRouter(
+        build_board(dsn),
+        trace_width=round(_rule_width_dsn(dsn) * s),
+        clearance=round(_rule_clearance_dsn(dsn) * s),
+        orthogonal=True,
+        tree_nets=tree_nets,
+    )
+
+
+def test_pairs_follow_a_spanning_tree_not_the_pin_order():
+    router = _router()
+    conns = router._build_connections()
+    pairs = [(c.a.component_ref, c.b.component_ref) for c in conns]
+    assert pairs == [("P1", "P2"), ("P1", "P3")]
+    chain = _router(tree_nets=False)._build_connections()
+    assert [(c.a.component_ref, c.b.component_ref) for c in chain] == [("P1", "P2"), ("P2", "P3")]
+
+
+def test_the_third_pin_tees_into_the_first_leg():
+    router = _router()
+    result = router.route()
+    first, second = router._conns
+    assert result.unrouted == 0
+    # the second connection starts on the first one's copper, mid-leg
+    start = second.path[0]
+    assert start in first.copper and second.a_end is None
+    assert second.anchors == {first.index}
+    assert router._dependents[first.index] == {second.index}
+    assert abs(router._cell_center(start[:2]).x - 1_000_000) <= router.step
+    # and so its copper is the 50 mm drop, not 90 mm back to a pin
+    assert len(second.path) < len(router._conns[0].path)
+
+
+def test_without_trees_each_connection_ends_on_a_pin():
+    router = _router(tree_nets=False)
+    router.route()
+    assert all(c.anchors == frozenset() for c in router._conns)
+    assert all(c.a_end is not None and c.b_end is not None for c in router._conns)
+
+
+def test_ripping_an_anchor_takes_what_hangs_on_it():
+    router = _router()
+    router.route()
+    first, second = router._conns
+    victims = router._with_dependents([first], router._conns)
+    assert victims == [first, second]  # anchors first, as committed
+    for victim in victims:
+        router._rip(victim)
+    assert not first.routed and not second.routed
+    assert not router._dependents.get(first.index)
+    assert not router._cell_owner
+
+
+def test_the_snapshot_lists_anchors_before_what_hangs_on_them():
+    router = _router()
+    result = router.route()
+    assert result.connection_anchors == [(), (0,)]
+
+
+def test_the_exact_engine_drops_a_tee_whose_anchor_it_rejects(monkeypatch):
+    """A connection teed onto copper the exact check refuses would dangle."""
+    dsn = parse_dsn(TEE)
+    board = build_board(dsn)
+    real = exact_router.route_board
+
+    def grid_then_spoil(*args, **kwargs):
+        result: RouteResult = real(*args, **kwargs)
+        assert result.connection_anchors == [(), (0,)]
+        # move the first leg off the board edge so the exact check rejects it
+        net, wires, vias = result.connections[0]
+        result.connections[0] = (net, [(layer, [type(p)(p.x, p.y + 2_000_000) for p in pts])
+                                       for layer, pts in wires], vias)
+        return result
+
+    monkeypatch.setattr(exact_router, "route_board", grid_then_spoil)
+    s = dsn.resolution.value
+    exact = exact_router.route_board_exact(
+        board,
+        trace_width=round(_rule_width_dsn(dsn) * s),
+        clearance=round(_rule_clearance_dsn(dsn) * s),
+    )
+    assert len(exact.result.failed) == 2  # the leg and the T hanging on it
+    assert not exact.result.wires
+
+
+@pytest.mark.parametrize("tree_nets", [True, False])
+def test_occupancy_stays_honest(tree_nets):
+    router = _router(tree_nets)
+    router.route()
+    conns = router._conns
+    assert all(conns[i].routed for i in router._cell_owner.values())
+    for anchor, hanging in router._dependents.items():
+        for i in hanging:
+            assert conns[i].routed and conns[anchor].routed
+
+
+# P1-P2 along the top, P3 far off to the lower right, P4 just under the
+# middle of the P1-P2 leg.
+CHAIN_TEE = TEE.replace(
+    """      (place P3 100000 -70000 front 0)
+""",
+    """      (place P3 190000 -90000 front 0)
+      (place P4 100000 -40000 front 0)
+""",
+).replace("(pins P1-1 P2-1 P3-1)", "(pins P1-1 P2-1 P3-1 P4-1)")
+
+
+def test_a_tee_depends_on_every_connection_back_to_its_group():
+    """Joined as P1-P2, P2-P3, P3-P4, P4's connection tees onto P1-P2 copper,
+    which reaches P3's group only through P2-P3. Ripping P2-P3 must take the T
+    too, or it would be counted routed while cut off from P3."""
+    router = _router(text=CHAIN_TEE)
+    conns = router._conns = router._build_connections()
+    groups = {c.a.component_ref: c.a_group for c in conns}
+    groups.update({c.b.component_ref: c.b_group for c in conns})
+    for conn, (a, b) in zip(conns, (("P1", "P2"), ("P2", "P3"), ("P3", "P4")), strict=True):
+        conn.a_group, conn.b_group = groups[a], groups[b]
+    for conn in conns:
+        assert router._try_route(conn, conns)
+    first, second, third = conns
+    assert third.path[0] in first.copper  # the T lands on the far leg
+    assert third.anchors == {first.index, second.index}
+    assert router._with_dependents([second], conns) == [second, third]

tests/route/test_verify_output.py

@@ -0,0 +1,42 @@
+"""verify_result: copper no engine checked is checked on exact shapes."""
+
+from pathlib import Path
+
+from rpmroute.dsn import parse_dsn
+from rpmroute.route.verify import verify_result
+from rpmroute.ses.model import RoutedWire, RoutingResult
+
+FIXTURE = Path(__file__).parents[1] / "dsn" / "fixtures" / "crossing_2net.dsn"
+# rule: 2000 um wide traces, 2000 um clearance; NET_A runs along y = -40000
+A = RoutedWire(layer="Top", width=2000, coords=[2000, -40000, 198000, -40000])
+
+
+def _check(b_wire):
+    result = RoutingResult()
+    result.add_wire("NET_A", A)
+    result.add_wire("NET_B", b_wire)
+    return verify_result(parse_dsn(FIXTURE.read_text()), result)
+
+
+def test_a_crossing_on_one_layer_is_a_short():
+    report = _check(RoutedWire(layer="Top", width=2000, coords=[100000, -15000, 100000, -65000]))
+    assert report.shorts == 1 and report.clearance == 0
+    found = report.short_examples[0]
+    assert {found.net, found.other} == {"NET_A", "NET_B"} and found.layer == "Top"
+    assert abs(found.x_mm - 100.0) < 1.5 and abs(found.y_mm + 40.0) < 1.5
+
+
+def test_copper_closer_than_the_rule_is_a_clearance_violation():
+    # edges 1500 um apart against a 2000 um rule
+    report = _check(RoutedWire(layer="Top", width=2000, coords=[50000, -36500, 150000, -36500]))
+    assert report.shorts == 0 and report.clearance == 1
+
+
+def test_exactly_the_clearance_apart_is_clean():
+    report = _check(RoutedWire(layer="Top", width=2000, coords=[50000, -36000, 150000, -36000]))
+    assert report.clean
+
+
+def test_a_crossing_on_another_layer_is_clean():
+    report = _check(RoutedWire(layer="Bottom", width=2000, coords=[100000, -15000, 100000, -65000]))
+    assert report.clean

tests/route/test_via_spacing.py

@@ -0,0 +1,136 @@
+"""Vias keep hole-to-hole spacing, even within one net."""
+
+from __future__ import annotations
+
+import itertools
+import math
+
+from rpmroute.dsn import parse_dsn
+from rpmroute.route.pipeline import route_dsn_board_exact
+
+# four GND pads 0.5 mm apart over a GND plane: each drops a via to the plane
+_DSN = """(pcb holes (parser) (resolution um 10) (unit um)
+  (structure
+    (layer F.Cu (type signal)) (layer In1.Cu (type power)) (layer In2.Cu (type power))
+    (layer B.Cu (type signal))
+    (boundary (path pcb 0  0 0  20000 0  20000 -20000  0 -20000  0 0))
+    (plane GND (polygon In1.Cu 0  500 -500  19500 -500  19500 -19500  500 -19500  500 -500))
+    (via "Via[0-3]_500:300_um") (rule (width 150) (clearance 150)))
+  (placement (component S (place G1 9000 -10000 front 0) (place G2 9500 -10000 front 0)
+                          (place G3 10000 -10000 front 0) (place G4 10500 -10000 front 0)))
+  (library
+    (image S (pin smd 1 0 0))
+    (padstack smd (shape (rect F.Cu -150 -300 150 300)) (attach off))
+    (padstack "Via[0-3]_500:300_um" (shape (circle F.Cu 500)) (shape (circle B.Cu 500)) (attach off)))
+  (network (net GND (pins G1-1 G2-1 G3-1 G4-1))))"""
+
+
+def test_a_nets_own_vias_keep_hole_to_hole_spacing():
+    dsn = parse_dsn(_DSN)
+    exact, scale, _ = route_dsn_board_exact(dsn, resolution=2)
+    assert exact.result.failed == []
+    vias = exact.result.vias[1]
+    assert len(set(vias)) == len(vias), "a via written twice"
+    need = (300 + 250) * scale  # drill + 0.25 mm, centre to centre
+    for a, b in itertools.combinations(vias, 2):
+        assert math.hypot(a.x - b.x, a.y - b.y) >= need, f"vias at {a} and {b} too close"
+
+
+def test_connections_sharing_a_plane_via_write_it_once():
+    # eight GND pads 0.4 mm apart: the hole spacing makes several of them
+    # end on the same plane via, which must come out once, not once each
+    pads = " ".join(f"(place G{i} {9000 + 400 * i} -10000 front 0)" for i in range(8))
+    pins = " ".join(f"G{i}-1" for i in range(8))
+    dsn = parse_dsn(
+        _DSN.replace(
+            "(place G1 9000 -10000 front 0) (place G2 9500 -10000 front 0)\n"
+            "                          (place G3 10000 -10000 front 0) (place G4 10500 -10000 front 0)",
+            pads,
+        )
+        .replace("(pins G1-1 G2-1 G3-1 G4-1)", f"(pins {pins})")
+        .replace("(rect F.Cu -150 -300 150 300)", "(rect F.Cu -125 -300 125 300)")
+    )
+    exact, _scale, _ = route_dsn_board_exact(dsn, resolution=2)
+    vias = exact.result.vias[1]
+    assert len(vias) < 8, "no via is shared, so this board no longer tests sharing"
+    assert len(set(vias)) == len(vias), "a shared via written more than once"
+
+
+def _router(dsn_text, via_drill_um=300):
+    from rpmroute.board import build_board
+    from rpmroute.route.grid_router import GridRouter
+    from rpmroute.route.pipeline import _rule_clearance_dsn, _rule_width_dsn
+
+    dsn = parse_dsn(dsn_text)
+    s = dsn.resolution.value
+    return GridRouter(
+        build_board(dsn), trace_width=round(_rule_width_dsn(dsn) * s),
+        clearance=round(_rule_clearance_dsn(dsn) * s), resolution=2, orthogonal=True,
+        via_drill=via_drill_um * s, hole_to_hole=250 * s,
+    ), s
+
+
+_THT = """(pcb tht (parser) (resolution um 10) (unit um)
+  (structure (layer F.Cu (type signal)) (layer B.Cu (type signal))
+    (boundary (path pcb 0  0 0  20000 0  20000 -20000  0 -20000  0 0))
+    (via "Via[0-1]_500:300_um") (rule (width 150) (clearance 150)))
+  (placement (component T (place J1 10000 -10000 front 0)))
+  (library (image T (pin tht 1 0 0))
+    (padstack tht (shape (circle F.Cu 1700)) (shape (circle B.Cu 1700)) (attach off))
+    (padstack "Via[0-1]_500:300_um" (shape (circle F.Cu 500)) (shape (circle B.Cu 500)) (attach off)))
+  (network (net SIG (pins J1-1))))"""
+
+
+def test_no_via_goes_near_a_through_hole_pads_hole_even_of_its_own_net():
+    router, s = _router(_THT)
+    pin = router._cell_of(router.board.get_pins()[0].location)
+    assert not router._holes_clear(pin, 1)  # own net, right on the pad
+    far = (pin[0] + 40, pin[1])
+    assert router._holes_clear(far, 1)
+
+
+def test_a_via_in_a_pad_keeps_hole_spacing_from_a_fixed_via():
+    from rpmroute.geometry import IntPoint
+
+    text = _THT.replace("(network (net SIG (pins J1-1))))",
+                        "(network (net SIG (pins J1-1)))\n"
+                        "  (wiring (via \"Via[0-1]_500:300_um\"  3000 -3000 (net SIG) (type route))))")
+    router, s = _router(text)
+    assert not router._hole_clear_at(IntPoint(3400 * s, -3000 * s))  # 0.4 mm < 0.55 mm
+    assert router._hole_clear_at(IntPoint(3600 * s, -3000 * s))
+
+
+def test_hole_spacing_from_a_fixed_via_is_measured_from_where_it_really_is():
+    # a fixed via off the grid with its own 0.25 mm drill, and the router's
+    # via a smaller 0.2 mm one (the flight controller's case): a new via needs
+    # its centre 0.1 + 0.125 + 0.25 = 0.475 mm away, measured exactly, where
+    # one rule for all vias gave 0.2 + 0.25 = 0.45 from the cell centres
+    text = _THT.replace("(network (net SIG (pins J1-1))))",
+                        "(network (net SIG (pins J1-1)) (net GND))\n"
+                        "  (wiring (via \"Via[0-1]_500:250_um\"  3030 -3030 (net GND) (type route))))")
+    text = text.replace(
+        '(attach off)))\n  (network',
+        '(attach off))\n    (padstack "Via[0-1]_500:250_um" (shape (circle F.Cu 500)) '
+        '(shape (circle B.Cu 500)) (attach off)))\n  (network',
+    )
+    router, s = _router(text, via_drill_um=200)
+    via = next(v for v in router.board.get_items() if getattr(v, "drill", 0))
+    assert via.drill == 250 * s
+    loc = via.location
+    for cell in [(x, y) for x in range(router.cols) for y in range(router.rows)]:
+        c = router._cell_center(cell)
+        d = math.hypot(c.x - loc.x, c.y - loc.y)
+        if router.step * 1.5 < d < 470 * s:
+            assert not router._holes_clear(cell, 1), f"{d / s:.0f} um from the fixed via"
+        elif 560 * s < d < 700 * s and cell not in router._tht_block:
+            assert router._holes_clear(cell, 1)
+
+
+def test_a_route_keeps_its_own_vias_apart():
+    # a route that changed layer at (10, 10) may not change layer again one
+    # cell away; the same cell is the same through via, and far is fine
+    router, _s = _router(_THT)
+    came_from = {(10, 10, 1): (10, 10, 0), (11, 10, 1): (10, 10, 1), (12, 10, 1): (11, 10, 1)}
+    assert router._near_path_via((12, 10, 1), (11, 10), came_from)
+    assert not router._near_path_via((12, 10, 1), (10, 10), came_from)
+    assert not router._near_path_via((12, 10, 1), (40, 10), came_from)

tests/route/test_window_reroute.py

@@ -0,0 +1,128 @@
+"""Window re-route: a finer grid around a stuck connection, kept only when
+it leaves fewer connections unrouted."""
+
+from __future__ import annotations
+
+from rpmroute.board import build_board
+from rpmroute.dsn import parse_dsn
+from rpmroute.geometry import IntBox
+from rpmroute.route.grid_router import GridRouter
+from rpmroute.route.pipeline import _rule_clearance_dsn, _rule_width_dsn, route_dsn_board_exact
+
+
+def _slot(gap: int = 640, far: bool = False) -> str:
+    """A wall across the board with a slot in it. A trace fits the slot
+    only along a narrow band of heights that the board's 1x grid has no row
+    in and a 4x grid does. ``far`` adds a second net nowhere near the wall."""
+    yc = -5000
+    lo, hi = yc - gap // 2, yc + gap // 2
+    extra_place = "(place Q1 2000 -1000 front 0) (place Q2 6000 -1000 front 0)" if far else ""
+    extra_net = "(net M (pins Q1-1 Q2-1))" if far else ""
+    return f"""(pcb "slot.dsn"
+  (parser (string_quote ") (space_in_quoted_tokens on) (host_cad "t") (host_version "1"))
+  (resolution um 10)
+  (unit um)
+  (structure
+    (layer F.Cu (type signal) (property (index 0)))
+    (boundary (path pcb 0  0 0  20000 0  20000 -10000  0 -10000  0 0))
+    (keepout "" (rect F.Cu 9000 -10000 11000 {lo}))
+    (keepout "" (rect F.Cu 9000 {hi} 11000 0))
+    (rule (width 200) (clearance 200))
+  )
+  (library
+    (padstack Rect_Pad (shape (rect F.Cu -100 -100 100 100)) (attach off))
+    (image PAD (pin Rect_Pad 1 0 0))
+  )
+  (placement
+    (component PAD
+      (place P1 3000 {yc} front 0)
+      (place P2 17000 {yc} front 0)
+      {extra_place}
+    )
+  )
+  (network
+    (net N (pins P1-1 P2-1))
+    {extra_net}
+    (class default (rule (width 200) (clearance 200)))
+  )
+  (wiring)
+)
+"""
+
+
+def _route(text: str, rounds: int, **window):
+    exact, _scale, _layers = route_dsn_board_exact(
+        parse_dsn(text), resolution=1, window_reroute=rounds, window_resolution=4, **window,
+    )
+    return exact.result
+
+
+def test_the_board_grid_misses_the_slot_and_a_finer_window_finds_it():
+    plain = _route(_slot(), 0)
+    assert len(plain.failed) == 1
+    windowed = _route(_slot(), 1)
+    assert windowed.failed == []
+    assert windowed.wires  # and the copper it found is in the result
+
+
+def test_a_window_that_cannot_help_leaves_the_board_as_it_was():
+    plain = _route(_slot(gap=500, far=True), 0)  # too narrow for any grid
+    windowed = _route(_slot(gap=500, far=True), 2)
+    assert len(windowed.failed) == len(plain.failed) == 1
+    assert windowed.wires == plain.wires
+    assert windowed.vias == plain.vias
+
+
+def test_copper_outside_the_window_is_kept_as_it_was():
+    plain = _route(_slot(far=True), 0)
+    windowed = _route(_slot(far=True), 1)
+    assert windowed.failed == []
+    far_net = 2  # M, the second net in the DSN
+    assert windowed.wires[far_net] == plain.wires[far_net]
+
+
+def test_a_router_limited_to_some_nets_and_a_box_builds_only_those():
+    dsn = parse_dsn(_slot(far=True))
+    s = dsn.resolution.value
+    board = build_board(dsn)
+    whole = GridRouter(board, trace_width=round(_rule_width_dsn(dsn) * s),
+                       clearance=round(_rule_clearance_dsn(dsn) * s), orthogonal=True)
+    part = GridRouter(board, trace_width=round(_rule_width_dsn(dsn) * s),
+                      clearance=round(_rule_clearance_dsn(dsn) * s), orthogonal=True,
+                      only_nets=frozenset({2}), bounds=IntBox(0, -20000, 80000, 0))
+    assert {c.net_no for c in whole._build_connections()} == {1, 2}
+    assert {c.net_no for c in part._build_connections()} == {2}
+    assert part.cols * part.rows < whole.cols * whole.rows
+
+
+def test_a_spent_budget_starts_no_window():
+    assert len(_route(_slot(), 1, window_budget=0.0).failed) == 1
+    assert _route(_slot(), 1, window_budget=1000.0).failed == []
+
+
+def test_window_board_keeps_far_items_of_the_rerouted_nets_only():
+    from rpmroute.route.window import _item_box, _window_board
+
+    board = build_board(parse_dsn(_slot(far=True)))
+    items = [(item, _item_box(item)) for item in board.get_items()]
+    view = IntBox(80000, -60000, 120000, -40000)  # around the slot, far from Q1/Q2
+    sub = _window_board(board, items, view, {1}, {}, set(), {}, 100, 300, 300, [0], "via")
+    refs = {p.component_ref for p in sub.get_pins()}
+    assert {"P1", "P2"} <= refs  # net N's pins, though outside the view
+    assert not refs & {"Q1", "Q2"}  # net M's, far away, left out
+
+
+def test_a_connection_ending_outside_the_window_gets_no_copper():
+    """Its far end has no grid cells; a stub out to it would cross items the
+    window board never saw."""
+    from rpmroute.route.exact_router import route_board_exact
+
+    dsn = parse_dsn(_slot(far=True))
+    s = dsn.resolution.value
+    window = IntBox(70000, -70000, 130000, -30000)  # the slot only; net M's pins are far off
+    result = route_board_exact(
+        build_board(dsn), trace_width=round(_rule_width_dsn(dsn) * s),
+        clearance=round(_rule_clearance_dsn(dsn) * s), only_nets=frozenset({2}), bounds=window,
+    ).result
+    assert [f[0] for f in result.failed] == [2]
+    assert not result.wires.get(2) and not result.vias.get(2)

tests/ses/test_indent.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from freeroute.ses.indent import Identifier, IndentWriter
+from rpmroute.ses.indent import Identifier, IndentWriter
 
 
 def test_nested_scopes_indent_by_two_spaces():