Window boards: never search a connection ending outside the window

With items away from the window left off its board, a stub from the window
edge out to a rerouted net's far pin crossed copper the exact check never
saw: 38 shorts on th-eda's flight controller. A connection with an end
outside the bounds is now left unrouted, and a window whose new copper
leaves the window is refused.

src/freeroute/cli.py

@@ -30,8 +30,11 @@ 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", "promote", "access", "negotiate", "rollback"}),
-    "exact": frozenset({"shove", "diagonal", "rip_up", "max_passes", "seed", "orders", "promote", "access", "negotiate", "rollback"}),
+    "grid": frozenset({"rip_up", "max_passes", "seed", "orders", "promote", "access", "negotiate", "rollback", "tree"}),
+    "exact": frozenset({
+        "shove", "diagonal", "rip_up", "max_passes", "seed", "orders", "promote", "access",
+        "negotiate", "rollback", "tree", "window",
+    }),
     "room": frozenset({"shove", "pack"}),
 }
 
@@ -48,6 +51,8 @@ _FLAG_NAMES = {
     "access": "--access-cost",
     "negotiate": "--negotiate",
     "rollback": "--no-rollback",
+    "tree": "--no-tree",
+    "window": "--window-reroute",
 }
 
 
@@ -184,6 +189,53 @@ def build_parser() -> argparse.ArgumentParser:
         "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(
         "--hole-to-hole",
         type=float,
@@ -223,6 +275,8 @@ def main(argv: list[str] | None = None) -> int:
             ("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),
         )
         if asked
     ]
@@ -260,6 +314,12 @@ def main(argv: list[str] | None = None) -> int:
             "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,
         }
     elif args.engine == "grid":
         options = {
@@ -272,6 +332,7 @@ def main(argv: list[str] | None = None) -> int:
             "negotiate": args.negotiate or 0,
             "hole_to_hole_mm": args.hole_to_hole,
             "rollback": args.rollback,
+            "tree_nets": args.tree_nets,
         }
     if args.engine == "room":
         result = build_rooms_routing_result(

src/freeroute/route/exact_router.py

@@ -102,9 +102,12 @@ def route_board_exact(
     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.
 
@@ -138,9 +141,12 @@ def route_board_exact(
         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
@@ -194,12 +200,22 @@ def route_board_exact(
     # 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)
+    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)
-    for (net_no, wires, vias), ends in sorted(
-        zip(result.connections, ends_list, strict=False), key=lambda c: c[0][0]
+    # 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],
     ):
+        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]
@@ -220,6 +236,7 @@ def route_board_exact(
             )
         ):
             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:
@@ -246,7 +263,10 @@ def route_board_exact(
     # 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:
@@ -271,7 +291,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
             )

src/freeroute/route/grid_router.py

@@ -65,7 +65,7 @@ class RouteResult:
 
     __slots__ = (
         "wires", "vias", "half_width", "unrouted", "connections", "connection_ends", "failed",
-        "net_half", "narrowed",
+        "net_half", "narrowed", "connection_anchors",
     )
 
     def __init__(self, half_width: int) -> None:
@@ -79,6 +79,9 @@ class RouteResult:
         #: what each routed connection joins, and the zone both ends sit in
         #: (or ""), parallel to ``connections``
         self.connection_ends: list[tuple[str, str, str]] = []
+        #: for each routed connection, the earlier ones (positions in
+        #: ``connections``) whose copper it ended on, parallel to ``connections``
+        self.connection_anchors: list[tuple[int, ...]] = []
         #: connections left unrouted: (net_no, one end, the other end)
         self.failed: list[tuple[int, str, str]] = []
         #: half width of each net routed wider than the default (its class)
@@ -127,6 +130,9 @@ class _Connection:
         "half",
         "stubs",
         "stub_near",
+        "anchors",
+        "copper",
+        "seq",
     )
 
     def __init__(self, index: int, net_no: int, a: Pin, b: Pin) -> None:
@@ -158,6 +164,14 @@ class _Connection:
         # routed at the default width instead; the half width it went in at
         self.narrow = False
         self.half = 0
+        # connections whose copper this one ended on (a T into its net's
+        # tree): ripping one of them leaves this one dangling
+        self.anchors: frozenset[int] = frozenset()
+        # the nodes of its committed copper (path cells, via cells on every
+        # layer), where another connection of its net may end
+        self.copper: frozenset[Node] = frozenset()
+        # commit order: a connection is always committed after its anchors
+        self.seq = 0
 
 
 class GridRouter:
@@ -188,8 +202,27 @@ class GridRouter:
         net_widths: dict[int, int] | None = None,
         via_drill: int | None = None,
         hole_to_hole: int = 0,
+        tree_nets: bool = True,
+        only_nets: frozenset | None = None,
+        bounds: IntBox | None = None,
     ) -> None:
         self.board = board
+        # A window re-route routes some nets inside part of the board: only
+        # these nets get connections, and the grid covers only ``bounds``
+        # (cells outside it do not exist, so nothing is routed there).
+        self.only_nets = frozenset(only_nets) if only_nets is not None else None
+        self._bounds = bounds
+        # connections with an end outside ``bounds``: never searched, since
+        # the grid has no cells to reach that end by
+        self._outside: set[int] = set()
+        # Multi-pin nets: pair a net's pin groups by a minimum spanning tree,
+        # and let a connection start or end on copper its net already routed
+        # (a T into the tree), not only on one chosen pin.
+        self.tree = bool(tree_nets)
+        self._dependents: dict[int, set[int]] = {}
+        self._commits = 0
+        self._plane_nets: set[int] = set()
+        self._net_conns: dict[int, list[_Connection]] = {}
         # Pin access: while a pin still has connections to route, the cells
         # its route would leave by (its end cells, the via it may need there,
         # and the clearance around both) cost other nets this much extra, so
@@ -301,6 +334,11 @@ class GridRouter:
         self.layers = list(layers)
 
         box = board.bounding_box
+        if bounds is not None:
+            box = IntBox(
+                max(box.ll.x, bounds.ll.x), max(box.ll.y, bounds.ll.y),
+                min(box.ur.x, bounds.ur.x), min(box.ur.y, bounds.ur.y),
+            )
         self.origin_x = box.ll.x
         self.origin_y = box.ll.y
         self.cols = max(1, math.ceil((box.ur.x - box.ll.x) / self.step) + 1)
@@ -683,6 +721,8 @@ class GridRouter:
     def _search(
         self, conn: _Connection, allow_ripup: bool, conns: list[_Connection]
     ) -> list[Node] | None:
+        if conn.index in self._outside:
+            return None
         half = self._conn_half(conn)
         self._cur_half, self._spread = half, self._spread_for(half)
         try:
@@ -699,6 +739,13 @@ class GridRouter:
             goal_cell = self._group_target(conn.a_group)
         starts = self._group_ends(conn.a_group, conn.net_no, conns, allow_ripup)
         goals = self._group_ends(conn.b_group, conn.net_no, conns, allow_ripup)
+        # either side may also start or end on copper its net already routed
+        a_tree = self._tree_ends(conn, conn.a_group)
+        b_tree = self._tree_ends(conn, conn.b_group)
+        for node in a_tree:
+            starts.setdefault(node, None)
+        for node in b_tree:
+            goals.setdefault(node, None)
         if not starts or not goals:
             return None
         # A start that is already an end joins at once, except that ending on
@@ -711,6 +758,7 @@ class GridRouter:
         ]
         if common:
             conn.a_end, conn.b_end = starts[common[0]], goals[common[0]]
+            conn.anchors = _anchors([common[0]], starts, goals, a_tree, b_tree)
             return [common[0]]
         net_no = conn.net_no
 
@@ -776,6 +824,7 @@ class GridRouter:
                 if ok:
                     path = _reconstruct(came_from, current)
                     conn.a_end, conn.b_end = starts.get(path[0]), end
+                    conn.anchors = _anchors(path, starts, goals, a_tree, b_tree)
                     return path
             cx, cy, cl = current
             base = g_score[current]
@@ -822,6 +871,55 @@ class GridRouter:
                         )
         return None
 
+    def _tree_ends(self, conn: _Connection, group) -> dict[Node, frozenset[int]]:
+        """Copper its net has already routed on ``group``'s side of ``conn``: a
+        route may start or end anywhere on it. Each node maps to what a route
+        ending there relies on: the connection that laid the copper and every
+        one between it and ``group`` (routed connections of a net form a
+        forest, so that path is unique). Ripping any of them would cut the
+        route off. Empty for plane nets, which keep their drops to the plane,
+        and when tree routing is off."""
+        if not self.tree or conn.net_no in self._plane_nets:
+            return {}
+        adjacent: dict[int, list[tuple[int, _Connection]]] = {}
+        for c in self._net_conns.get(conn.net_no, ()):
+            if c is conn or not c.routed:
+                continue
+            a, b = id(c.a_group), id(c.b_group)
+            adjacent.setdefault(a, []).append((b, c))
+            adjacent.setdefault(b, []).append((a, c))
+        owners: dict[Node, frozenset[int]] = {}
+        path_to: dict[int, frozenset[int]] = {id(group): frozenset()}
+        stack = [id(group)]
+        while stack:
+            here = stack.pop()
+            for other, c in adjacent.get(here, ()):
+                if other in path_to:
+                    continue
+                path = path_to[here] | {c.index}
+                path_to[other] = path
+                stack.append(other)
+                for node in c.copper:
+                    # a walled cell's via moved into the pad: no copper there
+                    if node not in self._keepout and node not in self._via_only:
+                        owners.setdefault(node, path)
+        return owners
+
+    def _with_dependents(self, victims: list[_Connection], conns: list[_Connection]) -> list[_Connection]:
+        """``victims`` and every routed connection that ended on their copper,
+        directly or through another: ripping a route rips the routes teed onto
+        it, which would otherwise dangle. Anchors come before what hangs on
+        them, as they were committed."""
+        found = {v.index: v for v in victims}
+        stack = list(victims)
+        while stack:
+            for i in self._dependents.get(stack.pop().index, ()):
+                c = conns[i]
+                if c.routed and i not in found:
+                    found[i] = c
+                    stack.append(c)
+        return sorted(found.values(), key=lambda c: (c.seq, c.index))
+
     # --- pin stubs ----------------------------------------------------------
     # A pin rarely sits on a cell centre, so every route starts and ends with a
     # short stub from the pin to its first cell. The grid has to see that
@@ -1431,6 +1529,13 @@ class GridRouter:
             # via k joins wire segments k and k + 1
             conn.vias[0 if idx == 0 else idx - 1] = location
         conn.routed = True
+        self._commits += 1
+        conn.seq = self._commits
+        conn.copper = frozenset(path) | frozenset(
+            (*cell, layer) for cell in conn.via_cells for layer in self.layers
+        )
+        for anchor in conn.anchors:
+            self._dependents.setdefault(anchor, set()).add(conn.index)
         self._settle(conn, -1)
 
     def _forget_stubs(self, conn: _Connection) -> None:
@@ -1473,6 +1578,12 @@ class GridRouter:
         conn.wires = []
         conn.vias = []
         conn.routed = False
+        for anchor in conn.anchors:
+            hanging = self._dependents.get(anchor)
+            if hanging is not None:
+                hanging.discard(conn.index)
+        conn.anchors = frozenset()
+        conn.copper = frozenset()
         conn.rip_count += 1
         self._settle(conn, +1)
 
