Address Copilot review: SMC cleanup, CF leak, fan_name, IOReport power metrics

- Add atexit hook to close SMC connection on exit
- CFRelease per-group channels after IOReportMergeChannels
- Honor fan_name parameter in Cpu.fan_percent()
- Fix except Exception → except BaseException for sys.exit fallback
- Wire IOReport power data (CPU/GPU/Total watts) as custom sensors
- Add power metrics to PurpleTheme-AppleSilicon

Author: tamingchaos

library/sensors/sensors_apple_silicon.py

@@ -114,6 +114,14 @@ def _open(self):
             return
         self._conn = conn.value
         self._available = True
+        import atexit
+        atexit.register(self.close)
+
+    def close(self):
+        if self._conn is not None and self._available:
+            self._iokit.IOServiceClose(self._conn)
+            self._conn = None
+            self._available = False
 
     def _fcc(self, s):
         return int.from_bytes(s.encode('ascii'), byteorder='big')
@@ -312,6 +320,7 @@ def _subscribe(self):
                     merged = ch
                 else:
                     self._iorep.IOReportMergeChannels(merged, ch, None)
+                    self._cf.CFRelease(ch)
 
         if not merged:
             logger.warning("IOReport: no channels found")
@@ -588,11 +597,17 @@ def temperature() -> float:
     @staticmethod
     def fan_percent(fan_name: str = None) -> float:
         smc = _get_smc()
-        actual = smc.read_float('F0Ac')
+        fan_idx = 0
+        if fan_name and fan_name != "AUTO":
+            try:
+                fan_idx = int(fan_name.replace('F', '').replace('Ac', ''))
+            except (ValueError, AttributeError):
+                logger.debug(f"Apple Silicon: ignoring manual CPU_FAN '{fan_name}', using fan 0")
+        actual = smc.read_float(f'F{fan_idx}Ac')
         if math.isnan(actual):
             return math.nan
-        mn = smc.read_float('F0Mn')
-        mx = smc.read_float('F0Mx')
+        mn = smc.read_float(f'F{fan_idx}Mn')
+        mx = smc.read_float(f'F{fan_idx}Mx')
         if math.isnan(mn) or math.isnan(mx) or mx <= mn:
             return math.nan
         if actual <= 0:

library/sensors/sensors_custom.py

@@ -99,3 +99,51 @@ def as_string(self) -> str:
     def last_values(self) -> List[float]:
         # If a custom data class only has text values, it won't be possible to display line graph
         pass
+
+
+# Apple Silicon IOReport power metrics (only functional when APPLE_SILICON sensors are active)
+class _IOReportPowerBase(CustomDataSource):
+    _key = ''
+    _history = None
+
+    def _get_power(self) -> float:
+        try:
+            from library.sensors.sensors_apple_silicon import _get_ioreport
+            data = _get_ioreport().get_data()
+            return data.get(self._key, math.nan)
+        except Exception:
+            return math.nan
+
+    def as_numeric(self) -> float:
+        val = self._get_power()
+        if self._history is None:
+            self._history = [math.nan] * 30
+        self._history.append(val if not math.isnan(val) else 0)
+        self._history.pop(0)
+        return val
+
+    def as_string(self) -> str:
+        val = self.as_numeric()
+        if math.isnan(val):
+            return "--W"
+        return f'{val:.1f}W'
+
+    def last_values(self) -> List[float]:
+        if self._history is None:
+            return [math.nan] * 30
+        return list(self._history)
+
+
+class AppleSiliconCPUPower(_IOReportPowerBase):
+    _key = 'cpu_power'
+    _history = [math.nan] * 30
+
+
+class AppleSiliconGPUPower(_IOReportPowerBase):
+    _key = 'gpu_power'
+    _history = [math.nan] * 30
+
+
+class AppleSiliconTotalPower(_IOReportPowerBase):
+    _key = 'total_power'
+    _history = [math.nan] * 30

library/stats.py

@@ -75,7 +75,7 @@
         logger.error("Apple Silicon sensor support is only available on Apple Silicon Macs")
         try:
             sys.exit(1)
-        except Exception:
+        except BaseException:
             os._exit(1)
 elif HW_SENSORS == "AUTO":
     if platform.system() == 'Windows':

res/themes/PurpleTheme-AppleSilicon/theme.yaml

@@ -182,6 +182,38 @@ STATS:
         FONT_SIZE: 20
         FONT_COLOR: 200, 255, 200
         BACKGROUND_IMAGE: background.png
+  CUSTOM:
+    INTERVAL: 2
+    AppleSiliconCPUPower:
+      TEXT:
+        SHOW: True
+        X: 405
+        Y: 240
+        FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
+        FONT_SIZE: 18
+        FONT_COLOR: 249, 200, 100
+        BACKGROUND_IMAGE: background.png
+        WIDTH: 80
+    AppleSiliconGPUPower:
+      TEXT:
+        SHOW: True
+        X: 535
+        Y: 240
+        FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
+        FONT_SIZE: 18
+        FONT_COLOR: 203, 118, 255
+        BACKGROUND_IMAGE: background.png
+        WIDTH: 80
+    AppleSiliconTotalPower:
+      TEXT:
+        SHOW: True
+        X: 665
+        Y: 240
+        FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
+        FONT_SIZE: 18
+        FONT_COLOR: 255, 180, 100
+        BACKGROUND_IMAGE: background.png
+        WIDTH: 80
   NET:
     INTERVAL: 1
     WLO: