@tscircuit/schematic-trace-solver 0.0.155 → 0.0.157

package/dist/index.d.ts

@@ -191,6 +191,7 @@ type MspConnectionPair = {
 declare class MspConnectionPairSolver extends BaseSolver {
     inputProblem: InputProblem;
     mspConnectionPairs: MspConnectionPair[];
+    mspConnectionPairIds: Set<string>;
     dcConnMap: ConnectivityMap;
     globalConnMap: ConnectivityMap;
     queuedDcNetIds: string[];
@@ -205,6 +206,7 @@ declare class MspConnectionPairSolver extends BaseSolver {
         inputProblem: InputProblem;
     });
     getConstructorParams(): ConstructorParameters<typeof MspConnectionPairSolver>[0];
+    private addMspConnectionPair;
     _step(): void;
     visualize(): GraphicsObject;
 }
@@ -244,6 +246,7 @@ declare class SchematicTraceSingleLineSolver2 extends BaseSolver {
         maxY: number;
     };
     baseElbow: Point[];
+    preferExteriorDetours: boolean;
     solvedTracePath: Point[] | null;
     private queue;
     private visited;
@@ -252,6 +255,7 @@ declare class SchematicTraceSingleLineSolver2 extends BaseSolver {
         connectionPair?: MspConnectionPair;
         inputProblem: InputProblem;
         chipMap: Record<string, InputChip>;
+        preferExteriorDetours?: boolean;
     });
     getConstructorParams(): ConstructorParameters<typeof SchematicTraceSingleLineSolver2>[0];
     private getTextBoxPaddingForConnectionPair;

package/dist/index.js

@@ -503,6 +503,7 @@ var getPinPairKey = (pinIds) => [...pinIds].sort().join("::");
 var MspConnectionPairSolver = class extends BaseSolver {
   inputProblem;
   mspConnectionPairs = [];
+  mspConnectionPairIds = /* @__PURE__ */ new Set();
   dcConnMap;
   globalConnMap;
   queuedDcNetIds;
@@ -550,6 +551,11 @@ var MspConnectionPairSolver = class extends BaseSolver {
       inputProblem: this.inputProblem
     };
   }
+  addMspConnectionPair(pair) {
+    if (this.mspConnectionPairIds.has(pair.mspPairId)) return;
+    this.mspConnectionPairIds.add(pair.mspPairId);
+    this.mspConnectionPairs.push(pair);
+  }
   _step() {
     if (this.queuedDcNetIds.length === 0) {
       this.solved = true;
@@ -594,7 +600,7 @@ var MspConnectionPairSolver = class extends BaseSolver {
       const globalConnNetId = this.globalConnMap.getNetConnectedToId(pin1);
       const userNetId = this.userNetIdByPinId[pin1] ?? this.userNetIdByPinId[pin2];
       const suppressNetLabel = pairDistance > this.maxMspPairDistance && labeledConnectionRouteReason === "overlapping-fallback-labels";
-      this.mspConnectionPairs.push({
+      this.addMspConnectionPair({
         mspPairId: `${pin1}-${pin2}`,
         dcConnNetId: dcNetId,
         globalConnNetId,
@@ -639,7 +645,7 @@ var MspConnectionPairSolver = class extends BaseSolver {
       }
       const globalConnNetId = this.globalConnMap.getNetConnectedToId(pin1);
       const userNetId = this.userNetIdByPinId[pin1] ?? this.userNetIdByPinId[pin2];
-      this.mspConnectionPairs.push({
+      this.addMspConnectionPair({
         mspPairId: `${pin1}-${pin2}`,
         dcConnNetId: dcNetId,
         globalConnNetId,
@@ -1255,6 +1261,7 @@ var SchematicTraceSingleLineSolver2 = class extends BaseSolver {
   endpointTextObstacles;
   aabb;
   baseElbow;
+  preferExteriorDetours;
   solvedTracePath = null;
   queue = [];
   visited = /* @__PURE__ */ new Set();
@@ -1264,6 +1271,7 @@ var SchematicTraceSingleLineSolver2 = class extends BaseSolver {
     this.connectionPair = params.connectionPair;
     this.inputProblem = params.inputProblem;
     this.chipMap = params.chipMap;
+    this.preferExteriorDetours = params.preferExteriorDetours ?? true;
     for (const pin of this.pins) {
       if (!pin._facingDirection) {
         const chip = this.chipMap[pin.chipId];
@@ -1316,7 +1324,8 @@ var SchematicTraceSingleLineSolver2 = class extends BaseSolver {
       chipMap: this.chipMap,
       pins: this.pins,
       connectionPair: this.connectionPair,
-      inputProblem: this.inputProblem
+      inputProblem: this.inputProblem,
+      preferExteriorDetours: this.preferExteriorDetours
     };
   }
   getTextBoxPaddingForConnectionPair() {
@@ -1481,7 +1490,6 @@ var SchematicTraceSingleLineSolver2 = class extends BaseSolver {
     const isEndpointChipObstacle = rect.kind === "chip" && this.pins.some((pin) => pin.chipId === rect.chipId);
     const canGenerateEndpointDetour = path.length === 3 || path.length === 4 && this.connectionPair !== void 0 && !isEndpointChipObstacle;
     if (canGenerateEndpointDetour && (isFirstSegment || isLastSegment)) {
-      const compareDetours = path.length === 4 ? (a2, b2) => this.getPinBandPenalty(a2) - this.getPinBandPenalty(b2) || this.pathLength(a2) - this.pathLength(b2) : (a2, b2) => this.pathLength(a2) - this.pathLength(b2) || this.getPinBandPenalty(a2) - this.getPinBandPenalty(b2);
       const detours = generateEndpointCollisionDetours({
         path,
         collidingSegmentIndex: segIndex,
@@ -1491,7 +1499,12 @@ var SchematicTraceSingleLineSolver2 = class extends BaseSolver {
         if (this.visited.has(key)) return false;
         this.visited.add(key);
         return true;
-      }).sort(compareDetours);
+      }).sort((a2, b2) => {
+        if (path.length === 4 && this.preferExteriorDetours) {
+          return this.getPinBandPenalty(a2) - this.getPinBandPenalty(b2) || this.pathLength(a2) - this.pathLength(b2);
+        }
+        return this.pathLength(a2) - this.pathLength(b2) || this.getPinBandPenalty(a2) - this.getPinBandPenalty(b2);
+      });
       for (const detour of detours) {
         const nextCollisionRects = new Set(collisionRects);
         nextCollisionRects.add(rect);
@@ -1644,6 +1657,24 @@ var SchematicTraceSingleLineSolver2 = class extends BaseSolver {
 import { getBounds } from "graphics-debug";
 
 // lib/solvers/SchematicTraceLinesSolver/SchematicTraceLinesSolver.ts
+var shouldPreferExteriorDetours = ({
+  connectionPair,
+  allConnectionPairs,
+  inputProblem
+}) => {
+  const [firstPin, secondPin] = connectionPair.pins;
+  const belongsToNetConnection = inputProblem.netConnections.some(
+    (netConnection) => netConnection.pinIds.includes(firstPin.pinId) && netConnection.pinIds.includes(secondPin.pinId)
+  );
+  if (belongsToNetConnection) return true;
+  return allConnectionPairs.some((otherPair) => {
+    if (otherPair === connectionPair) return false;
+    const [otherFirstPin, otherSecondPin] = otherPair.pins;
+    const sameOrder = firstPin.chipId === otherFirstPin.chipId && secondPin.chipId === otherSecondPin.chipId;
+    if (sameOrder) return true;
+    return firstPin.chipId === otherSecondPin.chipId && secondPin.chipId === otherFirstPin.chipId;
+  });
+};
 var SchematicTraceLinesSolver = class extends BaseSolver {
   inputProblem;
   mspConnectionPairs;
@@ -1711,7 +1742,12 @@ var SchematicTraceLinesSolver = class extends BaseSolver {
       inputProblem: this.inputProblem,
       pins,
       connectionPair,
-      chipMap: this.chipMap
+      chipMap: this.chipMap,
+      preferExteriorDetours: shouldPreferExteriorDetours({
+        connectionPair,
+        allConnectionPairs: this.mspConnectionPairs,
+        inputProblem: this.inputProblem
+      })
     });
   }
   visualize() {

package/lib/solvers/MspConnectionPairSolver/MspConnectionPairSolver.ts

@@ -35,6 +35,7 @@ export class MspConnectionPairSolver extends BaseSolver {
   inputProblem: InputProblem
 
   mspConnectionPairs: MspConnectionPair[] = []
+  mspConnectionPairIds = new Set<MspConnectionPairId>()
   dcConnMap: ConnectivityMap
   globalConnMap: ConnectivityMap
   queuedDcNetIds: string[]
@@ -97,6 +98,13 @@ export class MspConnectionPairSolver extends BaseSolver {
     }
   }
 
+  private addMspConnectionPair(pair: MspConnectionPair) {
+    if (this.mspConnectionPairIds.has(pair.mspPairId)) return
+
+    this.mspConnectionPairIds.add(pair.mspPairId)
+    this.mspConnectionPairs.push(pair)
+  }
+
   override _step() {
     if (this.queuedDcNetIds.length === 0) {
       this.solved = true
@@ -164,7 +172,7 @@ export class MspConnectionPairSolver extends BaseSolver {
         pairDistance > this.maxMspPairDistance &&
         labeledConnectionRouteReason === "overlapping-fallback-labels"
 
-      this.mspConnectionPairs.push({
+      this.addMspConnectionPair({
         mspPairId: `${pin1}-${pin2}`,
         dcConnNetId: dcNetId,
         globalConnNetId,
@@ -226,7 +234,7 @@ export class MspConnectionPairSolver extends BaseSolver {
       const globalConnNetId = this.globalConnMap.getNetConnectedToId(pin1!)!
       const userNetId =
         this.userNetIdByPinId[pin1!] ?? this.userNetIdByPinId[pin2!]
-      this.mspConnectionPairs.push({
+      this.addMspConnectionPair({
         mspPairId: `${pin1}-${pin2}`,
         dcConnNetId: dcNetId,
         globalConnNetId,

package/lib/solvers/SchematicTraceLinesSolver/SchematicTraceLinesSolver.ts

@@ -12,6 +12,39 @@ import type { Guideline } from "../GuidelinesSolver/GuidelinesSolver"
 import { visualizeGuidelines } from "../GuidelinesSolver/visualizeGuidelines"
 import type { Point } from "@tscircuit/math-utils"
 
+const shouldPreferExteriorDetours = ({
+  connectionPair,
+  allConnectionPairs,
+  inputProblem,
+}: {
+  connectionPair: MspConnectionPair
+  allConnectionPairs: MspConnectionPair[]
+  inputProblem: InputProblem
+}) => {
+  const [firstPin, secondPin] = connectionPair.pins
+  const belongsToNetConnection = inputProblem.netConnections.some(
+    (netConnection) =>
+      netConnection.pinIds.includes(firstPin.pinId) &&
+      netConnection.pinIds.includes(secondPin.pinId),
+  )
+  if (belongsToNetConnection) return true
+
+  return allConnectionPairs.some((otherPair) => {
+    if (otherPair === connectionPair) return false
+
+    const [otherFirstPin, otherSecondPin] = otherPair.pins
+    const sameOrder =
+      firstPin.chipId === otherFirstPin.chipId &&
+      secondPin.chipId === otherSecondPin.chipId
+    if (sameOrder) return true
+
+    return (
+      firstPin.chipId === otherSecondPin.chipId &&
+      secondPin.chipId === otherFirstPin.chipId
+    )
+  })
+}
+
 export interface SolvedTracePath extends MspConnectionPair {
   tracePath: Point[]
   mspConnectionPairIds: MspConnectionPairId[]
@@ -112,6 +145,11 @@ export class SchematicTraceLinesSolver extends BaseSolver {
       pins,
       connectionPair,
       chipMap: this.chipMap,
+      preferExteriorDetours: shouldPreferExteriorDetours({
+        connectionPair,
+        allConnectionPairs: this.mspConnectionPairs,
+        inputProblem: this.inputProblem,
+      }),
     })
   }
 

package/lib/solvers/SchematicTraceLinesSolver/SchematicTraceSingleLineSolver2/SchematicTraceSingleLineSolver2.ts

@@ -90,6 +90,7 @@ export class SchematicTraceSingleLineSolver2 extends BaseSolver {
   aabb: { minX: number; maxX: number; minY: number; maxY: number }
 
   baseElbow: Point[]
+  preferExteriorDetours: boolean
 
   solvedTracePath: Point[] | null = null
 
@@ -102,12 +103,14 @@ export class SchematicTraceSingleLineSolver2 extends BaseSolver {
     connectionPair?: MspConnectionPair
     inputProblem: InputProblem
     chipMap: Record<string, InputChip>
+    preferExteriorDetours?: boolean
   }) {
     super()
     this.pins = params.pins
     this.connectionPair = params.connectionPair
     this.inputProblem = params.inputProblem
     this.chipMap = params.chipMap
+    this.preferExteriorDetours = params.preferExteriorDetours ?? true
 
     // Ensure facing directions are present
     for (const pin of this.pins) {
@@ -190,6 +193,7 @@ export class SchematicTraceSingleLineSolver2 extends BaseSolver {
       pins: this.pins,
       connectionPair: this.connectionPair,
       inputProblem: this.inputProblem,
+      preferExteriorDetours: this.preferExteriorDetours,
     }
   }
 
@@ -423,16 +427,8 @@ export class SchematicTraceSingleLineSolver2 extends BaseSolver {
     if (canGenerateEndpointDetour && (isFirstSegment || isLastSegment)) {
       // A three-point detour replaces an L elbow, so the shortest valid route
       // remains the best choice. A four-point detour preserves the far side of
-      // a U elbow; prefer the candidate that keeps its new internal rails out
-      // of the pin band, then use length to choose between equivalent routes.
-      const compareDetours =
-        path.length === 4
-          ? (a: Point[], b: Point[]) =>
-              this.getPinBandPenalty(a) - this.getPinBandPenalty(b) ||
-              this.pathLength(a) - this.pathLength(b)
-          : (a: Point[], b: Point[]) =>
-              this.pathLength(a) - this.pathLength(b) ||
-              this.getPinBandPenalty(a) - this.getPinBandPenalty(b)
+      // a U elbow. Bundled or net-connected traces preserve the exterior route;
+      // isolated direct traces prefer the shorter route.
       const detours = generateEndpointCollisionDetours({
         path,
         collidingSegmentIndex: segIndex,
@@ -444,7 +440,19 @@ export class SchematicTraceSingleLineSolver2 extends BaseSolver {
           this.visited.add(key)
           return true
         })
-        .sort(compareDetours)
+        .sort((a, b) => {
+          if (path.length === 4 && this.preferExteriorDetours) {
+            return (
+              this.getPinBandPenalty(a) - this.getPinBandPenalty(b) ||
+              this.pathLength(a) - this.pathLength(b)
+            )
+          }
+
+          return (
+            this.pathLength(a) - this.pathLength(b) ||
+            this.getPinBandPenalty(a) - this.getPinBandPenalty(b)
+          )
+        })
 
       for (const detour of detours) {
         const nextCollisionRects = new Set(collisionRects)

package/package.json

@@ -5,7 +5,7 @@
     "url": "https://github.com/tscircuit/schematic-trace-solver.git"
   },
   "main": "dist/index.js",
-  "version": "0.0.155",
+  "version": "0.0.157",
   "type": "module",
   "scripts": {
     "start": "cosmos",

package/site/bug-reports/bug-report-20260825T045913Z.page.tsx

@@ -0,0 +1,4 @@
+import { PipelineDebugger } from "site/components/PipelineDebugger"
+import inputProblem from "../../tests/bug-reports/bug-report-20260825T045913Z/bug-report-20260825T045913Z.json"
+
+export default () => <PipelineDebugger inputProblem={inputProblem as any} />

package/site/components/PipelineDebugger.tsx

@@ -7,13 +7,15 @@ import { PipelineStageTable } from "./PipelineStageTable"
 
 export const PipelineDebugger = ({
   inputProblem,
+  hideRatsNet = false,
 }: {
   inputProblem: InputProblem
+  hideRatsNet?: boolean
 }) => {
   const [, incRenderCount] = useReducer((x) => x + 1, 0)
   const solver = useMemo(
-    () => new SchematicTracePipelineSolver(inputProblem),
-    [],
+    () => new SchematicTracePipelineSolver(inputProblem, { hideRatsNet }),
+    [inputProblem, hideRatsNet],
   )
 
   return (

package/site/examples/example51.page.tsx

@@ -1,4 +1,6 @@
 import { PipelineDebugger } from "site/components/PipelineDebugger"
 import inputProblem from "../../tests/assets/example51.json"
 
-export default () => <PipelineDebugger inputProblem={inputProblem as any} />
+export default () => (
+  <PipelineDebugger inputProblem={inputProblem as any} hideRatsNet />
+)