@@ -1688,7 +1799,7 @@ class GridRouter:
                     crossed |= self._stub_owners(
                         end, node[:2], node[2], conn.net_no, conns, self._conn_half(conn)
                     )
-            victims = [conns[i] for i in sorted(crossed)]
+            victims = self._with_dependents([conns[i] for i in sorted(crossed)], conns)
             if self.rollback:
                 return self._ripup_transaction(conn, path, victims, conns)
             for victim in victims:
@@ -1699,7 +1810,7 @@ class GridRouter:
     def _ripup_transaction(self, conn, path, victims, conns) -> bool:
         """Route ``conn`` through ``victims``, reroute them at once in free
         space, and undo it all if fewer connections end up routed."""
-        saved = [(v, v.path, v.a_end, v.b_end, v.rip_count) for v in victims]
+        saved = [(v, v.path, v.a_end, v.b_end, v.rip_count, v.anchors) for v in victims]
         own_rips = conn.rip_count
         for victim in victims:
             self._rip(victim)
@@ -1717,8 +1828,8 @@ class GridRouter:
                 self._rip(victim)
         self._rip(conn)
         conn.rip_count = own_rips
-        for victim, old_path, a_end, b_end, rips in saved:
-            victim.a_end, victim.b_end = a_end, b_end
+        for victim, old_path, a_end, b_end, rips, anchors in saved:
+            victim.a_end, victim.b_end, victim.anchors = a_end, b_end, anchors
             self._commit(victim, old_path)
             victim.rip_count = rips
         return False
@@ -1740,8 +1851,11 @@ class GridRouter:
                 planes_by_net.setdefault(zone.net_nos[0], []).append(zone)
         plane_ids = frozenset(id(z) for zs in planes_by_net.values() for z in zs)
         conns: list[_Connection] = []
+        self._plane_nets: set[int] = set()
         nets = set(pins_by_net) | set(zones_by_net) | set(planes_by_net)
         # deterministic: fewer-pin nets first, then by net number
+        if self.only_nets is not None:
+            nets &= self.only_nets
         for net_no in sorted(nets, key=lambda n: (len(pins_by_net.get(n, [])), n)):
             zones = zones_by_net.get(net_no, []) + planes_by_net.get(net_no, [])
             groups = _connected_groups(
@@ -1752,12 +1866,23 @@ class GridRouter:
                 # a plane net: every other group goes straight to the plane
                 # (usually a stub and a via), not pad to pad across the board
                 pairs = [(g, hubs[0]) for g in groups if g is not hubs[0]]
+                self._plane_nets.add(net_no)
+            elif self.tree:
+                pairs = _spanning_pairs(groups)
             else:
                 pairs = list(zip(groups, groups[1:], strict=False))
             for ga, gb in pairs:
                 conn = _Connection(len(conns), net_no, _first(ga[0]), _first(gb[0]))
                 conn.a_group, conn.b_group = ga, gb
                 conns.append(conn)
+        self._net_conns: dict[int, list[_Connection]] = {}
+        for conn in conns:
+            self._net_conns.setdefault(conn.net_no, []).append(conn)
+        if self._bounds is not None:
+            self._outside = {
+                c.index for c in conns
+                if not (_group_inside(c.a_group, self._bounds) and _group_inside(c.b_group, self._bounds))
+            }
         return conns
 
     def _fixed_pieces(self, net_no: int) -> list[_FixedPiece]:
@@ -1807,18 +1932,22 @@ class GridRouter:
         return wide, narrowed
 
     def _snapshot(self, conns: list[_Connection]) -> list[tuple]:
+        # in commit order, so a connection teed onto another comes after it;
+        # its anchors as positions in this list
+        routed = sorted((c for c in conns if c.routed), key=lambda c: (c.seq, c.index))
+        position = {c.index: i for i, c in enumerate(routed)}
         return [
             (c.net_no, [(layer, list(pts)) for layer, pts in c.wires], list(c.vias),
-             (*_ends_of(c), self._left_to_zone(c)))
-            for c in conns
-            if c.routed
+             (*_ends_of(c), self._left_to_zone(c)),
+             tuple(sorted(position[a] for a in c.anchors if a in position)))
+            for c in routed
         ]
 
     def _result_from(self, snapshot, unrouted: int) -> RouteResult:
         result = RouteResult(self.half_width)
         written: set[tuple[int, IntPoint]] = set()
         result.unrouted = unrouted
