fix(chip): clear ruff lint+format and shellcheck on chip scripts

Shaw · claude · Shaw · commit 4ea48479156f · 2026-05-20T08:17:34.000-07:00
Resolves the e1-chip docker-regression failures:
- Remove unused locals (y_front, routing, plugin_java)
- Sort imports in test_linux_memory_platform_contract.py
- Merge nested with-statements (SIM117)
- Apply ruff format across 9 chip scripts
- Disable SC2317 on cleanup() in run_pretraining.sh (invoked via trap)

Co-Authored-By: Claude Opus 4.7 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/packages/chip/scripts/alphachip/run_pretraining.sh b/packages/chip/scripts/alphachip/run_pretraining.sh
@@ -131,7 +131,7 @@ TRAIN_LOG="${ROOT_DIR}/train.log"
 : >"${COLLECT_LOG}"
 : >"${TRAIN_LOG}"
 
-# shellcheck disable=SC2329
+# shellcheck disable=SC2317,SC2329
 cleanup() {
     if [ -n "${REVERB_PID:-}" ]; then kill "${REVERB_PID}" 2>/dev/null || true; fi
     if [ -n "${COLLECT_PID:-}" ]; then kill "${COLLECT_PID}" 2>/dev/null || true; fi
diff --git a/packages/chip/scripts/check_android_app_runtime_contract.py b/packages/chip/scripts/check_android_app_runtime_contract.py
@@ -237,17 +237,17 @@ def add_if(
 def run_check(args: argparse.Namespace) -> dict[str, object]:
     findings: list[Finding] = []
     required_paths = (
-            APP_GRADLE,
-            APP_MANIFEST,
-            AGENT_SERVICE_JAVA,
-            APP_JAVA_DIR,
-            NATIVE_BRIDGE_JAVA,
-            PREBUILT_APK if args.apk is None else Path(args.apk),
-            *VENDOR_PERMISSION_XMLS,
-            VENDOR_OVERLAY,
-            VENDOR_COMMON_MK,
-            *CHIP_AOSP_SCRIPTS,
-        )
+        APP_GRADLE,
+        APP_MANIFEST,
+        AGENT_SERVICE_JAVA,
+        APP_JAVA_DIR,
+        NATIVE_BRIDGE_JAVA,
+        PREBUILT_APK if args.apk is None else Path(args.apk),
+        *VENDOR_PERMISSION_XMLS,
+        VENDOR_OVERLAY,
+        VENDOR_COMMON_MK,
+        *CHIP_AOSP_SCRIPTS,
+    )
     missing = [
         path
         for path in required_paths
@@ -369,9 +369,7 @@ def run_check(args: argparse.Namespace) -> dict[str, object]:
     scripts_use_legacy_self_status = "/api/agent/self-status" in script_endpoint_union
     add_if(
         findings,
-        app_health_ok
-        and scripts_use_legacy_self_status
-        and not scripts_use_app_health,
+        app_health_ok and scripts_use_legacy_self_status and not scripts_use_app_health,
         "android_agent_health_contract_mismatch",
         "chip smoke scripts check /api/agent/self-status while the Android service watchdog uses /api/health",
         json.dumps(
diff --git a/packages/chip/scripts/check_e1_phone_board_package.py b/packages/chip/scripts/check_e1_phone_board_package.py
@@ -1930,8 +1930,13 @@ def check_routed_release_plan() -> None:
         raise SystemExit(f"unexpected routed release plan status: {plan['status']}")
     if plan["release_target"] != "EVT1-routed-first-article":
         raise SystemExit(f"unexpected routed release target: {plan['release_target']}")
-    if "board/kicad/e1-phone/routed-release-plan.yaml" not in manifest["current_artifacts"]["planning"]:
-        raise SystemExit("artifact manifest must list routed-release-plan.yaml as planning evidence")
+    if (
+        "board/kicad/e1-phone/routed-release-plan.yaml"
+        not in manifest["current_artifacts"]["planning"]
+    ):
+        raise SystemExit(
+            "artifact manifest must list routed-release-plan.yaml as planning evidence"
+        )
     for rel in [
         "board/kicad/e1-phone/manufacturing-closure.yaml",
         "board/kicad/e1-phone/production-readiness.yaml",
@@ -2023,15 +2028,22 @@ def check_routed_release_plan() -> None:
     for domain, item in requirements.items():
         if not item.get("required_nets") or not item.get("required_evidence"):
             raise SystemExit(f"routed release domain is too weak: {domain}")
-    if requirements["manufacturing"]["required_nets"] != production["factory_test_coverage_required"]["power_rails"]:
-        raise SystemExit("routed release manufacturing nets diverge from factory power rail coverage")
+    if (
+        requirements["manufacturing"]["required_nets"]
+        != production["factory_test_coverage_required"]["power_rails"]
+    ):
+        raise SystemExit(
+            "routed release manufacturing nets diverge from factory power rail coverage"
+        )
     for net in routing["power_integrity"]["test_points_required"]:
         if net not in plan["power_thermal_release_dependency"]["required_test_points"]:
             raise SystemExit(f"routed release power dependency missing test point {net}")
     if plan["rf_release_dependency"]["required_rf_nets"] != rf["required_rf_nets"]:
         raise SystemExit("routed release RF dependency diverges from RF closure")
     for required in ["VNA", "SAR", "carrier"]:
-        if not any(required in item for item in plan["rf_release_dependency"]["requires_measurements"]):
+        if not any(
+            required in item for item in plan["rf_release_dependency"]["requires_measurements"]
+        ):
             raise SystemExit(f"routed release RF dependency missing measurement {required}")
 
     for flag in ["ready_to_fabricate", "ready_for_enclosure", "ready_for_factory_test"]:
diff --git a/packages/chip/scripts/check_manufacturing_artifacts.py b/packages/chip/scripts/check_manufacturing_artifacts.py
@@ -430,7 +430,9 @@ def validate_e1_phone_manifest(path: Path, release: bool) -> list[str]:
         target = {}
     for key, expected in expected_target.items():
         if target.get(key) != expected:
-            failures.append(f"{rel_manifest}: design_target.{key} expected {expected}, got {target.get(key)}")
+            failures.append(
+                f"{rel_manifest}: design_target.{key} expected {expected}, got {target.get(key)}"
+            )
     radios = target.get("radios", [])
     for radio in ["5g_redcap_cellular", "wifi_6e", "bluetooth_5_3"]:
         if radio not in radios:
@@ -449,7 +451,9 @@ def validate_e1_phone_manifest(path: Path, release: bool) -> list[str]:
     }
     missing_groups = sorted(required_groups - set(groups))
     if missing_groups:
-        failures.append(f"{rel_manifest}: missing current_artifacts groups: {', '.join(missing_groups)}")
+        failures.append(
+            f"{rel_manifest}: missing current_artifacts groups: {', '.join(missing_groups)}"
+        )
     required_paths = {
         "board/kicad/e1-phone/routed-release-plan.yaml",
         "board/kicad/e1-phone/manufacturing-closure.yaml",
@@ -478,7 +482,14 @@ def validate_e1_phone_manifest(path: Path, release: bool) -> list[str]:
     if not isinstance(gates, dict):
         failures.append(f"{rel_manifest}: release_gates must be a mapping")
         gates = {}
-    required_gates = {"schematic", "routed_pcb", "enclosure", "power_thermal", "rf_si", "manufacturing"}
+    required_gates = {
+        "schematic",
+        "routed_pcb",
+        "enclosure",
+        "power_thermal",
+        "rf_si",
+        "manufacturing",
+    }
     missing_gates = sorted(required_gates - set(gates))
     if missing_gates:
         failures.append(f"{rel_manifest}: missing release gates: {', '.join(missing_gates)}")
@@ -494,25 +505,38 @@ def validate_e1_phone_manifest(path: Path, release: bool) -> list[str]:
         if not as_list(evidence):
             failures.append(f"{rel_manifest}.release_gates.{gate_name}: missing required_evidence")
         if release:
-            failures.append(f"{rel_manifest}.release_gates.{gate_name}: release gate remains missing")
+            failures.append(
+                f"{rel_manifest}.release_gates.{gate_name}: release gate remains missing"
+            )
 
     routed_plan_path = repo_path("board/kicad/e1-phone/routed-release-plan.yaml")
     if routed_plan_path.is_file():
         routed_plan = yaml.safe_load(routed_plan_path.read_text())
-        if routed_plan.get("status") != "blocked_routed_release_requires_real_route_and_supplier_outputs":
+        if (
+            routed_plan.get("status")
+            != "blocked_routed_release_requires_real_route_and_supplier_outputs"
+        ):
             failures.append(f"{rel_manifest}: routed release plan status is not fail-closed")
         outputs = routed_plan.get("required_release_output_manifest", {})
         if not isinstance(outputs, dict) or len(outputs) < 20:
-            failures.append(f"{rel_manifest}: routed release plan must track at least 20 release outputs")
+            failures.append(
+                f"{rel_manifest}: routed release plan must track at least 20 release outputs"
+            )
         else:
             for output_name, output in outputs.items():
                 if not isinstance(output, dict):
-                    failures.append(f"{rel_manifest}: routed output {output_name} must be a mapping")
+                    failures.append(
+                        f"{rel_manifest}: routed output {output_name} must be a mapping"
+                    )
                     continue
                 if output.get("present") is not False or output.get("release_required") is not True:
-                    failures.append(f"{rel_manifest}: routed output {output_name} must be blocked and required")
+                    failures.append(
+                        f"{rel_manifest}: routed output {output_name} must be blocked and required"
+                    )
                 if release:
-                    failures.append(f"{rel_manifest}: release output remains missing: {output_name}")
+                    failures.append(
+                        f"{rel_manifest}: release output remains missing: {output_name}"
+                    )
     else:
         failures.append(f"{rel_manifest}: routed release plan is missing")
 
diff --git a/packages/chip/scripts/generate_e1_phone_cad.py b/packages/chip/scripts/generate_e1_phone_cad.py
@@ -340,7 +340,7 @@ def usb_c_seal_specs(params: dict[str, Any]) -> list[dict[str, Any]]:
     height = float(params["device"]["envelope_mm"][1])
     aperture_w = 10.2
     aperture_z = 3.6
-    y_front = -height / 2 - 0.08
+    -height / 2 - 0.08
     y_inside = -height / 2 + 0.32
     z_center = -1.45
     return [
@@ -4574,10 +4574,8 @@ def write_camera_validation_artifacts(
             "pass": bool(
                 interface_cases.get("camera_glass_and_under_glass_strategy", {}).get("pass")
             )
-            and sum(1 for name in part_names if name.startswith("rear_camera_cover_adhesive_"))
-            >= 4
-            and sum(1 for name in part_names if name.startswith("rear_camera_light_baffle_"))
-            >= 2
+            and sum(1 for name in part_names if name.startswith("rear_camera_cover_adhesive_")) >= 4
+            and sum(1 for name in part_names if name.startswith("rear_camera_light_baffle_")) >= 2
             and "front_camera_black_mask_window" in part_names,
         },
     ]
diff --git a/packages/chip/scripts/generate_e1_phone_routed_release_plan.py b/packages/chip/scripts/generate_e1_phone_routed_release_plan.py
@@ -55,7 +55,7 @@ def main() -> int:
     manufacturing = load_yaml(MANUFACTURING)
     production = load_yaml(PRODUCTION)
     manifest = load_yaml(MANIFEST)
-    routing = load_yaml(ROUTING)
+    load_yaml(ROUTING)
     pinout = load_yaml(PINOUT)
     procurement = load_yaml(PROCUREMENT)
     enclosure = load_yaml(ENCLOSURE)
@@ -197,7 +197,13 @@ def main() -> int:
             ],
         },
         "display_touch": {
-            "required_nets": ["DSI_CLK_P", "DSI_D0_P", "DISP_AVDD_5V5", "DISP_AVEE_N5V5", "TOUCH_I2C_SCL"],
+            "required_nets": [
+                "DSI_CLK_P",
+                "DSI_D0_P",
+                "DISP_AVDD_5V5",
+                "DISP_AVEE_N5V5",
+                "TOUCH_I2C_SCL",
+            ],
             "required_evidence": [
                 "selected display/touch FPC pinout converted into real KiCad connector symbol and footprint",
                 "MIPI D-PHY post-route length/impedance review",
@@ -213,7 +219,13 @@ def main() -> int:
             ],
         },
         "radios": {
-            "required_nets": ["CELL_RF_MAIN", "CELL_RF_DIV", "CELL_GNSS_RF", "WIFI_BT_RF0", "WIFI_BT_RF1"],
+            "required_nets": [
+                "CELL_RF_MAIN",
+                "CELL_RF_DIV",
+                "CELL_GNSS_RF",
+                "WIFI_BT_RF0",
+                "WIFI_BT_RF1",
+            ],
             "required_evidence": [
                 "cellular and Wi-Fi/Bluetooth module reference layout adherence",
                 "50 ohm feed, matching, conducted access, and antenna keepout closure",
@@ -235,7 +247,15 @@ def main() -> int:
             ],
         },
         "split_interconnect": {
-            "required_nets": ["USB_DP", "USB_DN", "VBUS", "SYS", "I2S_BCLK", "PDM_CLK", "HAPTIC_OUT"],
+            "required_nets": [
+                "USB_DP",
+                "USB_DN",
+                "VBUS",
+                "SYS",
+                "I2S_BCLK",
+                "PDM_CLK",
+                "HAPTIC_OUT",
+            ],
             "required_evidence": [
                 "top and bottom connector supplier land patterns and mating-height stack",
                 "flex cable pinout, stiffener, bend, strain relief, and continuity test",
@@ -249,7 +269,14 @@ def main() -> int:
             ],
         },
         "compute_storage": {
-            "required_nets": ["LPDDR_CK_P", "LPDDR_DQS_P", "UFS_REFCLK_P", "UFS_TX_P", "UFS_RX_P", "JTAG_TCK"],
+            "required_nets": [
+                "LPDDR_CK_P",
+                "LPDDR_DQS_P",
+                "UFS_REFCLK_P",
+                "UFS_TX_P",
+                "UFS_RX_P",
+                "JTAG_TCK",
+            ],
             "required_evidence": [
                 "SoC, LPDDR, UFS, boot strap, and debug exact footprints",
                 "post-route memory/storage SI and boot-mode bring-up coverage",
diff --git a/packages/chip/scripts/test_android_app_runtime_contract.py b/packages/chip/scripts/test_android_app_runtime_contract.py
@@ -48,15 +48,17 @@ def _patch_paths(self, tmp: Path, apk_entries: list[str]):
 """,
         )
         service_java = write(
-            tmp / "app-core/platforms/android/app/src/main/java/ai/elizaos/app/ElizaAgentService.java",
+            tmp
+            / "app-core/platforms/android/app/src/main/java/ai/elizaos/app/ElizaAgentService.java",
             'class ElizaAgentService { static final String HEALTH_URL = "http://127.0.0.1:31337/api/health"; }\n',
         )
-        plugin_java = write(
+        write(
             tmp / "app-core/platforms/android/app/src/main/java/ai/elizaos/app/AgentPlugin.java",
             'class AgentPlugin { String path = "/api/health"; }\n',
         )
         native_bridge_java = write(
-            tmp / "app-core/platforms/android/app/src/main/java/ai/elizaos/app/ElizaNativeBridge.java",
+            tmp
+            / "app-core/platforms/android/app/src/main/java/ai/elizaos/app/ElizaNativeBridge.java",
             "class ElizaNativeBridge { String getLocalAgentToken() { return null; } }\n",
         )
         apk = make_apk(tmp / "os/android/vendor/eliza/apps/Eliza/Eliza.apk", apk_entries)
diff --git a/packages/chip/scripts/test_generate_e1_phone_cad.py b/packages/chip/scripts/test_generate_e1_phone_cad.py
@@ -421,7 +421,9 @@ def test_evt0_phone_interface_validation_tracks_named_mechanical_interfaces(
     interfaces = {item["interface"] for item in report["interfaces"]}
 
     assert report["status"] == "cad_interface_validation_pass"
-    usb_case = next(item for item in report["interfaces"] if item["id"] == "usb_c_insertion_capture")
+    usb_case = next(
+        item for item in report["interfaces"] if item["id"] == "usb_c_insertion_capture"
+    )
     assert usb_case["pass"]
     assert "usb_c_port_seal_stack" in usb_case["evidence"]
     assert {
diff --git a/packages/chip/scripts/test_linux_memory_platform_contract.py b/packages/chip/scripts/test_linux_memory_platform_contract.py
diff --git a/packages/chip/verify/cocotb/integration/test_opensbi_mpxy_to_pmc_rpmi.py b/packages/chip/verify/cocotb/integration/test_opensbi_mpxy_to_pmc_rpmi.py

Original file line number	Diff line number	Diff line change
`@@ -48,15 +48,17 @@ def _patch_paths(self, tmp: Path, apk_entries: list[str]):`
`48`	`48`	`""",`
`49`	`49`	`)`
`50`	`50`	`service_java = write(`
`51`		`- tmp / "app-core/platforms/android/app/src/main/java/ai/elizaos/app/ElizaAgentService.java",`
	`51`	`+ tmp`
	`52`	`+ / "app-core/platforms/android/app/src/main/java/ai/elizaos/app/ElizaAgentService.java",`
`52`	`53`	`'class ElizaAgentService { static final String HEALTH_URL = "http://127.0.0.1:31337/api/health"; }\n',`
`53`	`54`	`)`
`54`		`- plugin_java = write(`
	`55`	`+ write(`
`55`	`56`	`tmp / "app-core/platforms/android/app/src/main/java/ai/elizaos/app/AgentPlugin.java",`
`56`	`57`	`'class AgentPlugin { String path = "/api/health"; }\n',`
`57`	`58`	`)`
`58`	`59`	`native_bridge_java = write(`
`59`		`- tmp / "app-core/platforms/android/app/src/main/java/ai/elizaos/app/ElizaNativeBridge.java",`
	`60`	`+ tmp`
	`61`	`+ / "app-core/platforms/android/app/src/main/java/ai/elizaos/app/ElizaNativeBridge.java",`
`60`	`62`	`"class ElizaNativeBridge { String getLocalAgentToken() { return null; } }\n",`
`61`	`63`	`)`
`62`	`64`	`apk = make_apk(tmp / "os/android/vendor/eliza/apps/Eliza/Eliza.apk", apk_entries)`