npm - circuit-json - Versions diffs - 0.0.129 → 0.0.131 - Mend

circuit-json 0.0.129 → 0.0.131

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.d.mts CHANGED Viewed

@@ -1011,15 +1011,21 @@ declare const source_trace: z.ZodObject<{
 declare const source_group: z.ZodObject<{
     type: z.ZodLiteral<"source_group">;
     source_group_id: z.ZodString;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
+    is_subcircuit: z.ZodOptional<z.ZodBoolean>;
     name: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     type: "source_group";
     source_group_id: string;
     name?: string | undefined;
+    subcircuit_id?: string | undefined;
+    is_subcircuit?: boolean | undefined;
 }, {
     type: "source_group";
     source_group_id: string;
     name?: string | undefined;
+    subcircuit_id?: string | undefined;
+    is_subcircuit?: boolean | undefined;
 }>;
 type SourceGroup = z.infer<typeof source_group>;
 type SourceGroupInput = z.input<typeof source_group>;
@@ -2814,6 +2820,7 @@ declare const pcb_component: z.ZodObject<{
     rotation: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     width: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     height: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     type: "pcb_component";
     width: number;
@@ -2826,6 +2833,7 @@ declare const pcb_component: z.ZodObject<{
     };
     pcb_component_id: string;
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    subcircuit_id?: string | undefined;
 }, {
     type: "pcb_component";
     width: string | number;
@@ -2839,6 +2847,7 @@ declare const pcb_component: z.ZodObject<{
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     };
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
 }>;
 type PcbComponentInput = z.input<typeof pcb_component>;
@@ -2849,6 +2858,7 @@ interface PcbComponent {
     type: "pcb_component";
     pcb_component_id: string;
     source_component_id: string;
+    subcircuit_id?: string;
     center: Point;
     layer: LayerRef;
     rotation: Rotation;
@@ -2863,6 +2873,8 @@ type PCBComponent = PcbComponent;
 declare const pcb_hole_circle_or_square: z.ZodObject<{
     type: z.ZodLiteral<"pcb_hole">;
     pcb_hole_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     hole_shape: z.ZodEnum<["circle", "square"]>;
     hole_diameter: z.ZodNumber;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -2874,17 +2886,23 @@ declare const pcb_hole_circle_or_square: z.ZodObject<{
     pcb_hole_id: string;
     hole_shape: "circle" | "square";
     hole_diameter: number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     x: string | number;
     y: string | number;
     type: "pcb_hole";
     hole_shape: "circle" | "square";
     hole_diameter: number;
+    subcircuit_id?: string | undefined;
     pcb_hole_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }>;
 declare const pcb_hole_circle_or_square_shape: z.ZodObject<{
     type: z.ZodLiteral<"pcb_hole">;
     pcb_hole_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     hole_shape: z.ZodEnum<["circle", "square"]>;
     hole_diameter: z.ZodNumber;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -2896,13 +2914,17 @@ declare const pcb_hole_circle_or_square_shape: z.ZodObject<{
     pcb_hole_id: string;
     hole_shape: "circle" | "square";
     hole_diameter: number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     x: string | number;
     y: string | number;
     type: "pcb_hole";
     hole_shape: "circle" | "square";
     hole_diameter: number;
+    subcircuit_id?: string | undefined;
     pcb_hole_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }>;
 type PcbHoleCircleOrSquareInput = z.input<typeof pcb_hole_circle_or_square>;
 /**
@@ -2911,6 +2933,8 @@ type PcbHoleCircleOrSquareInput = z.input<typeof pcb_hole_circle_or_square>;
 interface PcbHoleCircleOrSquare {
     type: "pcb_hole";
     pcb_hole_id: string;
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     hole_shape: "circle" | "square";
     hole_diameter: number;
     x: Distance;
@@ -2919,6 +2943,8 @@ interface PcbHoleCircleOrSquare {
 declare const pcb_hole_oval: z.ZodObject<{
     type: z.ZodLiteral<"pcb_hole">;
     pcb_hole_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     hole_shape: z.ZodLiteral<"oval">;
     hole_width: z.ZodNumber;
     hole_height: z.ZodNumber;
@@ -2932,6 +2958,8 @@ declare const pcb_hole_oval: z.ZodObject<{
     hole_shape: "oval";
     hole_width: number;
     hole_height: number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     x: string | number;
     y: string | number;
@@ -2939,11 +2967,15 @@ declare const pcb_hole_oval: z.ZodObject<{
     hole_shape: "oval";
     hole_width: number;
     hole_height: number;
+    subcircuit_id?: string | undefined;
     pcb_hole_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }>;
 declare const pcb_hole_oval_shape: z.ZodObject<{
     type: z.ZodLiteral<"pcb_hole">;
     pcb_hole_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     hole_shape: z.ZodLiteral<"oval">;
     hole_width: z.ZodNumber;
     hole_height: z.ZodNumber;
@@ -2957,6 +2989,8 @@ declare const pcb_hole_oval_shape: z.ZodObject<{
     hole_shape: "oval";
     hole_width: number;
     hole_height: number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     x: string | number;
     y: string | number;
@@ -2964,7 +2998,9 @@ declare const pcb_hole_oval_shape: z.ZodObject<{
     hole_shape: "oval";
     hole_width: number;
     hole_height: number;
+    subcircuit_id?: string | undefined;
     pcb_hole_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }>;
 type PcbHoleOvalInput = z.input<typeof pcb_hole_oval>;
 /**
@@ -2973,6 +3009,8 @@ type PcbHoleOvalInput = z.input<typeof pcb_hole_oval>;
 interface PcbHoleOval {
     type: "pcb_hole";
     pcb_hole_id: string;
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     hole_shape: "oval";
     hole_width: number;
     hole_height: number;
@@ -2982,6 +3020,8 @@ interface PcbHoleOval {
 declare const pcb_hole: z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_hole">;
     pcb_hole_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     hole_shape: z.ZodEnum<["circle", "square"]>;
     hole_diameter: z.ZodNumber;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -2993,16 +3033,22 @@ declare const pcb_hole: z.ZodUnion<[z.ZodObject<{
     pcb_hole_id: string;
     hole_shape: "circle" | "square";
     hole_diameter: number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     x: string | number;
     y: string | number;
     type: "pcb_hole";
     hole_shape: "circle" | "square";
     hole_diameter: number;
+    subcircuit_id?: string | undefined;
     pcb_hole_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_hole">;
     pcb_hole_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     hole_shape: z.ZodLiteral<"oval">;
     hole_width: z.ZodNumber;
     hole_height: z.ZodNumber;
@@ -3016,6 +3062,8 @@ declare const pcb_hole: z.ZodUnion<[z.ZodObject<{
     hole_shape: "oval";
     hole_width: number;
     hole_height: number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     x: string | number;
     y: string | number;
@@ -3023,7 +3071,9 @@ declare const pcb_hole: z.ZodUnion<[z.ZodObject<{
     hole_shape: "oval";
     hole_width: number;
     hole_height: number;
+    subcircuit_id?: string | undefined;
     pcb_hole_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }>]>;
 /**
  * @deprecated Use PcbHoleCircleOrSquare or PcbHoleOval
@@ -3041,6 +3091,8 @@ type PcbHole = PcbHoleCircleOrSquare | PcbHoleOval;
 interface PcbPlatedHoleCircle {
     type: "pcb_plated_hole";
     shape: "circle";
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     outer_diameter: number;
     hole_diameter: number;
     x: Distance;
@@ -3057,6 +3109,8 @@ interface PcbPlatedHoleCircle {
 interface PcbPlatedHoleOval {
     type: "pcb_plated_hole";
     shape: "oval" | "pill";
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     outer_width: number;
     outer_height: number;
     hole_width: number;
@@ -3072,6 +3126,8 @@ interface PcbPlatedHoleOval {
 interface PcbHoleCircularWithRectPad {
     type: "pcb_plated_hole";
     shape: "circular_hole_with_rect_pad";
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     hole_shape: "circle";
     pad_shape: "rect";
     hole_diameter: number;
@@ -3088,6 +3144,8 @@ interface PcbHoleCircularWithRectPad {
 declare const pcb_plated_hole: z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_plated_hole">;
     shape: z.ZodLiteral<"circle">;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     outer_diameter: z.ZodNumber;
     hole_diameter: z.ZodNumber;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -3115,7 +3173,9 @@ declare const pcb_plated_hole: z.ZodUnion<[z.ZodObject<{
     layers: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6")[];
     pcb_plated_hole_id: string;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }, {
     x: string | number;
@@ -3128,12 +3188,16 @@ declare const pcb_plated_hole: z.ZodUnion<[z.ZodObject<{
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     })[];
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
     pcb_plated_hole_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_plated_hole">;
     shape: z.ZodEnum<["oval", "pill"]>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     outer_width: z.ZodNumber;
     outer_height: z.ZodNumber;
     hole_width: z.ZodNumber;
@@ -3165,7 +3229,9 @@ declare const pcb_plated_hole: z.ZodUnion<[z.ZodObject<{
     outer_width: number;
     outer_height: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }, {
     x: string | number;
@@ -3180,12 +3246,16 @@ declare const pcb_plated_hole: z.ZodUnion<[z.ZodObject<{
     outer_width: number;
     outer_height: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
     pcb_plated_hole_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_plated_hole">;
     shape: z.ZodLiteral<"circular_hole_with_rect_pad">;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     hole_shape: z.ZodLiteral<"circle">;
     pad_shape: z.ZodLiteral<"rect">;
     hole_diameter: z.ZodNumber;
@@ -3219,7 +3289,9 @@ declare const pcb_plated_hole: z.ZodUnion<[z.ZodObject<{
     rect_pad_width: number;
     rect_pad_height: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }, {
     x: string | number;
@@ -3235,7 +3307,9 @@ declare const pcb_plated_hole: z.ZodUnion<[z.ZodObject<{
     rect_pad_width: number;
     rect_pad_height: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
     pcb_plated_hole_id?: string | undefined;
 }>]>;
@@ -3253,6 +3327,8 @@ type PcbPlatedHoleInput = z.input<typeof pcb_plated_hole>;
 declare const pcb_port: z.ZodObject<{
     type: z.ZodLiteral<"pcb_port">;
     pcb_port_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     source_port_id: z.ZodString;
     pcb_component_id: z.ZodString;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -3274,6 +3350,8 @@ declare const pcb_port: z.ZodObject<{
     pcb_component_id: string;
     layers: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6")[];
     pcb_port_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     x: string | number;
     y: string | number;
@@ -3283,6 +3361,8 @@ declare const pcb_port: z.ZodObject<{
     layers: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     })[];
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }>;
 type PcbPortInput = z.input<typeof pcb_port>;
@@ -3292,6 +3372,8 @@ type PcbPortInput = z.input<typeof pcb_port>;
 interface PcbPort {
     type: "pcb_port";
     pcb_port_id: string;
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     source_port_id: string;
     pcb_component_id: string;
     x: Distance;
@@ -3307,10 +3389,62 @@ type PCBPort = PcbPort;
  */
 type PCBPortInput = PcbPortInput;
+declare const pcb_smtpad_pill: z.ZodObject<{
+    type: z.ZodLiteral<"pcb_smtpad">;
+    shape: z.ZodLiteral<"pill">;
+    pcb_smtpad_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
+    y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
+    width: z.ZodNumber;
+    height: z.ZodNumber;
+    radius: z.ZodNumber;
+    layer: z.ZodEffects<z.ZodUnion<[z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>, z.ZodObject<{
+        name: z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>;
+    }, "strip", z.ZodTypeAny, {
+        name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    }, {
+        name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    }>]>, "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6", "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
+        name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    }>;
+    port_hints: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    pcb_component_id: z.ZodOptional<z.ZodString>;
+    pcb_port_id: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    x: number;
+    y: number;
+    type: "pcb_smtpad";
+    width: number;
+    height: number;
+    shape: "pill";
+    layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    pcb_smtpad_id: string;
+    radius: number;
+    port_hints?: string[] | undefined;
+    pcb_component_id?: string | undefined;
+    pcb_port_id?: string | undefined;
+}, {
+    x: string | number;
+    y: string | number;
+    type: "pcb_smtpad";
+    width: number;
+    height: number;
+    shape: "pill";
+    layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
+        name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    };
+    radius: number;
+    port_hints?: string[] | undefined;
+    pcb_component_id?: string | undefined;
+    pcb_port_id?: string | undefined;
+    pcb_smtpad_id?: string | undefined;
+}>;
 declare const pcb_smtpad: z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_smtpad">;
     shape: z.ZodLiteral<"circle">;
     pcb_smtpad_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     radius: z.ZodNumber;
@@ -3335,7 +3469,9 @@ declare const pcb_smtpad: z.ZodUnion<[z.ZodObject<{
     pcb_smtpad_id: string;
     radius: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }, {
     x: string | number;
@@ -3347,13 +3483,17 @@ declare const pcb_smtpad: z.ZodUnion<[z.ZodObject<{
     };
     radius: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_smtpad">;
     shape: z.ZodLiteral<"rect">;
     pcb_smtpad_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     width: z.ZodNumber;
@@ -3380,7 +3520,9 @@ declare const pcb_smtpad: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     pcb_smtpad_id: string;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }, {
     x: string | number;
@@ -3393,13 +3535,17 @@ declare const pcb_smtpad: z.ZodUnion<[z.ZodObject<{
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     };
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_smtpad">;
     shape: z.ZodLiteral<"rotated_rect">;
     pcb_smtpad_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     width: z.ZodNumber;
@@ -3428,7 +3574,9 @@ declare const pcb_smtpad: z.ZodUnion<[z.ZodObject<{
     pcb_smtpad_id: string;
     ccw_rotation: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }, {
     x: string | number;
@@ -3442,6 +3590,57 @@ declare const pcb_smtpad: z.ZodUnion<[z.ZodObject<{
     };
     ccw_rotation: string | number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
+    pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
+    pcb_port_id?: string | undefined;
+    pcb_smtpad_id?: string | undefined;
+}>, z.ZodObject<{
+    type: z.ZodLiteral<"pcb_smtpad">;
+    shape: z.ZodLiteral<"pill">;
+    pcb_smtpad_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
+    y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
+    width: z.ZodNumber;
+    height: z.ZodNumber;
+    radius: z.ZodNumber;
+    layer: z.ZodEffects<z.ZodUnion<[z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>, z.ZodObject<{
+        name: z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>;
+    }, "strip", z.ZodTypeAny, {
+        name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    }, {
+        name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    }>]>, "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6", "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
+        name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    }>;
+    port_hints: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    pcb_component_id: z.ZodOptional<z.ZodString>;
+    pcb_port_id: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    x: number;
+    y: number;
+    type: "pcb_smtpad";
+    width: number;
+    height: number;
+    shape: "pill";
+    layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    pcb_smtpad_id: string;
+    radius: number;
+    port_hints?: string[] | undefined;
+    pcb_component_id?: string | undefined;
+    pcb_port_id?: string | undefined;
+}, {
+    x: string | number;
+    y: string | number;
+    type: "pcb_smtpad";
+    width: number;
+    height: number;
+    shape: "pill";
+    layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
+        name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    };
+    radius: number;
+    port_hints?: string[] | undefined;
     pcb_component_id?: string | undefined;
     pcb_port_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
@@ -3454,6 +3653,8 @@ interface PcbSmtPadCircle {
     type: "pcb_smtpad";
     shape: "circle";
     pcb_smtpad_id: string;
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     x: Distance;
     y: Distance;
     radius: number;
@@ -3469,6 +3670,8 @@ interface PcbSmtPadRect {
     type: "pcb_smtpad";
     shape: "rect";
     pcb_smtpad_id: string;
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     x: Distance;
     y: Distance;
     width: number;
@@ -3485,6 +3688,8 @@ interface PcbSmtPadRotatedRect {
     type: "pcb_smtpad";
     shape: "rotated_rect";
     pcb_smtpad_id: string;
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     x: Distance;
     y: Distance;
     width: number;
@@ -3495,7 +3700,24 @@ interface PcbSmtPadRotatedRect {
     pcb_component_id?: string;
     pcb_port_id?: string;
 }
-type PcbSmtPad = PcbSmtPadCircle | PcbSmtPadRect | PcbSmtPadRotatedRect;
+/**
+ * Defines a pill-shaped SMT pad on the PCB (rounded rectangle).
+ */
+interface PcbSmtPadPill {
+    type: "pcb_smtpad";
+    shape: "pill";
+    pcb_smtpad_id: string;
+    x: Distance;
+    y: Distance;
+    width: number;
+    height: number;
+    radius: number;
+    layer: LayerRef;
+    port_hints?: string[];
+    pcb_component_id?: string;
+    pcb_port_id?: string;
+}
+type PcbSmtPad = PcbSmtPadCircle | PcbSmtPadRect | PcbSmtPadRotatedRect | PcbSmtPadPill;
 /**
  * @deprecated use PcbSmtPad
  */
@@ -3505,6 +3727,8 @@ declare const pcb_solder_paste: z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_solder_paste">;
     shape: z.ZodLiteral<"circle">;
     pcb_solder_paste_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     radius: z.ZodNumber;
@@ -3527,7 +3751,9 @@ declare const pcb_solder_paste: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     radius: number;
     pcb_solder_paste_id: string;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
 }, {
     x: string | number;
@@ -3538,13 +3764,17 @@ declare const pcb_solder_paste: z.ZodUnion<[z.ZodObject<{
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     };
     radius: number;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
     pcb_solder_paste_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_solder_paste">;
     shape: z.ZodLiteral<"rect">;
     pcb_solder_paste_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     width: z.ZodNumber;
@@ -3569,7 +3799,9 @@ declare const pcb_solder_paste: z.ZodUnion<[z.ZodObject<{
     shape: "rect";
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     pcb_solder_paste_id: string;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
 }, {
     x: string | number;
@@ -3581,7 +3813,9 @@ declare const pcb_solder_paste: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     };
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
     pcb_solder_paste_id?: string | undefined;
 }>]>;
@@ -3593,6 +3827,8 @@ interface PcbSolderPasteCircle {
     type: "pcb_solder_paste";
     shape: "circle";
     pcb_solder_paste_id: string;
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     x: Distance;
     y: Distance;
     radius: number;
@@ -3607,6 +3843,8 @@ interface PcbSolderPasteRect {
     type: "pcb_solder_paste";
     shape: "rect";
     pcb_solder_paste_id: string;
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     x: Distance;
     y: Distance;
     width: number;
@@ -3620,6 +3858,8 @@ type PcbSolderPaste = PcbSolderPasteCircle | PcbSolderPasteRect;
 declare const pcb_text: z.ZodObject<{
     type: z.ZodLiteral<"pcb_text">;
     pcb_text_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     text: z.ZodString;
     center: z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -3657,6 +3897,8 @@ declare const pcb_text: z.ZodObject<{
     pcb_text_id: string;
     lines: number;
     align: "bottom-left";
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_text";
     width: string | number;
@@ -3671,6 +3913,8 @@ declare const pcb_text: z.ZodObject<{
     };
     lines: number;
     align: "bottom-left";
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_text_id?: string | undefined;
 }>;
 type PcbTextInput = z.input<typeof pcb_text>;
@@ -3680,6 +3924,8 @@ type PcbTextInput = z.input<typeof pcb_text>;
 interface PcbText {
     type: "pcb_text";
     pcb_text_id: string;
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     text: string;
     center: Point;
     layer: LayerRef;
@@ -3805,6 +4051,8 @@ declare const pcb_trace: z.ZodObject<{
     source_trace_id: z.ZodOptional<z.ZodString>;
     pcb_component_id: z.ZodOptional<z.ZodString>;
     pcb_trace_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     route_thickness_mode: z.ZodOptional<z.ZodDefault<z.ZodEnum<["constant", "interpolated"]>>>;
     route_order_index: z.ZodOptional<z.ZodNumber>;
     should_round_corners: z.ZodOptional<z.ZodBoolean>;
@@ -3881,7 +4129,9 @@ declare const pcb_trace: z.ZodObject<{
         from_layer: string;
     })[];
     source_trace_id?: string | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     route_thickness_mode?: "constant" | "interpolated" | undefined;
     route_order_index?: number | undefined;
     should_round_corners?: boolean | undefined;
@@ -3906,7 +4156,9 @@ declare const pcb_trace: z.ZodObject<{
         from_layer: string;
     })[];
     source_trace_id?: string | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_trace_id?: string | undefined;
     route_thickness_mode?: "constant" | "interpolated" | undefined;
     route_order_index?: number | undefined;
@@ -3938,6 +4190,8 @@ interface PcbTrace {
     type: "pcb_trace";
     source_trace_id?: string;
     pcb_component_id?: string;
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     pcb_trace_id: string;
     /**
      * The order that this trace was routed in. This can be used to debug the
@@ -4060,6 +4314,8 @@ type PCBPortNotMatchedError = PcbPortNotMatchedError;
 declare const pcb_via: z.ZodObject<{
     type: z.ZodLiteral<"pcb_via">;
     pcb_via_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     outer_diameter: z.ZodDefault<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
@@ -4102,7 +4358,9 @@ declare const pcb_via: z.ZodObject<{
     outer_diameter: number;
     layers: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6")[];
     pcb_via_id: string;
+    subcircuit_id?: string | undefined;
     to_layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
+    pcb_group_id?: string | undefined;
     from_layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
     pcb_trace_id?: string | undefined;
 }, {
@@ -4112,9 +4370,11 @@ declare const pcb_via: z.ZodObject<{
     layers: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     })[];
+    subcircuit_id?: string | undefined;
     to_layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     } | undefined;
+    pcb_group_id?: string | undefined;
     hole_diameter?: string | number | undefined;
     outer_diameter?: string | number | undefined;
     from_layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
@@ -4130,6 +4390,8 @@ type PcbViaInput = z.input<typeof pcb_via>;
 interface PcbVia {
     type: "pcb_via";
     pcb_via_id: string;
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     x: Distance;
     y: Distance;
     outer_diameter: Distance;
@@ -4149,6 +4411,8 @@ type PCBVia = PcbVia;
 declare const pcb_board: z.ZodObject<{
     type: z.ZodLiteral<"pcb_board">;
     pcb_board_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    is_subcircuit: z.ZodOptional<z.ZodBoolean>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     width: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     height: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     center: z.ZodObject<{
@@ -4184,6 +4448,8 @@ declare const pcb_board: z.ZodObject<{
     pcb_board_id: string;
     thickness: number;
     num_layers: number;
+    subcircuit_id?: string | undefined;
+    is_subcircuit?: boolean | undefined;
     outline?: {
         x: number;
         y: number;
@@ -4196,6 +4462,8 @@ declare const pcb_board: z.ZodObject<{
         x: string | number;
         y: string | number;
     };
+    subcircuit_id?: string | undefined;
+    is_subcircuit?: boolean | undefined;
     pcb_board_id?: string | undefined;
     thickness?: string | number | undefined;
     num_layers?: number | undefined;
@@ -4210,6 +4478,8 @@ declare const pcb_board: z.ZodObject<{
 interface PcbBoard {
     type: "pcb_board";
     pcb_board_id: string;
+    is_subcircuit?: boolean;
+    subcircuit_id?: string;
     width: Length;
     height: Length;
     thickness: Length;
@@ -4331,6 +4601,8 @@ declare const pcb_silkscreen_line: z.ZodObject<{
     type: z.ZodLiteral<"pcb_silkscreen_line">;
     pcb_silkscreen_line_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     pcb_component_id: z.ZodString;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     stroke_width: z.ZodDefault<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
     x1: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y1: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -4347,6 +4619,8 @@ declare const pcb_silkscreen_line: z.ZodObject<{
     layer: "top" | "bottom";
     pcb_silkscreen_line_id: string;
     stroke_width: number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_silkscreen_line";
     x1: string | number;
@@ -4355,6 +4629,8 @@ declare const pcb_silkscreen_line: z.ZodObject<{
     y2: string | number;
     pcb_component_id: string;
     layer: "top" | "bottom";
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_silkscreen_line_id?: string | undefined;
     stroke_width?: string | number | undefined;
 }>;
@@ -4366,6 +4642,8 @@ interface PcbSilkscreenLine {
     type: "pcb_silkscreen_line";
     pcb_silkscreen_line_id: string;
     pcb_component_id: string;
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     stroke_width: Distance;
     x1: Distance;
     y1: Distance;
@@ -4382,6 +4660,8 @@ declare const pcb_silkscreen_path: z.ZodObject<{
     type: z.ZodLiteral<"pcb_silkscreen_path">;
     pcb_silkscreen_path_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     pcb_component_id: z.ZodString;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     layer: z.ZodEnum<["top", "bottom"]>;
     route: z.ZodArray<z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -4404,6 +4684,8 @@ declare const pcb_silkscreen_path: z.ZodObject<{
     }[];
     stroke_width: number;
     pcb_silkscreen_path_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_silkscreen_path";
     pcb_component_id: string;
@@ -4413,6 +4695,8 @@ declare const pcb_silkscreen_path: z.ZodObject<{
         y: string | number;
     }[];
     stroke_width: string | number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_silkscreen_path_id?: string | undefined;
 }>;
 type PcbSilkscreenPathInput = z.input<typeof pcb_silkscreen_path>;
@@ -4423,6 +4707,8 @@ interface PcbSilkscreenPath {
     type: "pcb_silkscreen_path";
     pcb_silkscreen_path_id: string;
     pcb_component_id: string;
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     layer: VisibleLayerRef;
     route: Point[];
     stroke_width: Length;
@@ -4435,6 +4721,8 @@ type PcbSilkscreenPathDeprecated = PcbSilkscreenPath;
 declare const pcb_silkscreen_text: z.ZodObject<{
     type: z.ZodLiteral<"pcb_silkscreen_text">;
     pcb_silkscreen_text_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     font: z.ZodDefault<z.ZodLiteral<"tscircuit2024">>;
     font_size: z.ZodDefault<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
     pcb_component_id: z.ZodString;
@@ -4474,6 +4762,8 @@ declare const pcb_silkscreen_text: z.ZodObject<{
     font: "tscircuit2024";
     font_size: number;
     anchor_alignment: "center" | "top_left" | "top_right" | "bottom_left" | "bottom_right";
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     ccw_rotation?: number | undefined;
     is_mirrored?: boolean | undefined;
 }, {
@@ -4483,10 +4773,12 @@ declare const pcb_silkscreen_text: z.ZodObject<{
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     };
+    subcircuit_id?: string | undefined;
     anchor_position?: {
         x: string | number;
         y: string | number;
     } | undefined;
+    pcb_group_id?: string | undefined;
     ccw_rotation?: number | undefined;
     pcb_silkscreen_text_id?: string | undefined;
     font?: "tscircuit2024" | undefined;
@@ -4501,6 +4793,8 @@ type PcbSilkscreenTextInput = z.input<typeof pcb_silkscreen_text>;
 interface PcbSilkscreenText {
     type: "pcb_silkscreen_text";
     pcb_silkscreen_text_id: string;
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     font: "tscircuit2024";
     font_size: Length;
     pcb_component_id: string;
@@ -4520,6 +4814,8 @@ declare const pcb_silkscreen_rect: z.ZodObject<{
     type: z.ZodLiteral<"pcb_silkscreen_rect">;
     pcb_silkscreen_rect_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     pcb_component_id: z.ZodString;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     center: z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
         y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -4552,6 +4848,8 @@ declare const pcb_silkscreen_rect: z.ZodObject<{
     pcb_component_id: string;
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     pcb_silkscreen_rect_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_silkscreen_rect";
     width: string | number;
@@ -4564,6 +4862,8 @@ declare const pcb_silkscreen_rect: z.ZodObject<{
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     };
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_silkscreen_rect_id?: string | undefined;
 }>;
 type PcbSilkscreenRectInput = z.input<typeof pcb_silkscreen_rect>;
@@ -4574,6 +4874,8 @@ interface PcbSilkscreenRect {
     type: "pcb_silkscreen_rect";
     pcb_silkscreen_rect_id: string;
     pcb_component_id: string;
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     center: Point;
     width: Length;
     height: Length;
@@ -4588,6 +4890,8 @@ declare const pcb_silkscreen_circle: z.ZodObject<{
     type: z.ZodLiteral<"pcb_silkscreen_circle">;
     pcb_silkscreen_circle_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     pcb_component_id: z.ZodString;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     center: z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
         y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -4610,6 +4914,8 @@ declare const pcb_silkscreen_circle: z.ZodObject<{
     layer: "top" | "bottom";
     radius: number;
     pcb_silkscreen_circle_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_silkscreen_circle";
     center: {
@@ -4619,6 +4925,8 @@ declare const pcb_silkscreen_circle: z.ZodObject<{
     pcb_component_id: string;
     layer: "top" | "bottom";
     radius: string | number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_silkscreen_circle_id?: string | undefined;
 }>;
 type PcbSilkscreenCircleInput = z.input<typeof pcb_silkscreen_circle>;
@@ -4629,6 +4937,8 @@ interface PcbSilkscreenCircle {
     type: "pcb_silkscreen_circle";
     pcb_silkscreen_circle_id: string;
     pcb_component_id: string;
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     center: Point;
     radius: Length;
     layer: VisibleLayer;
@@ -4638,6 +4948,8 @@ declare const pcb_silkscreen_oval: z.ZodObject<{
     type: z.ZodLiteral<"pcb_silkscreen_oval">;
     pcb_silkscreen_oval_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     pcb_component_id: z.ZodString;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     center: z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
         y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -4662,6 +4974,8 @@ declare const pcb_silkscreen_oval: z.ZodObject<{
     pcb_silkscreen_oval_id: string;
     radius_x: number;
     radius_y: number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_silkscreen_oval";
     center: {
@@ -4672,6 +4986,8 @@ declare const pcb_silkscreen_oval: z.ZodObject<{
     layer: "top" | "bottom";
     radius_x: string | number;
     radius_y: string | number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_silkscreen_oval_id?: string | undefined;
 }>;
 type PcbSilkscreenOvalInput = z.input<typeof pcb_silkscreen_oval>;
@@ -4682,6 +4998,8 @@ interface PcbSilkscreenOval {
     type: "pcb_silkscreen_oval";
     pcb_silkscreen_oval_id: string;
     pcb_component_id: string;
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     center: Point;
     radius_x: Distance;
     radius_y: Distance;
@@ -4695,6 +5013,8 @@ type PcbSilkscreenOvalDeprecated = PcbSilkscreenOval;
 declare const pcb_fabrication_note_text: z.ZodObject<{
     type: z.ZodLiteral<"pcb_fabrication_note_text">;
     pcb_fabrication_note_text_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
     font: z.ZodDefault<z.ZodLiteral<"tscircuit2024">>;
     font_size: z.ZodDefault<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
     pcb_component_id: z.ZodString;
@@ -4725,17 +5045,21 @@ declare const pcb_fabrication_note_text: z.ZodObject<{
     font_size: number;
     anchor_alignment: "center" | "top_left" | "top_right" | "bottom_left" | "bottom_right";
     pcb_fabrication_note_text_id: string;
+    subcircuit_id?: string | undefined;
     color?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_fabrication_note_text";
     text: string;
     pcb_component_id: string;
     layer: "top" | "bottom";
+    subcircuit_id?: string | undefined;
     color?: string | undefined;
     anchor_position?: {
         x: string | number;
         y: string | number;
     } | undefined;
+    pcb_group_id?: string | undefined;
     font?: "tscircuit2024" | undefined;
     font_size?: string | number | undefined;
     anchor_alignment?: "center" | "top_left" | "top_right" | "bottom_left" | "bottom_right" | undefined;
@@ -4748,6 +5072,8 @@ type PcbFabricationNoteTextInput = z.input<typeof pcb_fabrication_note_text>;
 interface PcbFabricationNoteText {
     type: "pcb_fabrication_note_text";
     pcb_fabrication_note_text_id: string;
+    subcircuit_id?: string;
+    pcb_group_id?: string;
     font: "tscircuit2024";
     font_size: Length;
     pcb_component_id: string;
@@ -4766,6 +5092,7 @@ declare const pcb_fabrication_note_path: z.ZodObject<{
     type: z.ZodLiteral<"pcb_fabrication_note_path">;
     pcb_fabrication_note_path_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     pcb_component_id: z.ZodString;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     layer: z.ZodEffects<z.ZodUnion<[z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>, z.ZodObject<{
         name: z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>;
     }, "strip", z.ZodTypeAny, {
@@ -4797,6 +5124,7 @@ declare const pcb_fabrication_note_path: z.ZodObject<{
     }[];
     stroke_width: number;
     pcb_fabrication_note_path_id: string;
+    subcircuit_id?: string | undefined;
     color?: string | undefined;
 }, {
     type: "pcb_fabrication_note_path";
@@ -4809,6 +5137,7 @@ declare const pcb_fabrication_note_path: z.ZodObject<{
         y: string | number;
     }[];
     stroke_width: string | number;
+    subcircuit_id?: string | undefined;
     color?: string | undefined;
     pcb_fabrication_note_path_id?: string | undefined;
 }>;
@@ -4820,6 +5149,7 @@ interface PcbFabricationNotePath {
     type: "pcb_fabrication_note_path";
     pcb_fabrication_note_path_id: string;
     pcb_component_id: string;
+    subcircuit_id?: string;
     layer: LayerRef;
     route: Point[];
     stroke_width: Length;
@@ -4833,6 +5163,8 @@ type PCBFabricationNotePath = PcbFabricationNotePath;
 declare const pcb_keepout: z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_keepout">;
     shape: z.ZodLiteral<"rect">;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     center: z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
         y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -4860,6 +5192,8 @@ declare const pcb_keepout: z.ZodUnion<[z.ZodObject<{
     layers: string[];
     pcb_keepout_id: string;
     description?: string | undefined;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_keepout";
     width: string | number;
@@ -4872,9 +5206,13 @@ declare const pcb_keepout: z.ZodUnion<[z.ZodObject<{
     layers: string[];
     pcb_keepout_id: string;
     description?: string | undefined;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_keepout">;
     shape: z.ZodLiteral<"circle">;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     center: z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
         y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -4900,6 +5238,8 @@ declare const pcb_keepout: z.ZodUnion<[z.ZodObject<{
     radius: number;
     pcb_keepout_id: string;
     description?: string | undefined;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_keepout";
     center: {
@@ -4911,6 +5251,8 @@ declare const pcb_keepout: z.ZodUnion<[z.ZodObject<{
     radius: string | number;
     pcb_keepout_id: string;
     description?: string | undefined;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }>]>;
 type PCBKeepoutInput = z.input<typeof pcb_keepout>;
 type PCBKeepout = z.infer<typeof pcb_keepout>;
@@ -4918,6 +5260,8 @@ type PCBKeepout = z.infer<typeof pcb_keepout>;
 declare const pcb_missing_footprint_error: z.ZodObject<{
     type: z.ZodLiteral<"pcb_missing_footprint_error">;
     pcb_missing_footprint_error_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     error_type: z.ZodLiteral<"pcb_missing_footprint_error">;
     source_component_id: z.ZodString;
     message: z.ZodString;
@@ -4927,11 +5271,15 @@ declare const pcb_missing_footprint_error: z.ZodObject<{
     source_component_id: string;
     error_type: "pcb_missing_footprint_error";
     pcb_missing_footprint_error_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     message: string;
     type: "pcb_missing_footprint_error";
     source_component_id: string;
     error_type: "pcb_missing_footprint_error";
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_missing_footprint_error_id?: string | undefined;
 }>;
 type PcbMissingFootprintErrorInput = z.input<typeof pcb_missing_footprint_error>;
@@ -4941,6 +5289,8 @@ type PcbMissingFootprintErrorInput = z.input<typeof pcb_missing_footprint_error>
 interface PcbMissingFootprintError {
     type: "pcb_missing_footprint_error";
     pcb_missing_footprint_error_id: string;
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     error_type: "pcb_missing_footprint_error";
     source_component_id: string;
     message: string;
@@ -4955,6 +5305,8 @@ declare const pcb_manual_edit_conflict_error: z.ZodObject<{
     pcb_error_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     message: z.ZodString;
     pcb_component_id: z.ZodString;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     source_component_id: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     message: string;
@@ -4962,11 +5314,15 @@ declare const pcb_manual_edit_conflict_error: z.ZodObject<{
     source_component_id: string;
     pcb_component_id: string;
     pcb_error_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     message: string;
     type: "pcb_manual_edit_conflict_error";
     source_component_id: string;
     pcb_component_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_error_id?: string | undefined;
 }>;
 type PcbManualEditConflictErrorInput = z.input<typeof pcb_manual_edit_conflict_error>;
@@ -4978,6 +5334,8 @@ interface PcbManualEditConflictError {
     pcb_error_id: string;
     message: string;
     pcb_component_id: string;
+    pcb_group_id?: string;
+    subcircuit_id?: string;
     source_component_id: string;
 }
 /**
@@ -4988,6 +5346,8 @@ type PCBManualEditConflictError = PcbManualEditConflictError;
 declare const pcb_group: z.ZodObject<{
     type: z.ZodLiteral<"pcb_group">;
     pcb_group_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    is_subcircuit: z.ZodOptional<z.ZodBoolean>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     width: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     height: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     center: z.ZodObject<{
@@ -5011,10 +5371,12 @@ declare const pcb_group: z.ZodObject<{
         x: number;
         y: number;
     };
-    pcb_component_ids: string[];
     pcb_group_id: string;
+    pcb_component_ids: string[];
     description?: string | undefined;
     name?: string | undefined;
+    subcircuit_id?: string | undefined;
+    is_subcircuit?: boolean | undefined;
 }, {
     type: "pcb_group";
     width: string | number;
@@ -5026,6 +5388,8 @@ declare const pcb_group: z.ZodObject<{
     pcb_component_ids: string[];
     description?: string | undefined;
     name?: string | undefined;
+    subcircuit_id?: string | undefined;
+    is_subcircuit?: boolean | undefined;
     pcb_group_id?: string | undefined;
 }>;
 type PcbGroupInput = z.input<typeof pcb_group>;
@@ -5035,6 +5399,8 @@ type PcbGroupInput = z.input<typeof pcb_group>;
 interface PcbGroup {
     type: "pcb_group";
     pcb_group_id: string;
+    is_subcircuit?: boolean;
+    subcircuit_id?: string;
     width: Length;
     height: Length;
     center: Point;
@@ -5768,15 +6134,21 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
 }>, z.ZodObject<{
     type: z.ZodLiteral<"source_group">;
     source_group_id: z.ZodString;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
+    is_subcircuit: z.ZodOptional<z.ZodBoolean>;
     name: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     type: "source_group";
     source_group_id: string;
     name?: string | undefined;
+    subcircuit_id?: string | undefined;
+    is_subcircuit?: boolean | undefined;
 }, {
     type: "source_group";
     source_group_id: string;
     name?: string | undefined;
+    subcircuit_id?: string | undefined;
+    is_subcircuit?: boolean | undefined;
 }>, z.ZodObject<z.objectUtil.extendShape<{
     type: z.ZodLiteral<"source_component">;
     ftype: z.ZodOptional<z.ZodString>;
@@ -6218,6 +6590,7 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     rotation: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     width: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     height: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     type: "pcb_component";
     width: number;
@@ -6230,6 +6603,7 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     };
     pcb_component_id: string;
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    subcircuit_id?: string | undefined;
 }, {
     type: "pcb_component";
     width: string | number;
@@ -6243,10 +6617,13 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     };
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
 }>, z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_hole">;
     pcb_hole_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     hole_shape: z.ZodEnum<["circle", "square"]>;
     hole_diameter: z.ZodNumber;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -6258,16 +6635,22 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     pcb_hole_id: string;
     hole_shape: "circle" | "square";
     hole_diameter: number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     x: string | number;
     y: string | number;
     type: "pcb_hole";
     hole_shape: "circle" | "square";
     hole_diameter: number;
+    subcircuit_id?: string | undefined;
     pcb_hole_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_hole">;
     pcb_hole_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     hole_shape: z.ZodLiteral<"oval">;
     hole_width: z.ZodNumber;
     hole_height: z.ZodNumber;
@@ -6281,6 +6664,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     hole_shape: "oval";
     hole_width: number;
     hole_height: number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     x: string | number;
     y: string | number;
@@ -6288,10 +6673,14 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     hole_shape: "oval";
     hole_width: number;
     hole_height: number;
+    subcircuit_id?: string | undefined;
     pcb_hole_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }>]>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_missing_footprint_error">;
     pcb_missing_footprint_error_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     error_type: z.ZodLiteral<"pcb_missing_footprint_error">;
     source_component_id: z.ZodString;
     message: z.ZodString;
@@ -6301,17 +6690,23 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     source_component_id: string;
     error_type: "pcb_missing_footprint_error";
     pcb_missing_footprint_error_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     message: string;
     type: "pcb_missing_footprint_error";
     source_component_id: string;
     error_type: "pcb_missing_footprint_error";
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_missing_footprint_error_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_manual_edit_conflict_error">;
     pcb_error_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     message: z.ZodString;
     pcb_component_id: z.ZodString;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     source_component_id: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     message: string;
@@ -6319,15 +6714,21 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     source_component_id: string;
     pcb_component_id: string;
     pcb_error_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     message: string;
     type: "pcb_manual_edit_conflict_error";
     source_component_id: string;
     pcb_component_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_error_id?: string | undefined;
 }>, z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_plated_hole">;
     shape: z.ZodLiteral<"circle">;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     outer_diameter: z.ZodNumber;
     hole_diameter: z.ZodNumber;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -6355,7 +6756,9 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     layers: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6")[];
     pcb_plated_hole_id: string;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }, {
     x: string | number;
@@ -6368,12 +6771,16 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     })[];
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
     pcb_plated_hole_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_plated_hole">;
     shape: z.ZodEnum<["oval", "pill"]>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     outer_width: z.ZodNumber;
     outer_height: z.ZodNumber;
     hole_width: z.ZodNumber;
@@ -6405,7 +6812,9 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     outer_width: number;
     outer_height: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }, {
     x: string | number;
@@ -6420,12 +6829,16 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     outer_width: number;
     outer_height: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
     pcb_plated_hole_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_plated_hole">;
     shape: z.ZodLiteral<"circular_hole_with_rect_pad">;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     hole_shape: z.ZodLiteral<"circle">;
     pad_shape: z.ZodLiteral<"rect">;
     hole_diameter: z.ZodNumber;
@@ -6459,7 +6872,9 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     rect_pad_width: number;
     rect_pad_height: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }, {
     x: string | number;
@@ -6475,12 +6890,16 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     rect_pad_width: number;
     rect_pad_height: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
     pcb_plated_hole_id?: string | undefined;
 }>]>, z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_keepout">;
     shape: z.ZodLiteral<"rect">;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     center: z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
         y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -6508,6 +6927,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     layers: string[];
     pcb_keepout_id: string;
     description?: string | undefined;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_keepout";
     width: string | number;
@@ -6520,9 +6941,13 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     layers: string[];
     pcb_keepout_id: string;
     description?: string | undefined;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_keepout">;
     shape: z.ZodLiteral<"circle">;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     center: z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
         y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -6548,6 +6973,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     radius: number;
     pcb_keepout_id: string;
     description?: string | undefined;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_keepout";
     center: {
@@ -6559,9 +6986,13 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     radius: string | number;
     pcb_keepout_id: string;
     description?: string | undefined;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }>]>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_port">;
     pcb_port_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     source_port_id: z.ZodString;
     pcb_component_id: z.ZodString;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -6583,6 +7014,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     pcb_component_id: string;
     layers: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6")[];
     pcb_port_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     x: string | number;
     y: string | number;
@@ -6592,10 +7025,14 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     layers: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     })[];
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_text">;
     pcb_text_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     text: z.ZodString;
     center: z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -6633,6 +7070,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     pcb_text_id: string;
     lines: number;
     align: "bottom-left";
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_text";
     width: string | number;
@@ -6647,12 +7086,16 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     };
     lines: number;
     align: "bottom-left";
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_text_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_trace">;
     source_trace_id: z.ZodOptional<z.ZodString>;
     pcb_component_id: z.ZodOptional<z.ZodString>;
     pcb_trace_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     route_thickness_mode: z.ZodOptional<z.ZodDefault<z.ZodEnum<["constant", "interpolated"]>>>;
     route_order_index: z.ZodOptional<z.ZodNumber>;
     should_round_corners: z.ZodOptional<z.ZodBoolean>;
@@ -6729,7 +7172,9 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
         from_layer: string;
     })[];
     source_trace_id?: string | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     route_thickness_mode?: "constant" | "interpolated" | undefined;
     route_order_index?: number | undefined;
     should_round_corners?: boolean | undefined;
@@ -6754,7 +7199,9 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
         from_layer: string;
     })[];
     source_trace_id?: string | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_trace_id?: string | undefined;
     route_thickness_mode?: "constant" | "interpolated" | undefined;
     route_order_index?: number | undefined;
@@ -6763,6 +7210,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_via">;
     pcb_via_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     outer_diameter: z.ZodDefault<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
@@ -6803,7 +7252,9 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     outer_diameter: number;
     layers: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6")[];
     pcb_via_id: string;
+    subcircuit_id?: string | undefined;
     to_layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
+    pcb_group_id?: string | undefined;
     from_layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
     pcb_trace_id?: string | undefined;
 }, {
@@ -6813,9 +7264,11 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     layers: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     })[];
+    subcircuit_id?: string | undefined;
     to_layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     } | undefined;
+    pcb_group_id?: string | undefined;
     hole_diameter?: string | number | undefined;
     outer_diameter?: string | number | undefined;
     from_layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
@@ -6827,6 +7280,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_smtpad">;
     shape: z.ZodLiteral<"circle">;
     pcb_smtpad_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     radius: z.ZodNumber;
@@ -6851,7 +7306,9 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     pcb_smtpad_id: string;
     radius: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }, {
     x: string | number;
@@ -6863,13 +7320,17 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     };
     radius: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_smtpad">;
     shape: z.ZodLiteral<"rect">;
     pcb_smtpad_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     width: z.ZodNumber;
@@ -6896,7 +7357,9 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     pcb_smtpad_id: string;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }, {
     x: string | number;
@@ -6909,13 +7372,17 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     };
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_smtpad">;
     shape: z.ZodLiteral<"rotated_rect">;
     pcb_smtpad_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     width: z.ZodNumber;
@@ -6944,7 +7411,9 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     pcb_smtpad_id: string;
     ccw_rotation: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }, {
     x: string | number;
@@ -6958,6 +7427,57 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     };
     ccw_rotation: string | number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
+    pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
+    pcb_port_id?: string | undefined;
+    pcb_smtpad_id?: string | undefined;
+}>, z.ZodObject<{
+    type: z.ZodLiteral<"pcb_smtpad">;
+    shape: z.ZodLiteral<"pill">;
+    pcb_smtpad_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
+    y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
+    width: z.ZodNumber;
+    height: z.ZodNumber;
+    radius: z.ZodNumber;
+    layer: z.ZodEffects<z.ZodUnion<[z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>, z.ZodObject<{
+        name: z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>;
+    }, "strip", z.ZodTypeAny, {
+        name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    }, {
+        name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    }>]>, "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6", "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
+        name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    }>;
+    port_hints: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    pcb_component_id: z.ZodOptional<z.ZodString>;
+    pcb_port_id: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    x: number;
+    y: number;
+    type: "pcb_smtpad";
+    width: number;
+    height: number;
+    shape: "pill";
+    layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    pcb_smtpad_id: string;
+    radius: number;
+    port_hints?: string[] | undefined;
+    pcb_component_id?: string | undefined;
+    pcb_port_id?: string | undefined;
+}, {
+    x: string | number;
+    y: string | number;
+    type: "pcb_smtpad";
+    width: number;
+    height: number;
+    shape: "pill";
+    layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
+        name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    };
+    radius: number;
+    port_hints?: string[] | undefined;
     pcb_component_id?: string | undefined;
     pcb_port_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
@@ -6965,6 +7485,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_solder_paste">;
     shape: z.ZodLiteral<"circle">;
     pcb_solder_paste_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     radius: z.ZodNumber;
@@ -6987,7 +7509,9 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     radius: number;
     pcb_solder_paste_id: string;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
 }, {
     x: string | number;
@@ -6998,13 +7522,17 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     };
     radius: number;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
     pcb_solder_paste_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_solder_paste">;
     shape: z.ZodLiteral<"rect">;
     pcb_solder_paste_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     width: z.ZodNumber;
@@ -7029,7 +7557,9 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     shape: "rect";
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     pcb_solder_paste_id: string;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
 }, {
     x: string | number;
@@ -7041,12 +7571,16 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     };
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
     pcb_solder_paste_id?: string | undefined;
 }>]>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_board">;
     pcb_board_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    is_subcircuit: z.ZodOptional<z.ZodBoolean>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     width: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     height: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     center: z.ZodObject<{
@@ -7082,6 +7616,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     pcb_board_id: string;
     thickness: number;
     num_layers: number;
+    subcircuit_id?: string | undefined;
+    is_subcircuit?: boolean | undefined;
     outline?: {
         x: number;
         y: number;
@@ -7094,6 +7630,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
         x: string | number;
         y: string | number;
     };
+    subcircuit_id?: string | undefined;
+    is_subcircuit?: boolean | undefined;
     pcb_board_id?: string | undefined;
     thickness?: string | number | undefined;
     num_layers?: number | undefined;
@@ -7104,6 +7642,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_group">;
     pcb_group_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    is_subcircuit: z.ZodOptional<z.ZodBoolean>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     width: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     height: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     center: z.ZodObject<{
@@ -7127,10 +7667,12 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
         x: number;
         y: number;
     };
-    pcb_component_ids: string[];
     pcb_group_id: string;
+    pcb_component_ids: string[];
     description?: string | undefined;
     name?: string | undefined;
+    subcircuit_id?: string | undefined;
+    is_subcircuit?: boolean | undefined;
 }, {
     type: "pcb_group";
     width: string | number;
@@ -7142,6 +7684,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     pcb_component_ids: string[];
     description?: string | undefined;
     name?: string | undefined;
+    subcircuit_id?: string | undefined;
+    is_subcircuit?: boolean | undefined;
     pcb_group_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_trace_hint">;
@@ -7207,6 +7751,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_silkscreen_line">;
     pcb_silkscreen_line_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     pcb_component_id: z.ZodString;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     stroke_width: z.ZodDefault<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
     x1: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y1: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -7223,6 +7769,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom";
     pcb_silkscreen_line_id: string;
     stroke_width: number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_silkscreen_line";
     x1: string | number;
@@ -7231,12 +7779,16 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     y2: string | number;
     pcb_component_id: string;
     layer: "top" | "bottom";
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_silkscreen_line_id?: string | undefined;
     stroke_width?: string | number | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_silkscreen_path">;
     pcb_silkscreen_path_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     pcb_component_id: z.ZodString;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     layer: z.ZodEnum<["top", "bottom"]>;
     route: z.ZodArray<z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -7259,6 +7811,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     }[];
     stroke_width: number;
     pcb_silkscreen_path_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_silkscreen_path";
     pcb_component_id: string;
@@ -7268,10 +7822,14 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
         y: string | number;
     }[];
     stroke_width: string | number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_silkscreen_path_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_silkscreen_text">;
     pcb_silkscreen_text_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     font: z.ZodDefault<z.ZodLiteral<"tscircuit2024">>;
     font_size: z.ZodDefault<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
     pcb_component_id: z.ZodString;
@@ -7311,6 +7869,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     font: "tscircuit2024";
     font_size: number;
     anchor_alignment: "center" | "top_left" | "top_right" | "bottom_left" | "bottom_right";
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     ccw_rotation?: number | undefined;
     is_mirrored?: boolean | undefined;
 }, {
@@ -7320,10 +7880,12 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     };
+    subcircuit_id?: string | undefined;
     anchor_position?: {
         x: string | number;
         y: string | number;
     } | undefined;
+    pcb_group_id?: string | undefined;
     ccw_rotation?: number | undefined;
     pcb_silkscreen_text_id?: string | undefined;
     font?: "tscircuit2024" | undefined;
@@ -7334,6 +7896,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_silkscreen_rect">;
     pcb_silkscreen_rect_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     pcb_component_id: z.ZodString;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     center: z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
         y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -7366,6 +7930,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     pcb_component_id: string;
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     pcb_silkscreen_rect_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_silkscreen_rect";
     width: string | number;
@@ -7378,11 +7944,15 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     };
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_silkscreen_rect_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_silkscreen_circle">;
     pcb_silkscreen_circle_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     pcb_component_id: z.ZodString;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     center: z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
         y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -7405,6 +7975,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom";
     radius: number;
     pcb_silkscreen_circle_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_silkscreen_circle";
     center: {
@@ -7414,11 +7986,15 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     pcb_component_id: string;
     layer: "top" | "bottom";
     radius: string | number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_silkscreen_circle_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_silkscreen_oval">;
     pcb_silkscreen_oval_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     pcb_component_id: z.ZodString;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     center: z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
         y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -7443,6 +8019,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     pcb_silkscreen_oval_id: string;
     radius_x: number;
     radius_y: number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_silkscreen_oval";
     center: {
@@ -7453,6 +8031,8 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom";
     radius_x: string | number;
     radius_y: string | number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_silkscreen_oval_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_trace_error">;
@@ -7530,6 +8110,7 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_fabrication_note_path">;
     pcb_fabrication_note_path_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     pcb_component_id: z.ZodString;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     layer: z.ZodEffects<z.ZodUnion<[z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>, z.ZodObject<{
         name: z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>;
     }, "strip", z.ZodTypeAny, {
@@ -7561,6 +8142,7 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     }[];
     stroke_width: number;
     pcb_fabrication_note_path_id: string;
+    subcircuit_id?: string | undefined;
     color?: string | undefined;
 }, {
     type: "pcb_fabrication_note_path";
@@ -7573,11 +8155,14 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
         y: string | number;
     }[];
     stroke_width: string | number;
+    subcircuit_id?: string | undefined;
     color?: string | undefined;
     pcb_fabrication_note_path_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_fabrication_note_text">;
     pcb_fabrication_note_text_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
     font: z.ZodDefault<z.ZodLiteral<"tscircuit2024">>;
     font_size: z.ZodDefault<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
     pcb_component_id: z.ZodString;
@@ -7608,17 +8193,21 @@ declare const any_circuit_element: z.ZodUnion<[z.ZodObject<{
     font_size: number;
     anchor_alignment: "center" | "top_left" | "top_right" | "bottom_left" | "bottom_right";
     pcb_fabrication_note_text_id: string;
+    subcircuit_id?: string | undefined;
     color?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_fabrication_note_text";
     text: string;
     pcb_component_id: string;
     layer: "top" | "bottom";
+    subcircuit_id?: string | undefined;
     color?: string | undefined;
     anchor_position?: {
         x: string | number;
         y: string | number;
     } | undefined;
+    pcb_group_id?: string | undefined;
     font?: "tscircuit2024" | undefined;
     font_size?: string | number | undefined;
     anchor_alignment?: "center" | "top_left" | "top_right" | "bottom_left" | "bottom_right" | undefined;
@@ -9081,15 +9670,21 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
 }>, z.ZodObject<{
     type: z.ZodLiteral<"source_group">;
     source_group_id: z.ZodString;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
+    is_subcircuit: z.ZodOptional<z.ZodBoolean>;
     name: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     type: "source_group";
     source_group_id: string;
     name?: string | undefined;
+    subcircuit_id?: string | undefined;
+    is_subcircuit?: boolean | undefined;
 }, {
     type: "source_group";
     source_group_id: string;
     name?: string | undefined;
+    subcircuit_id?: string | undefined;
+    is_subcircuit?: boolean | undefined;
 }>, z.ZodObject<z.objectUtil.extendShape<{
     type: z.ZodLiteral<"source_component">;
     ftype: z.ZodOptional<z.ZodString>;
@@ -9531,6 +10126,7 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     rotation: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     width: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     height: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     type: "pcb_component";
     width: number;
@@ -9543,6 +10139,7 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     };
     pcb_component_id: string;
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    subcircuit_id?: string | undefined;
 }, {
     type: "pcb_component";
     width: string | number;
@@ -9556,10 +10153,13 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     };
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
 }>, z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_hole">;
     pcb_hole_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     hole_shape: z.ZodEnum<["circle", "square"]>;
     hole_diameter: z.ZodNumber;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -9571,16 +10171,22 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     pcb_hole_id: string;
     hole_shape: "circle" | "square";
     hole_diameter: number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     x: string | number;
     y: string | number;
     type: "pcb_hole";
     hole_shape: "circle" | "square";
     hole_diameter: number;
+    subcircuit_id?: string | undefined;
     pcb_hole_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_hole">;
     pcb_hole_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     hole_shape: z.ZodLiteral<"oval">;
     hole_width: z.ZodNumber;
     hole_height: z.ZodNumber;
@@ -9594,6 +10200,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     hole_shape: "oval";
     hole_width: number;
     hole_height: number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     x: string | number;
     y: string | number;
@@ -9601,10 +10209,14 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     hole_shape: "oval";
     hole_width: number;
     hole_height: number;
+    subcircuit_id?: string | undefined;
     pcb_hole_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }>]>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_missing_footprint_error">;
     pcb_missing_footprint_error_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     error_type: z.ZodLiteral<"pcb_missing_footprint_error">;
     source_component_id: z.ZodString;
     message: z.ZodString;
@@ -9614,17 +10226,23 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     source_component_id: string;
     error_type: "pcb_missing_footprint_error";
     pcb_missing_footprint_error_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     message: string;
     type: "pcb_missing_footprint_error";
     source_component_id: string;
     error_type: "pcb_missing_footprint_error";
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_missing_footprint_error_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_manual_edit_conflict_error">;
     pcb_error_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     message: z.ZodString;
     pcb_component_id: z.ZodString;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     source_component_id: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     message: string;
@@ -9632,15 +10250,21 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     source_component_id: string;
     pcb_component_id: string;
     pcb_error_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     message: string;
     type: "pcb_manual_edit_conflict_error";
     source_component_id: string;
     pcb_component_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_error_id?: string | undefined;
 }>, z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_plated_hole">;
     shape: z.ZodLiteral<"circle">;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     outer_diameter: z.ZodNumber;
     hole_diameter: z.ZodNumber;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -9668,7 +10292,9 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     layers: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6")[];
     pcb_plated_hole_id: string;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }, {
     x: string | number;
@@ -9681,12 +10307,16 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     })[];
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
     pcb_plated_hole_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_plated_hole">;
     shape: z.ZodEnum<["oval", "pill"]>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     outer_width: z.ZodNumber;
     outer_height: z.ZodNumber;
     hole_width: z.ZodNumber;
@@ -9718,7 +10348,9 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     outer_width: number;
     outer_height: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }, {
     x: string | number;
@@ -9733,12 +10365,16 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     outer_width: number;
     outer_height: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
     pcb_plated_hole_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_plated_hole">;
     shape: z.ZodLiteral<"circular_hole_with_rect_pad">;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     hole_shape: z.ZodLiteral<"circle">;
     pad_shape: z.ZodLiteral<"rect">;
     hole_diameter: z.ZodNumber;
@@ -9772,7 +10408,9 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     rect_pad_width: number;
     rect_pad_height: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }, {
     x: string | number;
@@ -9788,12 +10426,16 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     rect_pad_width: number;
     rect_pad_height: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
     pcb_plated_hole_id?: string | undefined;
 }>]>, z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_keepout">;
     shape: z.ZodLiteral<"rect">;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     center: z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
         y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -9821,6 +10463,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     layers: string[];
     pcb_keepout_id: string;
     description?: string | undefined;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_keepout";
     width: string | number;
@@ -9833,9 +10477,13 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     layers: string[];
     pcb_keepout_id: string;
     description?: string | undefined;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_keepout">;
     shape: z.ZodLiteral<"circle">;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     center: z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
         y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -9861,6 +10509,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     radius: number;
     pcb_keepout_id: string;
     description?: string | undefined;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_keepout";
     center: {
@@ -9872,9 +10522,13 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     radius: string | number;
     pcb_keepout_id: string;
     description?: string | undefined;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }>]>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_port">;
     pcb_port_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     source_port_id: z.ZodString;
     pcb_component_id: z.ZodString;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -9896,6 +10550,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     pcb_component_id: string;
     layers: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6")[];
     pcb_port_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     x: string | number;
     y: string | number;
@@ -9905,10 +10561,14 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     layers: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     })[];
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_text">;
     pcb_text_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     text: z.ZodString;
     center: z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -9946,6 +10606,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     pcb_text_id: string;
     lines: number;
     align: "bottom-left";
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_text";
     width: string | number;
@@ -9960,12 +10622,16 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     };
     lines: number;
     align: "bottom-left";
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_text_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_trace">;
     source_trace_id: z.ZodOptional<z.ZodString>;
     pcb_component_id: z.ZodOptional<z.ZodString>;
     pcb_trace_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     route_thickness_mode: z.ZodOptional<z.ZodDefault<z.ZodEnum<["constant", "interpolated"]>>>;
     route_order_index: z.ZodOptional<z.ZodNumber>;
     should_round_corners: z.ZodOptional<z.ZodBoolean>;
@@ -10042,7 +10708,9 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
         from_layer: string;
     })[];
     source_trace_id?: string | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     route_thickness_mode?: "constant" | "interpolated" | undefined;
     route_order_index?: number | undefined;
     should_round_corners?: boolean | undefined;
@@ -10067,7 +10735,9 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
         from_layer: string;
     })[];
     source_trace_id?: string | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_trace_id?: string | undefined;
     route_thickness_mode?: "constant" | "interpolated" | undefined;
     route_order_index?: number | undefined;
@@ -10076,6 +10746,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_via">;
     pcb_via_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     outer_diameter: z.ZodDefault<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
@@ -10116,7 +10788,9 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     outer_diameter: number;
     layers: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6")[];
     pcb_via_id: string;
+    subcircuit_id?: string | undefined;
     to_layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
+    pcb_group_id?: string | undefined;
     from_layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
     pcb_trace_id?: string | undefined;
 }, {
@@ -10126,9 +10800,11 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     layers: ("top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     })[];
+    subcircuit_id?: string | undefined;
     to_layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     } | undefined;
+    pcb_group_id?: string | undefined;
     hole_diameter?: string | number | undefined;
     outer_diameter?: string | number | undefined;
     from_layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
@@ -10140,6 +10816,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_smtpad">;
     shape: z.ZodLiteral<"circle">;
     pcb_smtpad_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     radius: z.ZodNumber;
@@ -10164,7 +10842,9 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     pcb_smtpad_id: string;
     radius: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }, {
     x: string | number;
@@ -10176,13 +10856,17 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     };
     radius: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_smtpad">;
     shape: z.ZodLiteral<"rect">;
     pcb_smtpad_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     width: z.ZodNumber;
@@ -10209,7 +10893,9 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     pcb_smtpad_id: string;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }, {
     x: string | number;
@@ -10222,13 +10908,17 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     };
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_smtpad">;
     shape: z.ZodLiteral<"rotated_rect">;
     pcb_smtpad_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     width: z.ZodNumber;
@@ -10257,7 +10947,9 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     pcb_smtpad_id: string;
     ccw_rotation: number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_port_id?: string | undefined;
 }, {
     x: string | number;
@@ -10271,6 +10963,57 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     };
     ccw_rotation: string | number;
     port_hints?: string[] | undefined;
+    subcircuit_id?: string | undefined;
+    pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
+    pcb_port_id?: string | undefined;
+    pcb_smtpad_id?: string | undefined;
+}>, z.ZodObject<{
+    type: z.ZodLiteral<"pcb_smtpad">;
+    shape: z.ZodLiteral<"pill">;
+    pcb_smtpad_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
+    y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
+    width: z.ZodNumber;
+    height: z.ZodNumber;
+    radius: z.ZodNumber;
+    layer: z.ZodEffects<z.ZodUnion<[z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>, z.ZodObject<{
+        name: z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>;
+    }, "strip", z.ZodTypeAny, {
+        name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    }, {
+        name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    }>]>, "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6", "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
+        name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    }>;
+    port_hints: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    pcb_component_id: z.ZodOptional<z.ZodString>;
+    pcb_port_id: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    x: number;
+    y: number;
+    type: "pcb_smtpad";
+    width: number;
+    height: number;
+    shape: "pill";
+    layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    pcb_smtpad_id: string;
+    radius: number;
+    port_hints?: string[] | undefined;
+    pcb_component_id?: string | undefined;
+    pcb_port_id?: string | undefined;
+}, {
+    x: string | number;
+    y: string | number;
+    type: "pcb_smtpad";
+    width: number;
+    height: number;
+    shape: "pill";
+    layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
+        name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+    };
+    radius: number;
+    port_hints?: string[] | undefined;
     pcb_component_id?: string | undefined;
     pcb_port_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
@@ -10278,6 +11021,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_solder_paste">;
     shape: z.ZodLiteral<"circle">;
     pcb_solder_paste_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     radius: z.ZodNumber;
@@ -10300,7 +11045,9 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     radius: number;
     pcb_solder_paste_id: string;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
 }, {
     x: string | number;
@@ -10311,13 +11058,17 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     };
     radius: number;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
     pcb_solder_paste_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_solder_paste">;
     shape: z.ZodLiteral<"rect">;
     pcb_solder_paste_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     width: z.ZodNumber;
@@ -10342,7 +11093,9 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     shape: "rect";
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     pcb_solder_paste_id: string;
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
 }, {
     x: string | number;
@@ -10354,12 +11107,16 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     };
+    subcircuit_id?: string | undefined;
     pcb_component_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_smtpad_id?: string | undefined;
     pcb_solder_paste_id?: string | undefined;
 }>]>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_board">;
     pcb_board_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    is_subcircuit: z.ZodOptional<z.ZodBoolean>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     width: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     height: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     center: z.ZodObject<{
@@ -10395,6 +11152,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     pcb_board_id: string;
     thickness: number;
     num_layers: number;
+    subcircuit_id?: string | undefined;
+    is_subcircuit?: boolean | undefined;
     outline?: {
         x: number;
         y: number;
@@ -10407,6 +11166,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
         x: string | number;
         y: string | number;
     };
+    subcircuit_id?: string | undefined;
+    is_subcircuit?: boolean | undefined;
     pcb_board_id?: string | undefined;
     thickness?: string | number | undefined;
     num_layers?: number | undefined;
@@ -10417,6 +11178,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_group">;
     pcb_group_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    is_subcircuit: z.ZodOptional<z.ZodBoolean>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     width: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     height: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     center: z.ZodObject<{
@@ -10440,10 +11203,12 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
         x: number;
         y: number;
     };
-    pcb_component_ids: string[];
     pcb_group_id: string;
+    pcb_component_ids: string[];
     description?: string | undefined;
     name?: string | undefined;
+    subcircuit_id?: string | undefined;
+    is_subcircuit?: boolean | undefined;
 }, {
     type: "pcb_group";
     width: string | number;
@@ -10455,6 +11220,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     pcb_component_ids: string[];
     description?: string | undefined;
     name?: string | undefined;
+    subcircuit_id?: string | undefined;
+    is_subcircuit?: boolean | undefined;
     pcb_group_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_trace_hint">;
@@ -10520,6 +11287,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_silkscreen_line">;
     pcb_silkscreen_line_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     pcb_component_id: z.ZodString;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     stroke_width: z.ZodDefault<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
     x1: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
     y1: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -10536,6 +11305,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom";
     pcb_silkscreen_line_id: string;
     stroke_width: number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_silkscreen_line";
     x1: string | number;
@@ -10544,12 +11315,16 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     y2: string | number;
     pcb_component_id: string;
     layer: "top" | "bottom";
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_silkscreen_line_id?: string | undefined;
     stroke_width?: string | number | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_silkscreen_path">;
     pcb_silkscreen_path_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     pcb_component_id: z.ZodString;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     layer: z.ZodEnum<["top", "bottom"]>;
     route: z.ZodArray<z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -10572,6 +11347,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     }[];
     stroke_width: number;
     pcb_silkscreen_path_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_silkscreen_path";
     pcb_component_id: string;
@@ -10581,10 +11358,14 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
         y: string | number;
     }[];
     stroke_width: string | number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_silkscreen_path_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_silkscreen_text">;
     pcb_silkscreen_text_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     font: z.ZodDefault<z.ZodLiteral<"tscircuit2024">>;
     font_size: z.ZodDefault<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
     pcb_component_id: z.ZodString;
@@ -10624,6 +11405,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     font: "tscircuit2024";
     font_size: number;
     anchor_alignment: "center" | "top_left" | "top_right" | "bottom_left" | "bottom_right";
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     ccw_rotation?: number | undefined;
     is_mirrored?: boolean | undefined;
 }, {
@@ -10633,10 +11416,12 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     };
+    subcircuit_id?: string | undefined;
     anchor_position?: {
         x: string | number;
         y: string | number;
     } | undefined;
+    pcb_group_id?: string | undefined;
     ccw_rotation?: number | undefined;
     pcb_silkscreen_text_id?: string | undefined;
     font?: "tscircuit2024" | undefined;
@@ -10647,6 +11432,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_silkscreen_rect">;
     pcb_silkscreen_rect_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     pcb_component_id: z.ZodString;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     center: z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
         y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -10679,6 +11466,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     pcb_component_id: string;
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     pcb_silkscreen_rect_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_silkscreen_rect";
     width: string | number;
@@ -10691,11 +11480,15 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     };
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_silkscreen_rect_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_silkscreen_circle">;
     pcb_silkscreen_circle_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     pcb_component_id: z.ZodString;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     center: z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
         y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -10718,6 +11511,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom";
     radius: number;
     pcb_silkscreen_circle_id: string;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_silkscreen_circle";
     center: {
@@ -10727,11 +11522,15 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     pcb_component_id: string;
     layer: "top" | "bottom";
     radius: string | number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_silkscreen_circle_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_silkscreen_oval">;
     pcb_silkscreen_oval_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     pcb_component_id: z.ZodString;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     center: z.ZodObject<{
         x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
         y: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -10756,6 +11555,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     pcb_silkscreen_oval_id: string;
     radius_x: number;
     radius_y: number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_silkscreen_oval";
     center: {
@@ -10766,6 +11567,8 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     layer: "top" | "bottom";
     radius_x: string | number;
     radius_y: string | number;
+    subcircuit_id?: string | undefined;
+    pcb_group_id?: string | undefined;
     pcb_silkscreen_oval_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_trace_error">;
@@ -10843,6 +11646,7 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"pcb_fabrication_note_path">;
     pcb_fabrication_note_path_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     pcb_component_id: z.ZodString;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
     layer: z.ZodEffects<z.ZodUnion<[z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>, z.ZodObject<{
         name: z.ZodEnum<["top", "bottom", "inner1", "inner2", "inner3", "inner4", "inner5", "inner6"]>;
     }, "strip", z.ZodTypeAny, {
@@ -10874,6 +11678,7 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     }[];
     stroke_width: number;
     pcb_fabrication_note_path_id: string;
+    subcircuit_id?: string | undefined;
     color?: string | undefined;
 }, {
     type: "pcb_fabrication_note_path";
@@ -10886,11 +11691,14 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
         y: string | number;
     }[];
     stroke_width: string | number;
+    subcircuit_id?: string | undefined;
     color?: string | undefined;
     pcb_fabrication_note_path_id?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"pcb_fabrication_note_text">;
     pcb_fabrication_note_text_id: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    subcircuit_id: z.ZodOptional<z.ZodString>;
+    pcb_group_id: z.ZodOptional<z.ZodString>;
     font: z.ZodDefault<z.ZodLiteral<"tscircuit2024">>;
     font_size: z.ZodDefault<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
     pcb_component_id: z.ZodString;
@@ -10921,17 +11729,21 @@ declare const any_soup_element: z.ZodUnion<[z.ZodObject<{
     font_size: number;
     anchor_alignment: "center" | "top_left" | "top_right" | "bottom_left" | "bottom_right";
     pcb_fabrication_note_text_id: string;
+    subcircuit_id?: string | undefined;
     color?: string | undefined;
+    pcb_group_id?: string | undefined;
 }, {
     type: "pcb_fabrication_note_text";
     text: string;
     pcb_component_id: string;
     layer: "top" | "bottom";
+    subcircuit_id?: string | undefined;
     color?: string | undefined;
     anchor_position?: {
         x: string | number;
         y: string | number;
     } | undefined;
+    pcb_group_id?: string | undefined;
     font?: "tscircuit2024" | undefined;
     font_size?: string | number | undefined;
     anchor_alignment?: "center" | "top_left" | "top_right" | "bottom_left" | "bottom_right" | undefined;
@@ -11800,4 +12612,4 @@ type AnySoupElementInput = AnyCircuitElementInput;
  */
 type CircuitJson = AnyCircuitElement[];
-export { type AnyCircuitElement, type AnyCircuitElementInput, type AnySoupElement, type AnySoupElementInput, type AnySourceComponent, type CadComponent, type CadComponentInput, type CircuitJson, type Distance, type InputPoint, type InputPosition, type InputRotation, type LayerRef, type LayerRefInput, type Length, type PCBBoard, type PCBComponent, type PCBFabricationNotePath, type PCBFabricationNoteText, type PCBHole, type PCBHoleInput, type PCBKeepout, type PCBKeepoutInput, type PCBManualEditConflictError, type PCBMissingFootprintError, type PCBPlacementError, type PCBPlatedHole, type PCBPlatedHoleInput, type PCBPort, type PCBPortInput, type PCBPortNotMatchedError, type PCBSMTPad, type PCBSMTPadInput, type PCBSilkscreenLine, type PCBSilkscreenText, type PCBSolderPasteInput, type PCBText, type PCBTrace, type PCBTraceError, type PCBTraceHint, type PCBTraceInput, type PCBVia, type PcbBoard, type PcbBoardInput, type PcbCircuitElement, type PcbComponent, type PcbComponentInput, type PcbFabricationNotePath, type PcbFabricationNotePathInput, type PcbFabricationNoteText, type PcbFabricationNoteTextInput, type PcbGroup, type PcbGroupInput, type PcbHole, type PcbHoleCircleOrSquare, type PcbHoleCircleOrSquareInput, type PcbHoleCircularWithRectPad, type PcbHoleOval, type PcbHoleOvalInput, type PcbManualEditConflictError, type PcbManualEditConflictErrorInput, type PcbMissingFootprintError, type PcbMissingFootprintErrorInput, type PcbPlacementError, type PcbPlacementErrorInput, type PcbPlatedHole, type PcbPlatedHoleCircle, type PcbPlatedHoleInput, type PcbPlatedHoleOval, type PcbPort, type PcbPortInput, type PcbPortNotMatchedError, type PcbPortNotMatchedErrorInput, type PcbRouteHint, type PcbRouteHintInput, type PcbRouteHints, type PcbRouteHintsInput, type PcbSilkscreenCircle, type PcbSilkscreenCircleInput, type PcbSilkscreenLine, type PcbSilkscreenLineInput, type PcbSilkscreenOval, type PcbSilkscreenOvalDeprecated, type PcbSilkscreenOvalInput, type PcbSilkscreenPath, type PcbSilkscreenPathDeprecated, type PcbSilkscreenPathInput, type PcbSilkscreenRect, type PcbSilkscreenRectInput, type PcbSilkscreenRectOld, type PcbSilkscreenText, type PcbSilkscreenTextInput, type PcbSmtPad, type PcbSmtPadCircle, type PcbSmtPadRect, type PcbSmtPadRotatedRect, type PcbSolderPaste, type PcbSolderPasteCircle, type PcbSolderPasteRect, type PcbText, type PcbTextInput, type PcbTrace, type PcbTraceError, type PcbTraceErrorInput, type PcbTraceHint, type PcbTraceHintInput, type PcbTraceInput, type PcbTraceRoutePoint, type PcbTraceRoutePointVia, type PcbTraceRoutePointWire, type PcbVia, type PcbViaInput, type Point, type Point3, type Position, type Rotation, type RouteHintPoint, type RouteHintPointInput, type SchematicBox, type SchematicBoxInput, type SchematicComponent, type SchematicComponentInput, type SchematicDebugLine, type SchematicDebugObject, type SchematicDebugObjectInput, type SchematicDebugPoint, type SchematicDebugRect, type SchematicError, type SchematicErrorInput, type SchematicLine, type SchematicLineInput, type SchematicNetLabel, type SchematicNetLabelInput, type SchematicPath, type SchematicPathInput, type SchematicPort, type SchematicPortArrangement, type SchematicPortArrangementBySides, type SchematicPortArrangementBySize, type SchematicPortInput, type SchematicText, type SchematicTextInput, type SchematicTrace, type SchematicTraceEdge, type SchematicTraceInput, type SchematicVoltageProbe, type SchematicVoltageProbeInput, type Size, type SourceComponentBase, type SourceGroup, type SourceGroupInput, type SourceLed, type SourceLedInput, type SourceNet, type SourceNetInput, type SourcePort, type SourcePortInput, type SourceSimpleBattery, type SourceSimpleBatteryInput, type SourceSimpleBugInput, type SourceSimpleCapacitor, type SourceSimpleCapacitorInput, type SourceSimpleChip, type SourceSimpleChipInput, type SourceSimpleCrystal, type SourceSimpleCrystalInput, type SourceSimpleDiode, type SourceSimpleDiodeInput, type SourceSimpleGround, type SourceSimpleGroundInput, type SourceSimpleInductor, type SourceSimpleInductorInput, type SourceSimpleMosfet, type SourceSimpleMosfetInput, type SourceSimplePinHeader, type SourceSimplePinHeaderInput, type SourceSimplePotentiometer, type SourceSimplePotentiometerInput, type SourceSimplePowerSource, type SourceSimplePowerSourceInput, type SourceSimplePushButton, type SourceSimplePushButtonInput, type SourceSimpleResistor, type SourceSimpleResistorInput, type SourceSimpleResonator, type SourceSimpleResonatorInput, type SourceSimpleTransistor, type SourceSimpleTransistorInput, type SourceTrace, type SupplierName, type VisibleLayer, type VisibleLayerRef, all_layers, any_circuit_element, any_soup_element, any_source_component, battery_capacity, cad_component, capacitance, current, distance, frequency, getZodPrefixedIdWithDefault, inductance, layer_ref, layer_string, length, pcb_board, pcb_component, pcb_fabrication_note_path, pcb_fabrication_note_text, pcb_group, pcb_hole, pcb_hole_circle_or_square_shape, pcb_hole_oval_shape, pcb_keepout, pcb_manual_edit_conflict_error, pcb_missing_footprint_error, pcb_placement_error, pcb_plated_hole, pcb_port, pcb_port_not_matched_error, pcb_route_hint, pcb_route_hints, pcb_silkscreen_circle, pcb_silkscreen_line, pcb_silkscreen_oval, pcb_silkscreen_path, pcb_silkscreen_rect, pcb_silkscreen_text, pcb_smtpad, pcb_solder_paste, pcb_text, pcb_trace, pcb_trace_error, pcb_trace_hint, pcb_trace_route_point, pcb_trace_route_point_via, pcb_trace_route_point_wire, pcb_via, point, point3, port_arrangement, position, position3, resistance, rotation, route_hint_point, schematic_box, schematic_component, schematic_component_port_arrangement_by_sides, schematic_component_port_arrangement_by_size, schematic_debug_line, schematic_debug_object, schematic_debug_object_base, schematic_debug_point, schematic_debug_rect, schematic_error, schematic_line, schematic_net_label, schematic_path, schematic_pin_styles, schematic_port, schematic_text, schematic_trace, schematic_voltage_probe, size, source_component_base, source_group, source_led, source_net, source_port, source_simple_battery, source_simple_bug, source_simple_capacitor, source_simple_chip, source_simple_crystal, source_simple_diode, source_simple_ground, source_simple_inductor, source_simple_mosfet, source_simple_pin_header, source_simple_potentiometer, source_simple_power_source, source_simple_push_button, source_simple_resistor, source_simple_resonator, source_simple_transistor, source_trace, supplier_name, time, visible_layer, voltage };
+export { type AnyCircuitElement, type AnyCircuitElementInput, type AnySoupElement, type AnySoupElementInput, type AnySourceComponent, type CadComponent, type CadComponentInput, type CircuitJson, type Distance, type InputPoint, type InputPosition, type InputRotation, type LayerRef, type LayerRefInput, type Length, type PCBBoard, type PCBComponent, type PCBFabricationNotePath, type PCBFabricationNoteText, type PCBHole, type PCBHoleInput, type PCBKeepout, type PCBKeepoutInput, type PCBManualEditConflictError, type PCBMissingFootprintError, type PCBPlacementError, type PCBPlatedHole, type PCBPlatedHoleInput, type PCBPort, type PCBPortInput, type PCBPortNotMatchedError, type PCBSMTPad, type PCBSMTPadInput, type PCBSilkscreenLine, type PCBSilkscreenText, type PCBSolderPasteInput, type PCBText, type PCBTrace, type PCBTraceError, type PCBTraceHint, type PCBTraceInput, type PCBVia, type PcbBoard, type PcbBoardInput, type PcbCircuitElement, type PcbComponent, type PcbComponentInput, type PcbFabricationNotePath, type PcbFabricationNotePathInput, type PcbFabricationNoteText, type PcbFabricationNoteTextInput, type PcbGroup, type PcbGroupInput, type PcbHole, type PcbHoleCircleOrSquare, type PcbHoleCircleOrSquareInput, type PcbHoleCircularWithRectPad, type PcbHoleOval, type PcbHoleOvalInput, type PcbManualEditConflictError, type PcbManualEditConflictErrorInput, type PcbMissingFootprintError, type PcbMissingFootprintErrorInput, type PcbPlacementError, type PcbPlacementErrorInput, type PcbPlatedHole, type PcbPlatedHoleCircle, type PcbPlatedHoleInput, type PcbPlatedHoleOval, type PcbPort, type PcbPortInput, type PcbPortNotMatchedError, type PcbPortNotMatchedErrorInput, type PcbRouteHint, type PcbRouteHintInput, type PcbRouteHints, type PcbRouteHintsInput, type PcbSilkscreenCircle, type PcbSilkscreenCircleInput, type PcbSilkscreenLine, type PcbSilkscreenLineInput, type PcbSilkscreenOval, type PcbSilkscreenOvalDeprecated, type PcbSilkscreenOvalInput, type PcbSilkscreenPath, type PcbSilkscreenPathDeprecated, type PcbSilkscreenPathInput, type PcbSilkscreenRect, type PcbSilkscreenRectInput, type PcbSilkscreenRectOld, type PcbSilkscreenText, type PcbSilkscreenTextInput, type PcbSmtPad, type PcbSmtPadCircle, type PcbSmtPadPill, type PcbSmtPadRect, type PcbSmtPadRotatedRect, type PcbSolderPaste, type PcbSolderPasteCircle, type PcbSolderPasteRect, type PcbText, type PcbTextInput, type PcbTrace, type PcbTraceError, type PcbTraceErrorInput, type PcbTraceHint, type PcbTraceHintInput, type PcbTraceInput, type PcbTraceRoutePoint, type PcbTraceRoutePointVia, type PcbTraceRoutePointWire, type PcbVia, type PcbViaInput, type Point, type Point3, type Position, type Rotation, type RouteHintPoint, type RouteHintPointInput, type SchematicBox, type SchematicBoxInput, type SchematicComponent, type SchematicComponentInput, type SchematicDebugLine, type SchematicDebugObject, type SchematicDebugObjectInput, type SchematicDebugPoint, type SchematicDebugRect, type SchematicError, type SchematicErrorInput, type SchematicLine, type SchematicLineInput, type SchematicNetLabel, type SchematicNetLabelInput, type SchematicPath, type SchematicPathInput, type SchematicPort, type SchematicPortArrangement, type SchematicPortArrangementBySides, type SchematicPortArrangementBySize, type SchematicPortInput, type SchematicText, type SchematicTextInput, type SchematicTrace, type SchematicTraceEdge, type SchematicTraceInput, type SchematicVoltageProbe, type SchematicVoltageProbeInput, type Size, type SourceComponentBase, type SourceGroup, type SourceGroupInput, type SourceLed, type SourceLedInput, type SourceNet, type SourceNetInput, type SourcePort, type SourcePortInput, type SourceSimpleBattery, type SourceSimpleBatteryInput, type SourceSimpleBugInput, type SourceSimpleCapacitor, type SourceSimpleCapacitorInput, type SourceSimpleChip, type SourceSimpleChipInput, type SourceSimpleCrystal, type SourceSimpleCrystalInput, type SourceSimpleDiode, type SourceSimpleDiodeInput, type SourceSimpleGround, type SourceSimpleGroundInput, type SourceSimpleInductor, type SourceSimpleInductorInput, type SourceSimpleMosfet, type SourceSimpleMosfetInput, type SourceSimplePinHeader, type SourceSimplePinHeaderInput, type SourceSimplePotentiometer, type SourceSimplePotentiometerInput, type SourceSimplePowerSource, type SourceSimplePowerSourceInput, type SourceSimplePushButton, type SourceSimplePushButtonInput, type SourceSimpleResistor, type SourceSimpleResistorInput, type SourceSimpleResonator, type SourceSimpleResonatorInput, type SourceSimpleTransistor, type SourceSimpleTransistorInput, type SourceTrace, type SupplierName, type VisibleLayer, type VisibleLayerRef, all_layers, any_circuit_element, any_soup_element, any_source_component, battery_capacity, cad_component, capacitance, current, distance, frequency, getZodPrefixedIdWithDefault, inductance, layer_ref, layer_string, length, pcb_board, pcb_component, pcb_fabrication_note_path, pcb_fabrication_note_text, pcb_group, pcb_hole, pcb_hole_circle_or_square_shape, pcb_hole_oval_shape, pcb_keepout, pcb_manual_edit_conflict_error, pcb_missing_footprint_error, pcb_placement_error, pcb_plated_hole, pcb_port, pcb_port_not_matched_error, pcb_route_hint, pcb_route_hints, pcb_silkscreen_circle, pcb_silkscreen_line, pcb_silkscreen_oval, pcb_silkscreen_path, pcb_silkscreen_rect, pcb_silkscreen_text, pcb_smtpad, pcb_smtpad_pill, pcb_solder_paste, pcb_text, pcb_trace, pcb_trace_error, pcb_trace_hint, pcb_trace_route_point, pcb_trace_route_point_via, pcb_trace_route_point_wire, pcb_via, point, point3, port_arrangement, position, position3, resistance, rotation, route_hint_point, schematic_box, schematic_component, schematic_component_port_arrangement_by_sides, schematic_component_port_arrangement_by_size, schematic_debug_line, schematic_debug_object, schematic_debug_object_base, schematic_debug_point, schematic_debug_rect, schematic_error, schematic_line, schematic_net_label, schematic_path, schematic_pin_styles, schematic_port, schematic_text, schematic_trace, schematic_voltage_probe, size, source_component_base, source_group, source_led, source_net, source_port, source_simple_battery, source_simple_bug, source_simple_capacitor, source_simple_chip, source_simple_crystal, source_simple_diode, source_simple_ground, source_simple_inductor, source_simple_mosfet, source_simple_pin_header, source_simple_potentiometer, source_simple_power_source, source_simple_push_button, source_simple_resistor, source_simple_resonator, source_simple_transistor, source_trace, supplier_name, time, visible_layer, voltage };