-        for net_no, wires, vias, ends in snapshot:
+        for net_no, wires, vias, ends, anchors in snapshot:
             for layer, points in wires:
                 result.add_wire(net_no, layer, points)
             for location in vias:
@@ -1829,7 +1958,8 @@ class GridRouter:
                 result.add_via(net_no, location)
             result.connections.append((net_no, wires, vias))
             result.connection_ends.append(ends)
-        routed = {ends[:2] + (net_no,) for net_no, _w, _v, ends in snapshot}
+            result.connection_anchors.append(anchors)
+        routed = {ends[:2] + (net_no,) for net_no, _w, _v, ends, _a in snapshot}
         result.failed = [
             (c.net_no, *_ends_of(c), self._left_to_zone(c))
             for c in self._conns
@@ -1842,6 +1972,53 @@ def _first(items):
     return items[0] if items else None
 
 
+def _anchors(path, starts, goals, a_tree, b_tree) -> frozenset[int]:
+    """What a found path relies on: the connections between the copper it
+    starts or ends on and its own groups."""
+    found: set[int] = set()
+    if starts.get(path[0]) is None and path[0] in a_tree:
+        found |= a_tree[path[0]]
+    if goals.get(path[-1]) is None and path[-1] in b_tree:
+        found |= b_tree[path[-1]]
+    return frozenset(found)
+
+
+def _group_points(group) -> list[tuple[int, int]]:
+    pins, zones = group
+    if pins:
+        return [(p.location.x, p.location.y) for p in pins]
+    points = []
+    for zone in zones:
+        box = zone.bounding_box()
+        points.append(((box.ll.x + box.ur.x) // 2, (box.ll.y + box.ur.y) // 2))
+    return points or [(0, 0)]
+
+
+def _spanning_pairs(groups) -> list[tuple]:
+    """A minimum spanning tree over a net's groups (Prim, Manhattan distance
+    between their nearest pins), as (in the tree, joining it) pairs: each
+    connection joins the nearest group not yet joined, not the next in pin
+    order."""
+    if len(groups) < 2:
+        return []
+    points = [_group_points(g) for g in groups]
+
+    def gap(i: int, j: int) -> int:
+        return min(abs(ax - bx) + abs(ay - by) for ax, ay in points[i] for bx, by in points[j])
+
+    best = {j: (gap(0, j), 0) for j in range(1, len(groups))}
+    pairs = []
+    while best:
+        j = min(best, key=lambda k: (best[k][0], k))
+        _, i = best.pop(j)
+        pairs.append((groups[i], groups[j]))
+        for k in best:
+            d = gap(j, k)
+            if d < best[k][0]:
+                best[k] = (d, j)
+    return pairs
+
+
 def _group_label(group) -> str:
     pins, zones = group
     parts = [f"{p.component_ref}-{p.name}" for p in pins[:3]]
@@ -1851,6 +2028,19 @@ def _group_label(group) -> str:
     return "/".join(parts) or "?"
 
 
+def _group_inside(group, bounds: IntBox) -> bool:
+    """A group has a pin inside ``bounds``, or a zone reaching into it."""
+    pins, zones = group
+    if any(bounds.ll.x <= p.location.x <= bounds.ur.x and bounds.ll.y <= p.location.y <= bounds.ur.y
+           for p in pins):
+        return True
+    for zone in zones:
+        box = zone.bounding_box()
+        if box.ll.x <= bounds.ur.x and bounds.ll.x <= box.ur.x and box.ll.y <= bounds.ur.y and bounds.ll.y <= box.ur.y:
+            return True
+    return False
+
+
 def _ends_of(conn) -> tuple[str, str]:
     """A readable description of what a connection joins."""
     return _group_label(conn.a_group), _group_label(conn.b_group)
@@ -2039,9 +2229,12 @@ def route_board(
     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,
 ) -> RouteResult:
     """Convenience wrapper: build a :class:`GridRouter` and route the board."""
     router = GridRouter(
@@ -2062,8 +2255,11 @@ def route_board(
         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,
     )
     return router.route()

src/freeroute/route/pipeline.py

@@ -13,6 +13,7 @@ to DSN units (dividing by the resolution) for the SES ``(wire (path ...))`` and
 from __future__ import annotations
 
 import re
+import time
 
 from freeroute.board import build_board
 from freeroute.dsn import DsnBoard, parse_dsn
@@ -21,6 +22,7 @@ from freeroute.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 .window import window_reroute as window_reroute_stage
 
 __all__ = ["route", "route_dsn_board", "build_routing_result"]
 
@@ -121,6 +123,7 @@ def route_dsn_board(
     negotiate: int = 0,
     hole_to_hole_mm: float = 0.25,
     rollback: bool = True,
+    tree_nets: bool = True,
 ) -> 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
@@ -146,6 +149,7 @@ def route_dsn_board(
         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,
@@ -201,6 +205,7 @@ def build_routing_result(
     negotiate: int = 0,
     hole_to_hole_mm: float = 0.25,
     rollback: bool = True,
+    tree_nets: bool = True,
 ) -> RoutingResult:
     """Route ``dsn`` (grid track) and convert to a DSN-unit RoutingResult."""
     route, scale, layer_names = route_dsn_board(
@@ -211,6 +216,7 @@ def build_routing_result(
         negotiate=negotiate,
         hole_to_hole_mm=hole_to_hole_mm,
         rollback=rollback,
+        tree_nets=tree_nets,
     )
     return _to_routing_result(route, dsn, scale, layer_names)
 
@@ -232,6 +238,12 @@ def route_dsn_board_exact(
     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,
 ) -> 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.
@@ -243,28 +255,48 @@ 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,
+    }
+    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,
-        rollback=rollback,
-        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,
+        **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,
+        )
     return exact, scale, [layer.name for layer in dsn.layers]
 
 
@@ -285,6 +317,12 @@ def build_exact_routing_result(
     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,
 ) -> RoutingResult:
     """Route ``dsn`` (exact track) and convert to a DSN-unit RoutingResult."""
     exact, scale, layer_names = route_dsn_board_exact(
@@ -303,6 +341,12 @@ def build_exact_routing_result(
         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,
     )
     return _to_routing_result(exact.result, dsn, scale, layer_names)
 

src/freeroute/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 freeroute.board import BasicBoard, build_board
+from freeroute.board.items import ObstacleArea, Pin, Trace, Via
+from freeroute.dsn import DsnBoard
+from freeroute.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

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 freeroute.board import build_board
+from freeroute.dsn import parse_dsn
+from freeroute.route import exact_router
+from freeroute.route.grid_router import GridRouter, RouteResult
+from freeroute.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_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 freeroute.board import build_board
+from freeroute.dsn import parse_dsn
+from freeroute.geometry import IntBox
+from freeroute.route.grid_router import GridRouter
+from freeroute.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 freeroute.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 freeroute.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/test_cli.py

@@ -160,6 +160,8 @@ def test_cli_supported_combinations_are_accepted(tmp_path):
         "access": ["--access-cost", "5"],
         "negotiate": ["--negotiate", "2"],
         "rollback": ["--no-rollback"],
+        "tree": ["--no-tree"],
+        "window": ["--window-reroute", "1"],
     }
     for engine, options in ENGINE_OPTIONS.items():
         for option in options: