@tscircuit/cli 0.1.2450 → 0.1.2452

package/dist/cli/build/build.worker.js

@@ -40739,6 +40739,24 @@ import fs2 from "node:fs";
 import path2 from "node:path";
 import { convertCircuitJsonToPcbSvg } from "circuit-to-svg";
 
+// lib/shared/compute-cost-summary.ts
+var labelComputeCostSummary = (summary, getPcbPortLabel) => ({
+  ...summary,
+  topPairs: summary.topPairs.map((pair) => ({
+    ...pair,
+    labels: pair.pcbPortIds.map((pcbPortId) => {
+      if (pcbPortId === null)
+        return pair.connectionName;
+      return getPcbPortLabel(pcbPortId) ?? pair.connectionName;
+    })
+  }))
+});
+var formatHardestConnections = (summary, count = 5) => summary.topPairs.slice(0, count).map((pair) => {
+  const [from, to] = pair.labels;
+  const endpoints = from === to ? from : `${from} -> ${to}`;
+  return `${endpoints} (${pair.iterations} iters)`;
+}).join(", ");
+
 // lib/shared/convert-svg-to-png.ts
 import { Resvg } from "@resvg/resvg-js";
 var convertSvgToPngBuffer = (svg) => {
@@ -40802,6 +40820,7 @@ class AutorouterDiagnostics {
   options;
   phaseOrdinalBySubcircuit = new Map;
   traceCountBySubcircuit = new Map;
+  computeCostByStage = new Map;
   activePhase = null;
   completedPhaseTraces = [];
   hasWrittenPlacementSnapshot = false;
@@ -40877,6 +40896,7 @@ class AutorouterDiagnostics {
       phaseStageCount: event.phaseStageCount,
       routingPhaseIndex,
       phaseOrdinal,
+      _actualRoutingPhaseOrderIndex: event._actualRoutingPhaseOrderIndex,
       phaseCount: event.phaseCount,
       connectionCount,
       obstacleCount,
@@ -40911,10 +40931,12 @@ class AutorouterDiagnostics {
     }
   }
   handleProgress(event) {
+    this.rememberComputeCost(event);
     if (!this.activePhase)
       return;
     const now = performance.now();
-    this.activePhase.lastProgress = event;
+    const { computeCostSummary: _computeCostSummary, ...progress } = event;
+    this.activePhase.lastProgress = progress;
     if (!this.shouldLogPhaseDetails(this.activePhase))
       return;
     if (this.activePhase.lastProgressLogAt > 0 && now - this.activePhase.lastProgressLogAt < PROGRESS_LOG_INTERVAL_MS) {
@@ -40924,9 +40946,12 @@ class AutorouterDiagnostics {
     this.logProgress(this.activePhase, event, now);
   }
   handleEnd(event) {
+    const computeCostSummary = this.reportComputeCost(event, "end");
     const activePhase = this.matchActivePhase(event);
-    if (!activePhase)
+    if (!activePhase) {
+      this.recordUntrackedStage(event, computeCostSummary);
       return;
+    }
     const elapsedMs = performance.now() - activePhase.startedAt;
     const outputSrj = event.simpleRouteJson;
     const outputTraceCount = outputSrj?.traces?.length ?? 0;
@@ -40943,6 +40968,8 @@ class AutorouterDiagnostics {
       phaseStageCount: activePhase.phaseStageCount,
       routingPhaseIndex: activePhase.routingPhaseIndex,
       phaseOrdinal: activePhase.phaseOrdinal,
+      _actualRoutingPhaseOrderIndex: activePhase._actualRoutingPhaseOrderIndex,
+      computeCostSummary,
       phaseCount: activePhase.phaseCount,
       connectionCount: activePhase.connectionCount,
       obstacleCount: activePhase.obstacleCount,
@@ -40980,9 +41007,12 @@ class AutorouterDiagnostics {
     }
   }
   handleError(event) {
+    const computeCostSummary = this.reportComputeCost(event, "error");
     const activePhase = this.matchActivePhase(event);
-    if (!activePhase)
+    if (!activePhase) {
+      this.recordUntrackedStage(event, computeCostSummary, event.error);
       return;
+    }
     const elapsedMs = performance.now() - activePhase.startedAt;
     const error = this.serializeError(event.error);
     this.summary.push({
@@ -40993,6 +41023,8 @@ class AutorouterDiagnostics {
       phaseStageCount: activePhase.phaseStageCount,
       routingPhaseIndex: activePhase.routingPhaseIndex,
       phaseOrdinal: activePhase.phaseOrdinal,
+      _actualRoutingPhaseOrderIndex: activePhase._actualRoutingPhaseOrderIndex,
+      computeCostSummary,
       phaseCount: activePhase.phaseCount,
       connectionCount: activePhase.connectionCount,
       obstacleCount: activePhase.obstacleCount,
@@ -41046,6 +41078,7 @@ class AutorouterDiagnostics {
     return this.writeJson(timeoutFile, {
       type: "autorouter_phase_timeout",
       subcircuit_id: activePhase.subcircuitId,
+      _actualRoutingPhaseOrderIndex: activePhase._actualRoutingPhaseOrderIndex,
       componentDisplayName: activePhase.componentDisplayName,
       routingPhaseIndex: activePhase.routingPhaseIndex,
       phaseName: activePhase.phaseName,
@@ -41058,6 +41091,7 @@ class AutorouterDiagnostics {
       obstacleCount: activePhase.obstacleCount,
       previousTraceCount: activePhase.previousTraceCount,
       ...this.getExecutionMetadata(activePhase),
+      computeCostSummary: this.getLabeledComputeCost(activePhase),
       files: {
         inputSimpleRouteJson: inputFile,
         previousOutputTraces: previousTracesFile,
@@ -41066,6 +41100,72 @@ class AutorouterDiagnostics {
       lastProgress: activePhase.lastProgress
     });
   }
+  getStageKey(stage) {
+    const subcircuitId = stage.subcircuit_id ?? stage.subcircuitId;
+    if (!subcircuitId)
+      return;
+    const stageOrder = stage._actualRoutingPhaseOrderIndex ?? stage.phaseOrdinal ?? this.phaseOrdinalBySubcircuit.get(subcircuitId);
+    if (stageOrder === undefined)
+      return;
+    return `${subcircuitId}|${stageOrder}`;
+  }
+  rememberComputeCost(event) {
+    if (this.targetPhaseReached || !event.computeCostSummary)
+      return;
+    const key = this.getStageKey(event);
+    if (key)
+      this.computeCostByStage.set(key, event.computeCostSummary);
+  }
+  getLabeledComputeCost(stage) {
+    const key = this.getStageKey(stage);
+    const summary = stage.computeCostSummary ?? (key ? this.computeCostByStage.get(key) : undefined);
+    if (!summary)
+      return;
+    try {
+      const circuitJson = this.getCurrentCircuitJson();
+      return labelComputeCostSummary(summary, (pcbPortId) => this.getPcbPortLabel(pcbPortId, circuitJson));
+    } catch (error) {
+      this.log(kleur_default.yellow(`Warning: Could not format autorouter compute cost: ${error}`));
+      return;
+    }
+  }
+  getPcbPortLabel(pcbPortId, circuitJson) {
+    const pcbPort = circuitJson.find((element) => element.type === "pcb_port" && element.pcb_port_id === pcbPortId);
+    if (!pcbPort)
+      return null;
+    return this.getPortSelectorById(pcbPort.source_port_id, circuitJson);
+  }
+  reportComputeCost(event, outcome) {
+    if (this.targetPhaseReached)
+      return;
+    const computeCostSummary = this.getLabeledComputeCost(event);
+    if (!computeCostSummary)
+      return;
+    const shouldPrint = this.options.enabled || outcome === "error" && this.options.logOnError;
+    if (shouldPrint) {
+      const hardest = formatHardestConnections(computeCostSummary);
+      if (hardest)
+        this.log(`  hardest connections: ${hardest}`);
+    }
+    return computeCostSummary;
+  }
+  recordUntrackedStage(event, computeCostSummary, error) {
+    if (!computeCostSummary)
+      return;
+    const subcircuitId = event.subcircuit_id ?? event.subcircuitId;
+    this.summary.push({
+      subcircuit_id: subcircuitId,
+      _actualRoutingPhaseOrderIndex: event._actualRoutingPhaseOrderIndex,
+      phaseOrdinal: event.phaseOrdinal ?? this.phaseOrdinalBySubcircuit.get(subcircuitId ?? ""),
+      phaseName: event.phaseName,
+      componentDisplayName: event.componentDisplayName,
+      routingPhaseIndex: event.routingPhaseIndex,
+      phaseStageIndex: event.phaseStageIndex,
+      phaseStageCount: event.phaseStageCount,
+      ...error !== undefined ? { error: this.serializeError(error) } : {},
+      computeCostSummary
+    });
+  }
   checkLongRunning() {
     if (!this.activePhase)
       return;

package/dist/cli/main.js

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/dist/cli/main.js
-size: 47857017 bytes
-sha256: 9fd97f4ce16e924b68da1dbdcc6bd8bfcb059731996f50b92b7f19b5992ca7c8
+size: 47861683 bytes
+sha256: 3e013b98061dfbe5767ec63eb724f88f467d11fd79667c049e492cd102832b72

package/dist/cli/snapshot/snapshot.worker.js

@@ -19958,6 +19958,24 @@ import fs2 from "node:fs";
 import path2 from "node:path";
 import { convertCircuitJsonToPcbSvg as convertCircuitJsonToPcbSvg2 } from "circuit-to-svg";
 
+// lib/shared/compute-cost-summary.ts
+var labelComputeCostSummary = (summary, getPcbPortLabel) => ({
+  ...summary,
+  topPairs: summary.topPairs.map((pair) => ({
+    ...pair,
+    labels: pair.pcbPortIds.map((pcbPortId) => {
+      if (pcbPortId === null)
+        return pair.connectionName;
+      return getPcbPortLabel(pcbPortId) ?? pair.connectionName;
+    })
+  }))
+});
+var formatHardestConnections = (summary, count = 5) => summary.topPairs.slice(0, count).map((pair) => {
+  const [from, to] = pair.labels;
+  const endpoints = from === to ? from : `${from} -> ${to}`;
+  return `${endpoints} (${pair.iterations} iters)`;
+}).join(", ");
+
 // lib/shared/convert-svg-to-png.ts
 import { Resvg } from "@resvg/resvg-js";
 var convertSvgToPngBuffer = (svg) => {
@@ -20021,6 +20039,7 @@ class AutorouterDiagnostics {
   options;
   phaseOrdinalBySubcircuit = new Map;
   traceCountBySubcircuit = new Map;
+  computeCostByStage = new Map;
   activePhase = null;
   completedPhaseTraces = [];
   hasWrittenPlacementSnapshot = false;
@@ -20096,6 +20115,7 @@ class AutorouterDiagnostics {
       phaseStageCount: event.phaseStageCount,
       routingPhaseIndex,
       phaseOrdinal,
+      _actualRoutingPhaseOrderIndex: event._actualRoutingPhaseOrderIndex,
       phaseCount: event.phaseCount,
       connectionCount,
       obstacleCount,
@@ -20130,10 +20150,12 @@ class AutorouterDiagnostics {
     }
   }
   handleProgress(event) {
+    this.rememberComputeCost(event);
     if (!this.activePhase)
       return;
     const now = performance.now();
-    this.activePhase.lastProgress = event;
+    const { computeCostSummary: _computeCostSummary, ...progress } = event;
+    this.activePhase.lastProgress = progress;
     if (!this.shouldLogPhaseDetails(this.activePhase))
       return;
     if (this.activePhase.lastProgressLogAt > 0 && now - this.activePhase.lastProgressLogAt < PROGRESS_LOG_INTERVAL_MS) {
@@ -20143,9 +20165,12 @@ class AutorouterDiagnostics {
     this.logProgress(this.activePhase, event, now);
   }
   handleEnd(event) {
+    const computeCostSummary = this.reportComputeCost(event, "end");
     const activePhase = this.matchActivePhase(event);
-    if (!activePhase)
+    if (!activePhase) {
+      this.recordUntrackedStage(event, computeCostSummary);
       return;
+    }
     const elapsedMs = performance.now() - activePhase.startedAt;
     const outputSrj = event.simpleRouteJson;
     const outputTraceCount = outputSrj?.traces?.length ?? 0;
@@ -20162,6 +20187,8 @@ class AutorouterDiagnostics {
       phaseStageCount: activePhase.phaseStageCount,
       routingPhaseIndex: activePhase.routingPhaseIndex,
       phaseOrdinal: activePhase.phaseOrdinal,
+      _actualRoutingPhaseOrderIndex: activePhase._actualRoutingPhaseOrderIndex,
+      computeCostSummary,
       phaseCount: activePhase.phaseCount,
       connectionCount: activePhase.connectionCount,
       obstacleCount: activePhase.obstacleCount,
@@ -20199,9 +20226,12 @@ class AutorouterDiagnostics {
     }
   }
   handleError(event) {
+    const computeCostSummary = this.reportComputeCost(event, "error");
     const activePhase = this.matchActivePhase(event);
-    if (!activePhase)
+    if (!activePhase) {
+      this.recordUntrackedStage(event, computeCostSummary, event.error);
       return;
+    }
     const elapsedMs = performance.now() - activePhase.startedAt;
     const error = this.serializeError(event.error);
     this.summary.push({
@@ -20212,6 +20242,8 @@ class AutorouterDiagnostics {
       phaseStageCount: activePhase.phaseStageCount,
       routingPhaseIndex: activePhase.routingPhaseIndex,
       phaseOrdinal: activePhase.phaseOrdinal,
+      _actualRoutingPhaseOrderIndex: activePhase._actualRoutingPhaseOrderIndex,
+      computeCostSummary,
       phaseCount: activePhase.phaseCount,
       connectionCount: activePhase.connectionCount,
       obstacleCount: activePhase.obstacleCount,
@@ -20265,6 +20297,7 @@ class AutorouterDiagnostics {
     return this.writeJson(timeoutFile, {
       type: "autorouter_phase_timeout",
       subcircuit_id: activePhase.subcircuitId,
+      _actualRoutingPhaseOrderIndex: activePhase._actualRoutingPhaseOrderIndex,
       componentDisplayName: activePhase.componentDisplayName,
       routingPhaseIndex: activePhase.routingPhaseIndex,
       phaseName: activePhase.phaseName,
@@ -20277,6 +20310,7 @@ class AutorouterDiagnostics {
       obstacleCount: activePhase.obstacleCount,
       previousTraceCount: activePhase.previousTraceCount,
       ...this.getExecutionMetadata(activePhase),
+      computeCostSummary: this.getLabeledComputeCost(activePhase),
       files: {
         inputSimpleRouteJson: inputFile,
         previousOutputTraces: previousTracesFile,
@@ -20285,6 +20319,72 @@ class AutorouterDiagnostics {
       lastProgress: activePhase.lastProgress
     });
   }
+  getStageKey(stage) {
+    const subcircuitId = stage.subcircuit_id ?? stage.subcircuitId;
+    if (!subcircuitId)
+      return;
+    const stageOrder = stage._actualRoutingPhaseOrderIndex ?? stage.phaseOrdinal ?? this.phaseOrdinalBySubcircuit.get(subcircuitId);
+    if (stageOrder === undefined)
+      return;
+    return `${subcircuitId}|${stageOrder}`;
+  }
+  rememberComputeCost(event) {
+    if (this.targetPhaseReached || !event.computeCostSummary)
+      return;
+    const key = this.getStageKey(event);
+    if (key)
+      this.computeCostByStage.set(key, event.computeCostSummary);
+  }
+  getLabeledComputeCost(stage) {
+    const key = this.getStageKey(stage);
+    const summary = stage.computeCostSummary ?? (key ? this.computeCostByStage.get(key) : undefined);
+    if (!summary)
+      return;
+    try {
+      const circuitJson = this.getCurrentCircuitJson();
+      return labelComputeCostSummary(summary, (pcbPortId) => this.getPcbPortLabel(pcbPortId, circuitJson));
+    } catch (error) {
+      this.log(kleur_default.yellow(`Warning: Could not format autorouter compute cost: ${error}`));
+      return;
+    }
+  }
+  getPcbPortLabel(pcbPortId, circuitJson) {
+    const pcbPort = circuitJson.find((element) => element.type === "pcb_port" && element.pcb_port_id === pcbPortId);
+    if (!pcbPort)
+      return null;
+    return this.getPortSelectorById(pcbPort.source_port_id, circuitJson);
+  }
+  reportComputeCost(event, outcome) {
+    if (this.targetPhaseReached)
+      return;
+    const computeCostSummary = this.getLabeledComputeCost(event);
+    if (!computeCostSummary)
+      return;
+    const shouldPrint = this.options.enabled || outcome === "error" && this.options.logOnError;
+    if (shouldPrint) {
+      const hardest = formatHardestConnections(computeCostSummary);
+      if (hardest)
+        this.log(`  hardest connections: ${hardest}`);
+    }
+    return computeCostSummary;
+  }
+  recordUntrackedStage(event, computeCostSummary, error) {
+    if (!computeCostSummary)
+      return;
+    const subcircuitId = event.subcircuit_id ?? event.subcircuitId;
+    this.summary.push({
+      subcircuit_id: subcircuitId,
+      _actualRoutingPhaseOrderIndex: event._actualRoutingPhaseOrderIndex,
+      phaseOrdinal: event.phaseOrdinal ?? this.phaseOrdinalBySubcircuit.get(subcircuitId ?? ""),
+      phaseName: event.phaseName,
+      componentDisplayName: event.componentDisplayName,
+      routingPhaseIndex: event.routingPhaseIndex,
+      phaseStageIndex: event.phaseStageIndex,
+      phaseStageCount: event.phaseStageCount,
+      ...error !== undefined ? { error: this.serializeError(error) } : {},
+      computeCostSummary
+    });
+  }
   checkLongRunning() {
     if (!this.activePhase)
       return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.2450",
+  "version": "0.1.2452",
   "repository": {
     "type": "git",
     "url": "https://github.com/tscircuit/cli"