@tscircuit/copper-pour-solver 0.0.34 → 0.0.35

package/README.md

@@ -67,12 +67,21 @@ const gnd = circuitJson.find(
 
 const inputProblem = convertCircuitJsonToInputProblem(circuitJson, {
   layer: "top",
+  subcircuit_id: gnd.subcircuit_id,
   subcircuit_connectivity_map_key: gnd.subcircuit_connectivity_map_key,
   pad_margin: 0.4,
   trace_margin: 0.2,
 })
 ```
 
+Pass `subcircuit_id` when selecting a net inside a subcircuit. The converter
+considers that subcircuit and its child subcircuits, but it does not treat
+matching child `subcircuit_connectivity_map_key` values as connected unless the
+Circuit JSON connectivity actually connects them. Internally, the generated
+`globalConnectivityMap` is kept separate from the scoped
+`subcircuitConnectivityMap`; scoped solver connectivity keys are prefixed with
+their subcircuit id.
+
 Do not generate or pass ids from `circuit-json-to-connectivity-map`. The
 converter handles PCB connectivity internally and normalizes it to stable
 `subcircuit_connectivity_map_key` values.

package/dist/index.d.ts

@@ -67,6 +67,7 @@ declare const initializeManifoldGeometry: () => Promise<void>;
 
 interface ConvertCircuitJsonToInputProblemOptions {
     layer: LayerRef;
+    subcircuit_id?: string;
     source_net_id?: string;
     source_net_name?: string;
     subcircuit_connectivity_map_key?: string;

package/dist/index.js

@@ -548,50 +548,170 @@ var getElementSubcircuitConnectivityKey = (element) => {
 };
 
 // lib/circuit-json/buildSubcircuitConnectivityLookup.ts
-var buildSubcircuitConnectivityLookup = (circuitJson, connectivityMap) => {
+var getElementSubcircuitId = (element) => {
+  const subcircuitId = element.subcircuit_id;
+  return typeof subcircuitId === "string" && subcircuitId.length > 0 ? subcircuitId : void 0;
+};
+var getScopedSubcircuitConnectivityKey = (subcircuitId, subcircuitConnectivityMapKey) => subcircuitId ? `subcircuit:${subcircuitId}:connectivity:${subcircuitConnectivityMapKey}` : subcircuitConnectivityMapKey;
+var getDescendantSubcircuitIds = (circuitJson, rootSubcircuitId) => {
+  if (!rootSubcircuitId) return void 0;
+  const sourceGroupIdToSubcircuitId = {};
+  for (const element of circuitJson) {
+    if (element.type !== "source_group") continue;
+    const sourceGroupId = element.source_group_id;
+    const subcircuitId = getElementSubcircuitId(element);
+    if (typeof sourceGroupId === "string" && subcircuitId) {
+      sourceGroupIdToSubcircuitId[sourceGroupId] = subcircuitId;
+    }
+  }
+  const descendantSubcircuitIds = /* @__PURE__ */ new Set([rootSubcircuitId]);
+  let changed = true;
+  while (changed) {
+    changed = false;
+    for (const element of circuitJson) {
+      if (element.type !== "source_group") continue;
+      const subcircuitId = getElementSubcircuitId(element);
+      if (!subcircuitId || descendantSubcircuitIds.has(subcircuitId)) continue;
+      const parentSubcircuitId = element.parent_subcircuit_id;
+      const parentSourceGroupId = element.parent_source_group_id;
+      const parentSourceGroupSubcircuitId = typeof parentSourceGroupId === "string" ? sourceGroupIdToSubcircuitId[parentSourceGroupId] : void 0;
+      if (typeof parentSubcircuitId === "string" && descendantSubcircuitIds.has(parentSubcircuitId) || parentSourceGroupSubcircuitId && descendantSubcircuitIds.has(parentSourceGroupSubcircuitId)) {
+        descendantSubcircuitIds.add(subcircuitId);
+        changed = true;
+      }
+    }
+  }
+  return descendantSubcircuitIds;
+};
+var buildSubcircuitConnectivityLookup = (circuitJson, globalConnectivityMap, rootSubcircuitId) => {
+  const descendantSubcircuitIds = getDescendantSubcircuitIds(
+    circuitJson,
+    rootSubcircuitId
+  );
   const idToSubcircuitConnectivityKey = {};
+  const idToSubcircuitId = {};
+  const scopedKeyToIds = {};
+  const localSubcircuitConnectivityKeys = /* @__PURE__ */ new Set();
   for (const element of circuitJson) {
     const id = getElementId(element);
     const key = getElementSubcircuitConnectivityKey(element);
+    const subcircuitId = getElementSubcircuitId(element);
+    if (id) {
+      idToSubcircuitId[id] = subcircuitId;
+    }
+    if (descendantSubcircuitIds && (!subcircuitId || !descendantSubcircuitIds.has(subcircuitId))) {
+      continue;
+    }
     if (id && key) {
-      idToSubcircuitConnectivityKey[id] = key;
+      const scopedKey = getScopedSubcircuitConnectivityKey(subcircuitId, key);
+      idToSubcircuitConnectivityKey[id] = scopedKey;
+      localSubcircuitConnectivityKeys.add(key);
+      scopedKeyToIds[scopedKey] ??= [];
+      scopedKeyToIds[scopedKey].push(id);
     }
   }
   const generatedNetIdToSubcircuitConnectivityKey = {};
   for (const [generatedNetId, connectedIds] of Object.entries(
-    connectivityMap.netMap
+    globalConnectivityMap.netMap
   )) {
     const connectedSubcircuitKeys = new Set(
       connectedIds.map((id) => idToSubcircuitConnectivityKey[id]).filter((key) => Boolean(key))
     );
-    if (connectedSubcircuitKeys.size > 1) {
+    const subcircuitKey = Array.from(connectedSubcircuitKeys).sort()[0];
+    if (subcircuitKey) {
+      generatedNetIdToSubcircuitConnectivityKey[generatedNetId] = subcircuitKey;
+    }
+  }
+  const subcircuitConnectivityMap = {};
+  for (const [scopedKey, ids] of Object.entries(scopedKeyToIds)) {
+    const resolvedKeys = /* @__PURE__ */ new Set();
+    for (const id of ids) {
+      const generatedNetId = globalConnectivityMap.getNetConnectedToId(id);
+      const resolvedKey2 = generatedNetId ? generatedNetIdToSubcircuitConnectivityKey[generatedNetId] : void 0;
+      resolvedKeys.add(resolvedKey2 ?? scopedKey);
+    }
+    if (resolvedKeys.size > 1) {
       throw new Error(
-        `Multiple subcircuit connectivity keys found for generated connectivity map net "${generatedNetId}": ${Array.from(connectedSubcircuitKeys).join(", ")}`
+        `subcircuit_connectivity_map_key "${scopedKey}" maps to multiple global connectivity keys: ${Array.from(resolvedKeys).join(", ")}`
       );
     }
-    const subcircuitKey = connectedSubcircuitKeys.values().next().value;
-    if (subcircuitKey) {
-      generatedNetIdToSubcircuitConnectivityKey[generatedNetId] = subcircuitKey;
+    const resolvedKey = resolvedKeys.values().next().value;
+    if (resolvedKey) {
+      subcircuitConnectivityMap[scopedKey] = resolvedKey;
     }
   }
   return {
-    knownSubcircuitConnectivityKeys: new Set(
-      Object.values(idToSubcircuitConnectivityKey)
-    ),
+    knownSubcircuitConnectivityKeys: /* @__PURE__ */ new Set([
+      ...Object.keys(scopedKeyToIds),
+      ...localSubcircuitConnectivityKeys
+    ]),
+    descendantSubcircuitIds,
+    getScopedSubcircuitConnectivityKey,
+    getElementSubcircuitId,
+    resolveSubcircuitConnectivityKey(subcircuitConnectivityMapKey, subcircuitId) {
+      const matchingScopedKeys = Object.keys(scopedKeyToIds).filter(
+        (scopedKey) => scopedKey === getScopedSubcircuitConnectivityKey(
+          subcircuitId,
+          subcircuitConnectivityMapKey
+        )
+      );
+      if (subcircuitId && matchingScopedKeys.length === 0 && descendantSubcircuitIds) {
+        matchingScopedKeys.push(
+          ...Object.keys(scopedKeyToIds).filter(
+            (scopedKey) => scopedKey.endsWith(`:connectivity:${subcircuitConnectivityMapKey}`)
+          )
+        );
+      }
+      if (!subcircuitId) {
+        matchingScopedKeys.push(
+          ...Object.keys(scopedKeyToIds).filter(
+            (scopedKey) => scopedKey.endsWith(`:connectivity:${subcircuitConnectivityMapKey}`)
+          )
+        );
+      }
+      const uniqueMatchingScopedKeys = Array.from(new Set(matchingScopedKeys));
+      if (uniqueMatchingScopedKeys.length === 0) {
+        if (subcircuitId && descendantSubcircuitIds) {
+          throw new Error(
+            `No subcircuit_connectivity_map_key "${subcircuitConnectivityMapKey}" found in subcircuit "${subcircuitId}" or its child subcircuits.`
+          );
+        }
+        return getScopedSubcircuitConnectivityKey(
+          subcircuitId,
+          subcircuitConnectivityMapKey
+        );
+      }
+      if (uniqueMatchingScopedKeys.length > 1) {
+        throw new Error(
+          `subcircuit_connectivity_map_key "${subcircuitConnectivityMapKey}" exists in multiple subcircuits. Pass subcircuit_id to disambiguate.`
+        );
+      }
+      return subcircuitConnectivityMap[uniqueMatchingScopedKeys[0]] ?? uniqueMatchingScopedKeys[0];
+    },
     getSubcircuitConnectivityKeyForId(id) {
+      if (descendantSubcircuitIds) {
+        const subcircuitId = idToSubcircuitId[id];
+        if (!subcircuitId || !descendantSubcircuitIds.has(subcircuitId)) {
+          return void 0;
+        }
+      }
       const directKey = idToSubcircuitConnectivityKey[id];
-      if (directKey) return directKey;
-      const generatedNetId = connectivityMap.getNetConnectedToId(id);
-      if (!generatedNetId) return void 0;
-      return generatedNetIdToSubcircuitConnectivityKey[generatedNetId];
+      const generatedNetId = globalConnectivityMap.getNetConnectedToId(id);
+      if (!generatedNetId) {
+        return directKey ? subcircuitConnectivityMap[directKey] ?? directKey : void 0;
+      }
+      return generatedNetIdToSubcircuitConnectivityKey[generatedNetId] ?? (directKey ? subcircuitConnectivityMap[directKey] : void 0) ?? directKey;
     }
   };
 };
 
 // lib/circuit-json/resolvePourConnectivityKey.ts
-var resolvePourConnectivityKey = (circuitJson, options, knownSubcircuitConnectivityKeys) => {
+var resolvePourConnectivityKey = (circuitJson, options, subcircuitConnectivityMap) => {
   if (options.subcircuit_connectivity_map_key) {
-    return options.subcircuit_connectivity_map_key;
+    return subcircuitConnectivityMap.resolveSubcircuitConnectivityKey(
+      options.subcircuit_connectivity_map_key,
+      options.subcircuit_id
+    );
   }
   if (options.source_net_id) {
     const sourceNet = circuitJson.find(
@@ -605,11 +725,18 @@ var resolvePourConnectivityKey = (circuitJson, options, knownSubcircuitConnectiv
         `source_net "${options.source_net_id}" has no subcircuit_connectivity_map_key`
       );
     }
-    return sourceNet.subcircuit_connectivity_map_key;
+    return subcircuitConnectivityMap.resolveSubcircuitConnectivityKey(
+      sourceNet.subcircuit_connectivity_map_key,
+      sourceNet.subcircuit_id ?? options.subcircuit_id
+    );
   }
   if (options.source_net_name) {
     const sourceNet = circuitJson.find(
-      (element) => element.type === "source_net" && element.name === options.source_net_name
+      (element) => element.type === "source_net" && element.name === options.source_net_name && (!options.subcircuit_id || Boolean(
+        subcircuitConnectivityMap.descendantSubcircuitIds?.has(
+          element.subcircuit_id ?? ""
+        )
+      ))
     );
     if (!sourceNet) {
       throw new Error(
@@ -621,15 +748,23 @@ var resolvePourConnectivityKey = (circuitJson, options, knownSubcircuitConnectiv
         `source_net "${options.source_net_name}" has no subcircuit_connectivity_map_key`
       );
     }
-    return sourceNet.subcircuit_connectivity_map_key;
+    return subcircuitConnectivityMap.resolveSubcircuitConnectivityKey(
+      sourceNet.subcircuit_connectivity_map_key,
+      sourceNet.subcircuit_id ?? options.subcircuit_id
+    );
   }
   if (options.pour_connectivity_key) {
-    if (!knownSubcircuitConnectivityKeys.has(options.pour_connectivity_key)) {
+    if (!subcircuitConnectivityMap.knownSubcircuitConnectivityKeys.has(
+      options.pour_connectivity_key
+    )) {
       throw new Error(
         `pour_connectivity_key must be a subcircuit_connectivity_map_key. Use subcircuit_connectivity_map_key, source_net_id, or source_net_name instead of a generated connectivity-map id.`
       );
     }
-    return options.pour_connectivity_key;
+    return subcircuitConnectivityMap.resolveSubcircuitConnectivityKey(
+      options.pour_connectivity_key,
+      options.subcircuit_id
+    );
   }
   throw new Error(
     "Copper pour requires source_net_id, source_net_name, or subcircuit_connectivity_map_key"
@@ -640,13 +775,18 @@ var resolvePourConnectivityKey = (circuitJson, options, knownSubcircuitConnectiv
 var convertCircuitJsonToInputProblem = (circuitJson, options) => {
   const pcb_board = circuitJson.find((e) => e.type === "pcb_board");
   if (!pcb_board) throw new Error("No pcb_board found in circuit json");
-  const connectivityMap = getFullConnectivityMapFromCircuitJson(circuitJson);
-  const { knownSubcircuitConnectivityKeys, getSubcircuitConnectivityKeyForId } = buildSubcircuitConnectivityLookup(circuitJson, connectivityMap);
+  const globalConnectivityMap = getFullConnectivityMapFromCircuitJson(circuitJson);
+  const subcircuitConnectivityMap = buildSubcircuitConnectivityLookup(
+    circuitJson,
+    globalConnectivityMap,
+    options.subcircuit_id
+  );
   const pourConnectivityKey = resolvePourConnectivityKey(
     circuitJson,
     options,
-    knownSubcircuitConnectivityKeys
+    subcircuitConnectivityMap
   );
+  const { getSubcircuitConnectivityKeyForId } = subcircuitConnectivityMap;
   const pads = [];
   for (const elm of circuitJson) {
     if (elm.type === "pcb_smtpad") {

package/lib/circuit-json/ConvertCircuitJsonToInputProblemOptions.ts

@@ -2,6 +2,7 @@ import type { LayerRef, Point } from "circuit-json"
 
 export interface ConvertCircuitJsonToInputProblemOptions {
   layer: LayerRef
+  subcircuit_id?: string
   source_net_id?: string
   source_net_name?: string
   subcircuit_connectivity_map_key?: string

package/lib/circuit-json/buildSubcircuitConnectivityLookup.ts

@@ -3,52 +3,235 @@ import type { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-conn
 import { getElementId } from "@tscircuit/circuit-json-util"
 import { getElementSubcircuitConnectivityKey } from "./getElementSubcircuitConnectivityKey"
 
+const getElementSubcircuitId = (
+  element: AnyCircuitElement,
+): string | undefined => {
+  const subcircuitId = (element as any).subcircuit_id
+  return typeof subcircuitId === "string" && subcircuitId.length > 0
+    ? subcircuitId
+    : undefined
+}
+
+const getScopedSubcircuitConnectivityKey = (
+  subcircuitId: string | undefined,
+  subcircuitConnectivityMapKey: string,
+): string =>
+  subcircuitId
+    ? `subcircuit:${subcircuitId}:connectivity:${subcircuitConnectivityMapKey}`
+    : subcircuitConnectivityMapKey
+
+const getDescendantSubcircuitIds = (
+  circuitJson: AnyCircuitElement[],
+  rootSubcircuitId: string | undefined,
+): Set<string> | undefined => {
+  if (!rootSubcircuitId) return undefined
+
+  const sourceGroupIdToSubcircuitId: Record<string, string> = {}
+  for (const element of circuitJson) {
+    if (element.type !== "source_group") continue
+
+    const sourceGroupId = (element as any).source_group_id
+    const subcircuitId = getElementSubcircuitId(element)
+    if (typeof sourceGroupId === "string" && subcircuitId) {
+      sourceGroupIdToSubcircuitId[sourceGroupId] = subcircuitId
+    }
+  }
+
+  const descendantSubcircuitIds = new Set([rootSubcircuitId])
+  let changed = true
+  while (changed) {
+    changed = false
+    for (const element of circuitJson) {
+      if (element.type !== "source_group") continue
+
+      const subcircuitId = getElementSubcircuitId(element)
+      if (!subcircuitId || descendantSubcircuitIds.has(subcircuitId)) continue
+
+      const parentSubcircuitId = (element as any).parent_subcircuit_id
+      const parentSourceGroupId = (element as any).parent_source_group_id
+      const parentSourceGroupSubcircuitId =
+        typeof parentSourceGroupId === "string"
+          ? sourceGroupIdToSubcircuitId[parentSourceGroupId]
+          : undefined
+
+      if (
+        (typeof parentSubcircuitId === "string" &&
+          descendantSubcircuitIds.has(parentSubcircuitId)) ||
+        (parentSourceGroupSubcircuitId &&
+          descendantSubcircuitIds.has(parentSourceGroupSubcircuitId))
+      ) {
+        descendantSubcircuitIds.add(subcircuitId)
+        changed = true
+      }
+    }
+  }
+
+  return descendantSubcircuitIds
+}
+
 export const buildSubcircuitConnectivityLookup = (
   circuitJson: AnyCircuitElement[],
-  connectivityMap: ReturnType<typeof getFullConnectivityMapFromCircuitJson>,
+  globalConnectivityMap: ReturnType<
+    typeof getFullConnectivityMapFromCircuitJson
+  >,
+  rootSubcircuitId?: string,
 ) => {
+  const descendantSubcircuitIds = getDescendantSubcircuitIds(
+    circuitJson,
+    rootSubcircuitId,
+  )
   const idToSubcircuitConnectivityKey: Record<string, string> = {}
+  const idToSubcircuitId: Record<string, string | undefined> = {}
+  const scopedKeyToIds: Record<string, string[]> = {}
+  const localSubcircuitConnectivityKeys = new Set<string>()
 
   for (const element of circuitJson) {
     const id = getElementId(element)
     const key = getElementSubcircuitConnectivityKey(element)
+    const subcircuitId = getElementSubcircuitId(element)
+    if (id) {
+      idToSubcircuitId[id] = subcircuitId
+    }
+    if (
+      descendantSubcircuitIds &&
+      (!subcircuitId || !descendantSubcircuitIds.has(subcircuitId))
+    ) {
+      continue
+    }
+
     if (id && key) {
-      idToSubcircuitConnectivityKey[id] = key
+      const scopedKey = getScopedSubcircuitConnectivityKey(subcircuitId, key)
+      idToSubcircuitConnectivityKey[id] = scopedKey
+      localSubcircuitConnectivityKeys.add(key)
+      scopedKeyToIds[scopedKey] ??= []
+      scopedKeyToIds[scopedKey].push(id)
     }
   }
 
   const generatedNetIdToSubcircuitConnectivityKey: Record<string, string> = {}
   for (const [generatedNetId, connectedIds] of Object.entries(
-    connectivityMap.netMap,
+    globalConnectivityMap.netMap,
   )) {
     const connectedSubcircuitKeys = new Set(
       connectedIds
         .map((id) => idToSubcircuitConnectivityKey[id])
         .filter((key): key is string => Boolean(key)),
     )
-    if (connectedSubcircuitKeys.size > 1) {
+    const subcircuitKey = Array.from(connectedSubcircuitKeys).sort()[0]
+    if (subcircuitKey) {
+      generatedNetIdToSubcircuitConnectivityKey[generatedNetId] = subcircuitKey
+    }
+  }
+
+  const subcircuitConnectivityMap: Record<string, string> = {}
+  for (const [scopedKey, ids] of Object.entries(scopedKeyToIds)) {
+    const resolvedKeys = new Set<string>()
+    for (const id of ids) {
+      const generatedNetId = globalConnectivityMap.getNetConnectedToId(id)
+      const resolvedKey = generatedNetId
+        ? generatedNetIdToSubcircuitConnectivityKey[generatedNetId]
+        : undefined
+      resolvedKeys.add(resolvedKey ?? scopedKey)
+    }
+
+    if (resolvedKeys.size > 1) {
       throw new Error(
-        `Multiple subcircuit connectivity keys found for generated connectivity map net "${generatedNetId}": ${Array.from(connectedSubcircuitKeys).join(", ")}`,
+        `subcircuit_connectivity_map_key "${scopedKey}" maps to multiple global connectivity keys: ${Array.from(resolvedKeys).join(", ")}`,
       )
     }
-    const subcircuitKey = connectedSubcircuitKeys.values().next().value
-    if (subcircuitKey) {
-      generatedNetIdToSubcircuitConnectivityKey[generatedNetId] = subcircuitKey
+
+    const resolvedKey = resolvedKeys.values().next().value
+    if (resolvedKey) {
+      subcircuitConnectivityMap[scopedKey] = resolvedKey
     }
   }
 
   return {
-    knownSubcircuitConnectivityKeys: new Set(
-      Object.values(idToSubcircuitConnectivityKey),
-    ),
+    knownSubcircuitConnectivityKeys: new Set([
+      ...Object.keys(scopedKeyToIds),
+      ...localSubcircuitConnectivityKeys,
+    ]),
+    descendantSubcircuitIds,
+    getScopedSubcircuitConnectivityKey,
+    getElementSubcircuitId,
+    resolveSubcircuitConnectivityKey(
+      subcircuitConnectivityMapKey: string,
+      subcircuitId?: string,
+    ): string {
+      const matchingScopedKeys = Object.keys(scopedKeyToIds).filter(
+        (scopedKey) =>
+          scopedKey ===
+          getScopedSubcircuitConnectivityKey(
+            subcircuitId,
+            subcircuitConnectivityMapKey,
+          ),
+      )
+
+      if (
+        subcircuitId &&
+        matchingScopedKeys.length === 0 &&
+        descendantSubcircuitIds
+      ) {
+        matchingScopedKeys.push(
+          ...Object.keys(scopedKeyToIds).filter((scopedKey) =>
+            scopedKey.endsWith(`:connectivity:${subcircuitConnectivityMapKey}`),
+          ),
+        )
+      }
+
+      if (!subcircuitId) {
+        matchingScopedKeys.push(
+          ...Object.keys(scopedKeyToIds).filter((scopedKey) =>
+            scopedKey.endsWith(`:connectivity:${subcircuitConnectivityMapKey}`),
+          ),
+        )
+      }
+
+      const uniqueMatchingScopedKeys = Array.from(new Set(matchingScopedKeys))
+      if (uniqueMatchingScopedKeys.length === 0) {
+        if (subcircuitId && descendantSubcircuitIds) {
+          throw new Error(
+            `No subcircuit_connectivity_map_key "${subcircuitConnectivityMapKey}" found in subcircuit "${subcircuitId}" or its child subcircuits.`,
+          )
+        }
+
+        return getScopedSubcircuitConnectivityKey(
+          subcircuitId,
+          subcircuitConnectivityMapKey,
+        )
+      }
+      if (uniqueMatchingScopedKeys.length > 1) {
+        throw new Error(
+          `subcircuit_connectivity_map_key "${subcircuitConnectivityMapKey}" exists in multiple subcircuits. Pass subcircuit_id to disambiguate.`,
+        )
+      }
+
+      return (
+        subcircuitConnectivityMap[uniqueMatchingScopedKeys[0]!] ??
+        uniqueMatchingScopedKeys[0]!
+      )
+    },
     getSubcircuitConnectivityKeyForId(id: string): string | undefined {
-      const directKey = idToSubcircuitConnectivityKey[id]
-      if (directKey) return directKey
+      if (descendantSubcircuitIds) {
+        const subcircuitId = idToSubcircuitId[id]
+        if (!subcircuitId || !descendantSubcircuitIds.has(subcircuitId)) {
+          return undefined
+        }
+      }
 
-      const generatedNetId = connectivityMap.getNetConnectedToId(id)
-      if (!generatedNetId) return undefined
+      const directKey = idToSubcircuitConnectivityKey[id]
+      const generatedNetId = globalConnectivityMap.getNetConnectedToId(id)
+      if (!generatedNetId) {
+        return directKey
+          ? (subcircuitConnectivityMap[directKey] ?? directKey)
+          : undefined
+      }
 
-      return generatedNetIdToSubcircuitConnectivityKey[generatedNetId]
+      return (
+        generatedNetIdToSubcircuitConnectivityKey[generatedNetId] ??
+        (directKey ? subcircuitConnectivityMap[directKey] : undefined) ??
+        directKey
+      )
     },
   }
 }

package/lib/circuit-json/convert-circuit-json-to-input-problem.ts

@@ -32,14 +32,19 @@ export const convertCircuitJsonToInputProblem = (
 
   if (!pcb_board) throw new Error("No pcb_board found in circuit json")
 
-  const connectivityMap = getFullConnectivityMapFromCircuitJson(circuitJson)
-  const { knownSubcircuitConnectivityKeys, getSubcircuitConnectivityKeyForId } =
-    buildSubcircuitConnectivityLookup(circuitJson, connectivityMap)
+  const globalConnectivityMap =
+    getFullConnectivityMapFromCircuitJson(circuitJson)
+  const subcircuitConnectivityMap = buildSubcircuitConnectivityLookup(
+    circuitJson,
+    globalConnectivityMap,
+    options.subcircuit_id,
+  )
   const pourConnectivityKey = resolvePourConnectivityKey(
     circuitJson,
     options,
-    knownSubcircuitConnectivityKeys,
+    subcircuitConnectivityMap,
   )
+  const { getSubcircuitConnectivityKeyForId } = subcircuitConnectivityMap
 
   const pads: InputPad[] = []
 

package/lib/circuit-json/resolvePourConnectivityKey.ts

@@ -1,13 +1,21 @@
 import type { AnyCircuitElement, SourceNet } from "circuit-json"
+import type { buildSubcircuitConnectivityLookup } from "./buildSubcircuitConnectivityLookup"
 import type { ConvertCircuitJsonToInputProblemOptions } from "./ConvertCircuitJsonToInputProblemOptions"
 
+type SubcircuitConnectivityLookup = ReturnType<
+  typeof buildSubcircuitConnectivityLookup
+>
+
 export const resolvePourConnectivityKey = (
   circuitJson: AnyCircuitElement[],
   options: ConvertCircuitJsonToInputProblemOptions,
-  knownSubcircuitConnectivityKeys: Set<string>,
+  subcircuitConnectivityMap: SubcircuitConnectivityLookup,
 ): string => {
   if (options.subcircuit_connectivity_map_key) {
-    return options.subcircuit_connectivity_map_key
+    return subcircuitConnectivityMap.resolveSubcircuitConnectivityKey(
+      options.subcircuit_connectivity_map_key,
+      options.subcircuit_id,
+    )
   }
 
   if (options.source_net_id) {
@@ -24,14 +32,23 @@ export const resolvePourConnectivityKey = (
         `source_net "${options.source_net_id}" has no subcircuit_connectivity_map_key`,
       )
     }
-    return sourceNet.subcircuit_connectivity_map_key
+    return subcircuitConnectivityMap.resolveSubcircuitConnectivityKey(
+      sourceNet.subcircuit_connectivity_map_key,
+      sourceNet.subcircuit_id ?? options.subcircuit_id,
+    )
   }
 
   if (options.source_net_name) {
     const sourceNet = circuitJson.find(
       (element): element is SourceNet =>
         element.type === "source_net" &&
-        element.name === options.source_net_name,
+        element.name === options.source_net_name &&
+        (!options.subcircuit_id ||
+          Boolean(
+            subcircuitConnectivityMap.descendantSubcircuitIds?.has(
+              element.subcircuit_id ?? "",
+            ),
+          )),
     )
     if (!sourceNet) {
       throw new Error(
@@ -43,16 +60,26 @@ export const resolvePourConnectivityKey = (
         `source_net "${options.source_net_name}" has no subcircuit_connectivity_map_key`,
       )
     }
-    return sourceNet.subcircuit_connectivity_map_key
+    return subcircuitConnectivityMap.resolveSubcircuitConnectivityKey(
+      sourceNet.subcircuit_connectivity_map_key,
+      sourceNet.subcircuit_id ?? options.subcircuit_id,
+    )
   }
 
   if (options.pour_connectivity_key) {
-    if (!knownSubcircuitConnectivityKeys.has(options.pour_connectivity_key)) {
+    if (
+      !subcircuitConnectivityMap.knownSubcircuitConnectivityKeys.has(
+        options.pour_connectivity_key,
+      )
+    ) {
       throw new Error(
         `pour_connectivity_key must be a subcircuit_connectivity_map_key. Use subcircuit_connectivity_map_key, source_net_id, or source_net_name instead of a generated connectivity-map id.`,
       )
     }
-    return options.pour_connectivity_key
+    return subcircuitConnectivityMap.resolveSubcircuitConnectivityKey(
+      options.pour_connectivity_key,
+      options.subcircuit_id,
+    )
   }
 
   throw new Error(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/copper-pour-solver",
   "main": "dist/index.js",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "scripts": {
     "format": "biome format . --write",
     "format:check": "biome format .",
@@ -13,14 +13,15 @@
   "type": "module",
   "devDependencies": {
     "@biomejs/biome": "^2.2.4",
-    "@tscircuit/circuit-json-util": "^0.0.77",
     "@flatten-js/core": "^1.6.2",
-    "@tscircuit/math-utils": "^0.0.25",
+    "@tscircuit/circuit-json-util": "^0.0.77",
+    "@tscircuit/core": "^0.0.988",
+    "@tscircuit/math-utils": "^0.0.29",
     "@tscircuit/solver-utils": "^0.0.14",
-    "circuit-json-to-connectivity-map": "^0.0.23",
     "@types/bun": "latest",
     "bun-match-svg": "^0.0.13",
     "circuit-json": "^0.0.432",
+    "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-to-svg": "^0.0.350",
     "react-cosmos": "^7.0.0",
     "react-cosmos-plugin-vite": "^7.0.0",

package/tests/__snapshots__/tsx-subcircuit-connectivity01.snap.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="800" height="600" data-software-used-string="@tscircuit/core@0.0.988"><style></style><rect class="boundary" x="0" y="0" fill="#000" width="800" height="600" data-type="pcb_background" data-pcb-layer="global"/><rect class="pcb-boundary" fill="none" stroke="#fff" stroke-width="0.3" x="66.66666666666669" y="66.6666666666666" width="666.6666666666667" height="466.66666666666663" data-type="pcb_boundary" data-pcb-layer="global"/><path class="pcb-board" d="M 66.66666666666669 533.3333333333333 L 733.3333333333335 533.3333333333333 L 733.3333333333335 66.6666666666666 L 66.66666666666669 66.6666666666666 Z" fill="none" stroke="rgba(255, 255, 255, 0.5)" stroke-width="6.666666666666668" data-type="pcb_board" data-pcb-layer="board"/><path class="pcb-trace" stroke="rgb(200, 52, 52)" fill="none" d="M 200.00000000000006 299.99999999999994 L 332.00000000000006 299.99999999999994" stroke-width="10.666666666666668" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges" data-type="pcb_trace" data-pcb-layer="top"/><path class="pcb-trace" stroke="rgb(200, 52, 52)" fill="none" d="M 332.00000000000006 299.99999999999994 L 332.00000000000006 183.33333333333326" stroke-width="10.666666666666668" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges" data-type="pcb_trace" data-pcb-layer="top"/><path class="pcb-trace" stroke="rgb(200, 52, 52)" fill="none" d="M 332.00000000000006 183.33333333333326 L 618.0000000000001 183.33333333333326" stroke-width="10.666666666666668" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges" data-type="pcb_trace" data-pcb-layer="top"/><path class="pcb-trace" stroke="rgb(200, 52, 52)" fill="none" d="M 618.0000000000001 183.33333333333326 L 618.0000000000001 299.99999999999994" stroke-width="10.666666666666668" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges" data-type="pcb_trace" data-pcb-layer="top"/><path class="pcb-copper-pour pcb-copper-pour-brep" d="M 733.3333333333335 533.3333333333333 L 66.66666666666669 533.3333333333333 L 66.66666666666669 66.6666666666666 L 733.3333333333335 66.6666666666666 L 733.3333333333335 533.3333333333333 Z M 382.00000000000006 366.66666666666663 L 515.3333333333334 366.66666666666663 L 515.3333333333334 233.33333333333326 L 382.00000000000006 233.33333333333326 L 382.00000000000006 366.66666666666663 Z" fill="rgb(200, 52, 52)" fill-rule="evenodd" fill-opacity="0.5" data-type="pcb_copper_pour" data-pcb-layer="top"/><text x="0" y="0" dx="0" dy="0" fill="#f2eda1" font-family="Arial, sans-serif" font-size="33.333333333333336" text-anchor="middle" dominant-baseline="central" transform="matrix(1,0,0,1,200.00000000000006,224.99999999999994)" class="pcb-silkscreen-text pcb-silkscreen-top" data-pcb-silkscreen-text-id="pcb_silkscreen_text_0" stroke="none" data-type="pcb_silkscreen_text" data-pcb-layer="top">A</text><text x="0" y="0" dx="0" dy="0" fill="#f2eda1" font-family="Arial, sans-serif" font-size="46.666666666666664" text-anchor="middle" dominant-baseline="central" transform="matrix(1,0,0,1,200.00000000000006,130.6666666666666)" class="pcb-silkscreen-text pcb-silkscreen-top" data-pcb-silkscreen-text-id="pcb_silkscreen_text_1" stroke="none" data-type="pcb_silkscreen_text" data-pcb-layer="top">J1</text><text x="0" y="0" dx="0" dy="0" fill="#f2eda1" font-family="Arial, sans-serif" font-size="33.333333333333336" text-anchor="middle" dominant-baseline="central" transform="matrix(1,0,0,1,448.66666666666674,224.99999999999994)" class="pcb-silkscreen-text pcb-silkscreen-top" data-pcb-silkscreen-text-id="pcb_silkscreen_text_2" stroke="none" data-type="pcb_silkscreen_text" data-pcb-layer="top">B</text><text x="0" y="0" dx="0" dy="0" fill="#f2eda1" font-family="Arial, sans-serif" font-size="33.333333333333336" text-anchor="middle" dominant-baseline="central" transform="matrix(1,0,0,1,618.0000000000001,224.99999999999994)" class="pcb-silkscreen-text pcb-silkscreen-top" data-pcb-silkscreen-text-id="pcb_silkscreen_text_3" stroke="none" data-type="pcb_silkscreen_text" data-pcb-layer="top">C</text><text x="0" y="0" dx="0" dy="0" fill="#f2eda1" font-family="Arial, sans-serif" font-size="46.666666666666664" text-anchor="middle" dominant-baseline="central" transform="matrix(1,0,0,1,533.3333333333334,130.6666666666666)" class="pcb-silkscreen-text pcb-silkscreen-top" data-pcb-silkscreen-text-id="pcb_silkscreen_text_4" stroke="none" data-type="pcb_silkscreen_text" data-pcb-layer="top">J2</text><g data-type="pcb_plated_hole" data-pcb-layer="through"><rect class="pcb-hole-outer-pad" fill="rgb(200, 52, 52)" x="150.00000000000006" y="249.99999999999994" width="100" height="100" data-type="pcb_plated_hole" data-pcb-layer="top"/><circle class="pcb-hole-inner" fill="#FF26E2" cx="200.00000000000006" cy="299.99999999999994" r="33.333333333333336" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><rect class="pcb-hole-outer-pad" fill="rgb(200, 52, 52)" x="398.66666666666674" y="249.99999999999994" width="100" height="100" data-type="pcb_plated_hole" data-pcb-layer="top"/><circle class="pcb-hole-inner" fill="#FF26E2" cx="448.66666666666674" cy="299.99999999999994" r="33.333333333333336" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><circle class="pcb-hole-outer" fill="rgb(200, 52, 52)" cx="618.0000000000001" cy="299.99999999999994" r="50" data-type="pcb_plated_hole" data-pcb-layer="top"/><circle class="pcb-hole-inner" fill="#FF26E2" cx="618.0000000000001" cy="299.99999999999994" r="33.333333333333336" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><text x="400.00000000000006" y="9.999999999999943" fill="#ffffff" font-family="Arial, sans-serif" font-size="14.666666666666668" text-anchor="middle" dominant-baseline="central" class="pcb-note-text" data-type="pcb_note_text" data-pcb-note-text-id="pcb_note_text_0" data-pcb-layer="overlay">Expected: copper pour connects to A and C, but clears around B.</text><text x="400.00000000000006" y="29.999999999999943" fill="#ffffff" font-family="Arial, sans-serif" font-size="14.666666666666668" text-anchor="middle" dominant-baseline="central" class="pcb-note-text" data-type="pcb_note_text" data-pcb-note-text-id="pcb_note_text_1" data-pcb-layer="overlay">A is parent net.GND; C is child net.GND reached through the parent-to-child net.</text><text x="400.00000000000006" y="49.999999999999915" fill="#ffffff" font-family="Arial, sans-serif" font-size="14.666666666666668" text-anchor="middle" dominant-baseline="central" class="pcb-note-text" data-type="pcb_note_text" data-pcb-note-text-id="pcb_note_text_2" data-pcb-layer="overlay">B is a separate child pin, so the pour should clear around it.</text></svg>

package/tests/__snapshots__/tsx-subcircuit-connectivity02.snap.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="800" height="600" data-software-used-string="@tscircuit/core@0.0.988"><style></style><rect class="boundary" x="0" y="0" fill="#000" width="800" height="600" data-type="pcb_background" data-pcb-layer="global"/><rect class="pcb-boundary" fill="none" stroke="#fff" stroke-width="0.3" x="66.66666666666669" y="66.6666666666666" width="666.6666666666667" height="466.66666666666663" data-type="pcb_boundary" data-pcb-layer="global"/><path class="pcb-board" d="M 66.66666666666669 533.3333333333333 L 733.3333333333335 533.3333333333333 L 733.3333333333335 66.6666666666666 L 66.66666666666669 66.6666666666666 Z" fill="none" stroke="rgba(255, 255, 255, 0.5)" stroke-width="6.666666666666668" data-type="pcb_board" data-pcb-layer="board"/><path class="pcb-copper-pour pcb-copper-pour-brep" d="M 733.3333333333335 533.3333333333333 L 66.66666666666669 533.3333333333333 L 66.66666666666669 66.6666666666666 L 733.3333333333335 66.6666666666666 L 733.3333333333335 533.3333333333333 Z M 382.00000000000006 366.66666666666663 L 515.3333333333334 366.66666666666663 L 515.3333333333334 233.33333333333326 L 382.00000000000006 233.33333333333326 L 382.00000000000006 366.66666666666663 Z M 618.0000000000001 366.66666666666663 L 631.0060000000001 365.3856666666666 L 643.5122000000001 361.5919999999999 L 655.038 355.43133333333327 L 665.1404666666667 347.1404666666666 L 673.4313333333334 337.03799999999995 L 679.5920000000001 325.51219999999995 L 683.3856666666668 313.006 L 684.6666666666667 299.99999999999994 L 683.3856666666668 286.9939999999999 L 679.5920000000001 274.48779999999994 L 673.4313333333334 262.96199999999993 L 665.1404666666667 252.85953333333327 L 655.038 244.56866666666662 L 643.5122000000001 238.40799999999993 L 631.0060000000001 234.61433333333326 L 618.0000000000001 233.33333333333326 L 604.9940000000001 234.61433333333326 L 592.4878000000001 238.40799999999993 L 580.9620000000001 244.56866666666662 L 570.8595333333334 252.85953333333327 L 562.5686666666668 262.96199999999993 L 556.4080000000001 274.48779999999994 L 552.6143333333334 286.9939999999999 L 551.3333333333334 299.99999999999994 L 552.6143333333334 313.006 L 556.4080000000001 325.51219999999995 L 562.5686666666668 337.03799999999995 L 570.8595333333334 347.1404666666666 L 580.9620000000001 355.43133333333327 L 592.4878000000001 361.5919999999999 L 604.9940000000001 365.3856666666666 L 618.0000000000001 366.66666666666663 Z" fill="rgb(200, 52, 52)" fill-rule="evenodd" fill-opacity="0.5" data-type="pcb_copper_pour" data-pcb-layer="top"/><text x="0" y="0" dx="0" dy="0" fill="#f2eda1" font-family="Arial, sans-serif" font-size="33.333333333333336" text-anchor="middle" dominant-baseline="central" transform="matrix(1,0,0,1,200.00000000000006,224.99999999999994)" class="pcb-silkscreen-text pcb-silkscreen-top" data-pcb-silkscreen-text-id="pcb_silkscreen_text_0" stroke="none" data-type="pcb_silkscreen_text" data-pcb-layer="top">A</text><text x="0" y="0" dx="0" dy="0" fill="#f2eda1" font-family="Arial, sans-serif" font-size="46.666666666666664" text-anchor="middle" dominant-baseline="central" transform="matrix(1,0,0,1,200.00000000000006,130.6666666666666)" class="pcb-silkscreen-text pcb-silkscreen-top" data-pcb-silkscreen-text-id="pcb_silkscreen_text_1" stroke="none" data-type="pcb_silkscreen_text" data-pcb-layer="top">J1</text><text x="0" y="0" dx="0" dy="0" fill="#f2eda1" font-family="Arial, sans-serif" font-size="33.333333333333336" text-anchor="middle" dominant-baseline="central" transform="matrix(1,0,0,1,448.66666666666674,224.99999999999994)" class="pcb-silkscreen-text pcb-silkscreen-top" data-pcb-silkscreen-text-id="pcb_silkscreen_text_2" stroke="none" data-type="pcb_silkscreen_text" data-pcb-layer="top">B</text><text x="0" y="0" dx="0" dy="0" fill="#f2eda1" font-family="Arial, sans-serif" font-size="33.333333333333336" text-anchor="middle" dominant-baseline="central" transform="matrix(1,0,0,1,618.0000000000001,224.99999999999994)" class="pcb-silkscreen-text pcb-silkscreen-top" data-pcb-silkscreen-text-id="pcb_silkscreen_text_3" stroke="none" data-type="pcb_silkscreen_text" data-pcb-layer="top">C</text><text x="0" y="0" dx="0" dy="0" fill="#f2eda1" font-family="Arial, sans-serif" font-size="46.666666666666664" text-anchor="middle" dominant-baseline="central" transform="matrix(1,0,0,1,533.3333333333334,130.6666666666666)" class="pcb-silkscreen-text pcb-silkscreen-top" data-pcb-silkscreen-text-id="pcb_silkscreen_text_4" stroke="none" data-type="pcb_silkscreen_text" data-pcb-layer="top">J2</text><g data-type="pcb_plated_hole" data-pcb-layer="through"><rect class="pcb-hole-outer-pad" fill="rgb(200, 52, 52)" x="150.00000000000006" y="249.99999999999994" width="100" height="100" data-type="pcb_plated_hole" data-pcb-layer="top"/><circle class="pcb-hole-inner" fill="#FF26E2" cx="200.00000000000006" cy="299.99999999999994" r="33.333333333333336" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><rect class="pcb-hole-outer-pad" fill="rgb(200, 52, 52)" x="398.66666666666674" y="249.99999999999994" width="100" height="100" data-type="pcb_plated_hole" data-pcb-layer="top"/><circle class="pcb-hole-inner" fill="#FF26E2" cx="448.66666666666674" cy="299.99999999999994" r="33.333333333333336" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><circle class="pcb-hole-outer" fill="rgb(200, 52, 52)" cx="618.0000000000001" cy="299.99999999999994" r="50" data-type="pcb_plated_hole" data-pcb-layer="top"/><circle class="pcb-hole-inner" fill="#FF26E2" cx="618.0000000000001" cy="299.99999999999994" r="33.333333333333336" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><text x="400.00000000000006" y="9.999999999999943" fill="#ffffff" font-family="Arial, sans-serif" font-size="14.666666666666668" text-anchor="middle" dominant-baseline="central" class="pcb-note-text" data-type="pcb_note_text" data-pcb-note-text-id="pcb_note_text_0" data-pcb-layer="overlay">Expected: copper pour connects to A, but clears around B and C.</text><text x="400.00000000000006" y="29.999999999999943" fill="#ffffff" font-family="Arial, sans-serif" font-size="14.666666666666668" text-anchor="middle" dominant-baseline="central" class="pcb-note-text" data-type="pcb_note_text" data-pcb-note-text-id="pcb_note_text_1" data-pcb-layer="overlay">A is parent net.GND; C is child net.GND with no parent-to-child net.</text><text x="400.00000000000006" y="49.999999999999915" fill="#ffffff" font-family="Arial, sans-serif" font-size="14.666666666666668" text-anchor="middle" dominant-baseline="central" class="pcb-note-text" data-type="pcb_note_text" data-pcb-note-text-id="pcb_note_text_2" data-pcb-layer="overlay">B is a separate child pin, so the pour should clear around it.</text></svg>

package/tests/assets/subcircuit-connectivity-scope.json

@@ -0,0 +1,126 @@
+[
+  {
+    "type": "pcb_board",
+    "pcb_board_id": "pcb_board_0",
+    "center": { "x": 0, "y": 0 },
+    "width": 8,
+    "height": 4,
+    "thickness": 1.4,
+    "num_layers": 2,
+    "material": "fr4"
+  },
+  {
+    "type": "source_group",
+    "source_group_id": "source_group_parent",
+    "is_subcircuit": true,
+    "subcircuit_id": "subcircuit_parent"
+  },
+  {
+    "type": "source_group",
+    "source_group_id": "source_group_child_a",
+    "is_subcircuit": true,
+    "subcircuit_id": "subcircuit_child_a",
+    "parent_subcircuit_id": "subcircuit_parent"
+  },
+  {
+    "type": "source_group",
+    "source_group_id": "source_group_child_b",
+    "is_subcircuit": true,
+    "subcircuit_id": "subcircuit_child_b",
+    "parent_subcircuit_id": "subcircuit_parent"
+  },
+  {
+    "type": "source_net",
+    "source_net_id": "source_net_child_a_gnd",
+    "name": "GND",
+    "member_source_group_ids": ["source_group_child_a"],
+    "subcircuit_id": "subcircuit_child_a",
+    "subcircuit_connectivity_map_key": "net0"
+  },
+  {
+    "type": "source_trace",
+    "source_trace_id": "source_trace_child_a_gnd",
+    "connected_source_net_ids": ["source_net_child_a_gnd"],
+    "connected_source_port_ids": ["source_port_child_a_gnd"],
+    "subcircuit_id": "subcircuit_child_a",
+    "subcircuit_connectivity_map_key": "net0"
+  },
+  {
+    "type": "source_port",
+    "source_port_id": "source_port_child_a_gnd",
+    "source_component_id": "source_component_child_a",
+    "name": "1",
+    "subcircuit_id": "subcircuit_child_a",
+    "subcircuit_connectivity_map_key": "net0"
+  },
+  {
+    "type": "pcb_port",
+    "pcb_port_id": "pcb_port_child_a_gnd",
+    "pcb_component_id": "pcb_component_child_a",
+    "source_port_id": "source_port_child_a_gnd",
+    "x": -2,
+    "y": 0,
+    "layers": ["top"],
+    "subcircuit_id": "subcircuit_child_a"
+  },
+  {
+    "type": "pcb_smtpad",
+    "pcb_smtpad_id": "pcb_smtpad_child_a_gnd",
+    "pcb_component_id": "pcb_component_child_a",
+    "pcb_port_id": "pcb_port_child_a_gnd",
+    "layer": "top",
+    "shape": "rect",
+    "x": -2,
+    "y": 0,
+    "width": 0.8,
+    "height": 0.8,
+    "subcircuit_id": "subcircuit_child_a"
+  },
+  {
+    "type": "source_net",
+    "source_net_id": "source_net_child_b_gnd",
+    "name": "GND",
+    "member_source_group_ids": ["source_group_child_b"],
+    "subcircuit_id": "subcircuit_child_b",
+    "subcircuit_connectivity_map_key": "net0"
+  },
+  {
+    "type": "source_trace",
+    "source_trace_id": "source_trace_child_b_gnd",
+    "connected_source_net_ids": ["source_net_child_b_gnd"],
+    "connected_source_port_ids": ["source_port_child_b_gnd"],
+    "subcircuit_id": "subcircuit_child_b",
+    "subcircuit_connectivity_map_key": "net0"
+  },
+  {
+    "type": "source_port",
+    "source_port_id": "source_port_child_b_gnd",
+    "source_component_id": "source_component_child_b",
+    "name": "1",
+    "subcircuit_id": "subcircuit_child_b",
+    "subcircuit_connectivity_map_key": "net0"
+  },
+  {
+    "type": "pcb_port",
+    "pcb_port_id": "pcb_port_child_b_gnd",
+    "pcb_component_id": "pcb_component_child_b",
+    "source_port_id": "source_port_child_b_gnd",
+    "x": 2,
+    "y": 0,
+    "layers": ["top"],
+    "subcircuit_id": "subcircuit_child_b"
+  },
+  {
+    "type": "pcb_smtpad",
+    "pcb_smtpad_id": "pcb_smtpad_child_b_gnd",
+    "pcb_component_id": "pcb_component_child_b",
+    "pcb_port_id": "pcb_port_child_b_gnd",
+    "layer": "top",
+    "shape": "rect",
+    "x": 2,
+    "y": 0,
+    "width": 0.8,
+    "height": 0.8,
+    "subcircuit_id": "subcircuit_child_b"
+  }
+]

package/tests/connectivity-key-api.test.ts

@@ -2,6 +2,7 @@ import { expect, test } from "bun:test"
 import type { AnyCircuitElement } from "circuit-json"
 import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectivity-map"
 import { convertCircuitJsonToInputProblem } from "lib/circuit-json/convert-circuit-json-to-input-problem"
+import subcircuitConnectivityScopeCircuitJson from "./assets/subcircuit-connectivity-scope.json"
 
 const circuitJson = [
   {
@@ -98,3 +99,48 @@ test("circuit-json adapter rejects generated connectivity map keys", () => {
     }),
   ).toThrow(/subcircuit_connectivity_map_key/)
 })
+
+test("subcircuit_id scopes repeated subcircuit connectivity keys", () => {
+  const inputProblem = convertCircuitJsonToInputProblem(
+    subcircuitConnectivityScopeCircuitJson as AnyCircuitElement[],
+    {
+      layer: "top",
+      subcircuit_id: "subcircuit_child_a",
+      subcircuit_connectivity_map_key: "net0",
+      pad_margin: 0.2,
+      trace_margin: 0.2,
+    },
+  )
+
+  const childAPad = inputProblem.pads.find(
+    (pad) => pad.padId === "pcb_smtpad_child_a_gnd",
+  )
+  const childBPad = inputProblem.pads.find(
+    (pad) => pad.padId === "pcb_smtpad_child_b_gnd",
+  )
+
+  expect(inputProblem.regionsForPour[0]?.connectivityKey).toBe(
+    "subcircuit:subcircuit_child_a:connectivity:net0",
+  )
+  expect(childAPad?.connectivityKey).toBe(
+    inputProblem.regionsForPour[0]?.connectivityKey,
+  )
+  expect(childBPad?.connectivityKey).not.toBe(
+    inputProblem.regionsForPour[0]?.connectivityKey,
+  )
+})
+
+test("parent subcircuit selection rejects ambiguous child connectivity keys", () => {
+  expect(() =>
+    convertCircuitJsonToInputProblem(
+      subcircuitConnectivityScopeCircuitJson as AnyCircuitElement[],
+      {
+        layer: "top",
+        subcircuit_id: "subcircuit_parent",
+        subcircuit_connectivity_map_key: "net0",
+        pad_margin: 0.2,
+        trace_margin: 0.2,
+      },
+    ),
+  ).toThrow(/multiple subcircuits/)
+})

package/tests/tsx-subcircuit-connectivity.test.tsx

@@ -0,0 +1,223 @@
+import { expect, test } from "bun:test"
+import { Circuit } from "@tscircuit/core"
+import { convertCircuitJsonToPcbSvg } from "circuit-to-svg"
+import type {
+  AnyCircuitElement,
+  PcbCopperPourBRep,
+  SourceNet,
+} from "circuit-json"
+import { CopperPourPipelineSolver } from "lib/index"
+import { convertCircuitJsonToInputProblem } from "lib/circuit-json/convert-circuit-json-to-input-problem"
+
+const SubcircuitChild = () => (
+  <subcircuit
+    name="SubcircuitChild"
+    pcbX={2}
+    pcbY={0}
+    autorouter="sequential_trace"
+  >
+    <pinheader
+      name="J2"
+      pinCount={2}
+      footprint="pinrow2"
+      pcbX={0}
+      pcbY={0}
+      pinLabels={{ pin1: "B", pin2: "C" }}
+      showSilkscreenPinLabels
+      connections={{ C: "net.GND" }}
+    />
+  </subcircuit>
+)
+
+interface SubcircuitConnectivityReproProps {
+  includeParentToChildTrace: boolean
+}
+
+const SubcircuitConnectivityRepro = ({
+  includeParentToChildTrace,
+}: SubcircuitConnectivityReproProps) => (
+  <board
+    name="SubcircuitParent"
+    width="10mm"
+    height="7mm"
+    autorouter="sequential_trace"
+  >
+    <pinheader
+      name="J1"
+      pinCount={1}
+      footprint="pinrow1"
+      pcbX={-3}
+      pcbY={0}
+      pinLabels={{ pin1: "A" }}
+      showSilkscreenPinLabels
+      connections={{ A: "net.GND" }}
+    />
+
+    <SubcircuitChild />
+
+    {includeParentToChildTrace && (
+      <trace from="J1.A" to=".SubcircuitChild > net.GND" />
+    )}
+
+    <copperpour
+      name="top_gnd_pour"
+      layer="top"
+      connectsTo="net.GND"
+      padMargin="0.25mm"
+      traceMargin="0.2mm"
+    />
+
+    <pcbnotetext
+      text={
+        includeParentToChildTrace
+          ? "Expected: copper pour connects to A and C, but clears around B."
+          : "Expected: copper pour connects to A, but clears around B and C."
+      }
+      pcbX={0}
+      pcbY={4.35}
+      fontSize="0.22mm"
+      anchorAlignment="center"
+      color="#ffffff"
+    />
+    <pcbnotetext
+      text={
+        includeParentToChildTrace
+          ? "A is parent net.GND; C is child net.GND reached through the parent-to-child net."
+          : "A is parent net.GND; C is child net.GND with no parent-to-child net."
+      }
+      pcbX={0}
+      pcbY={4.05}
+      fontSize="0.22mm"
+      anchorAlignment="center"
+      color="#ffffff"
+    />
+    <pcbnotetext
+      text="B is a separate child pin, so the pour should clear around it."
+      pcbX={0}
+      pcbY={3.75}
+      fontSize="0.22mm"
+      anchorAlignment="center"
+      color="#ffffff"
+    />
+  </board>
+)
+
+const renderCircuitJson = async (
+  props: SubcircuitConnectivityReproProps,
+): Promise<AnyCircuitElement[]> => {
+  const circuit = new Circuit()
+  const originalLog = console.log
+  const originalWarn = console.warn
+  console.log = () => {}
+  console.warn = () => {}
+  try {
+    circuit.add(<SubcircuitConnectivityRepro {...props} />)
+    await circuit.renderUntilSettled()
+    return circuit.getCircuitJson()
+  } finally {
+    console.log = originalLog
+    console.warn = originalWarn
+  }
+}
+
+const getPadCenterX = (pad: any) => {
+  if (typeof pad.x === "number") return pad.x
+  return (pad.bounds.minX + pad.bounds.maxX) / 2
+}
+
+const getPcbPadConnectivityKeys = (inputProblem: any) => {
+  const [aPad, bPad, cPad] = inputProblem.pads
+    .filter((pad: any) => pad.shape === "circle" || pad.shape === "rect")
+    .sort((a: any, b: any) => getPadCenterX(a) - getPadCenterX(b))
+
+  return {
+    a: aPad?.connectivityKey,
+    b: bPad?.connectivityKey,
+    c: cPad?.connectivityKey,
+  }
+}
+
+const runSubcircuitConnectivityCase = async ({
+  includeParentToChildTrace,
+  snapshotName,
+  expectedSourceNetConnectivityKeyCount,
+  expectChildGndConnectedToPour,
+}: {
+  includeParentToChildTrace: boolean
+  snapshotName: string
+  expectedSourceNetConnectivityKeyCount: number
+  expectChildGndConnectedToPour: boolean
+}) => {
+  const circuitJson = await renderCircuitJson({ includeParentToChildTrace })
+  const gndSourceNets = circuitJson.filter(
+    (element): element is SourceNet =>
+      element.type === "source_net" && element.name === "GND",
+  )
+
+  expect(gndSourceNets).toHaveLength(2)
+  expect(
+    new Set(gndSourceNets.map((net) => net.subcircuit_connectivity_map_key))
+      .size,
+  ).toBe(expectedSourceNetConnectivityKeyCount)
+  expect(new Set(gndSourceNets.map((net) => net.subcircuit_id)).size).toBe(2)
+
+  const parentGndSourceNet = gndSourceNets.find((net) =>
+    net.subcircuit_connectivity_map_key?.includes("SubcircuitParent"),
+  )
+  expect(parentGndSourceNet).toBeDefined()
+
+  const inputProblem = convertCircuitJsonToInputProblem(circuitJson, {
+    layer: "top",
+    source_net_id: parentGndSourceNet!.source_net_id,
+    pad_margin: 0.25,
+    trace_margin: 0.2,
+  })
+
+  const pourConnectivityKey = inputProblem.regionsForPour[0]?.connectivityKey
+  const padConnectivityKeys = getPcbPadConnectivityKeys(inputProblem)
+
+  expect(padConnectivityKeys.a).toBe(pourConnectivityKey)
+  expect(padConnectivityKeys.b).not.toBe(pourConnectivityKey)
+  if (expectChildGndConnectedToPour) {
+    expect(padConnectivityKeys.c).toBe(pourConnectivityKey)
+  } else {
+    expect(padConnectivityKeys.c).not.toBe(pourConnectivityKey)
+  }
+
+  const output = new CopperPourPipelineSolver(inputProblem).getOutput()
+  const copperPours: PcbCopperPourBRep[] = output.brep_shapes.map(
+    (brep_shape, i) => ({
+      type: "pcb_copper_pour",
+      shape: "brep",
+      pcb_copper_pour_id: `pcb_copper_pour_tsx_subcircuit_${i}`,
+      layer: "top",
+      source_net_id: parentGndSourceNet!.source_net_id,
+      brep_shape,
+      covered_with_solder_mask: true,
+    }),
+  )
+  const svg = convertCircuitJsonToPcbSvg([
+    ...circuitJson.filter((element) => element.type !== "pcb_copper_pour"),
+    ...copperPours,
+  ] as any)
+
+  await expect(svg).toMatchSvgSnapshot(import.meta.path, snapshotName)
+}
+
+test("tsx subcircuit connectivity 01 connects child net through parent-to-child trace", async () => {
+  await runSubcircuitConnectivityCase({
+    includeParentToChildTrace: true,
+    snapshotName: "tsx-subcircuit-connectivity01",
+    expectedSourceNetConnectivityKeyCount: 1,
+    expectChildGndConnectedToPour: true,
+  })
+})
+
+test("tsx subcircuit connectivity 02 keeps child net separate without parent-to-child trace", async () => {
+  await runSubcircuitConnectivityCase({
+    includeParentToChildTrace: false,
+    snapshotName: "tsx-subcircuit-connectivity02",
+    expectedSourceNetConnectivityKeyCount: 2,
+    expectChildGndConnectedToPour: false,
+  })
+})