From 81c3e6b615bfae53d229ffac35ad1be6f4471375 Mon Sep 17 00:00:00 2001
From: Mark Gascoyne <contact@markgascoyne.co.uk>
Date: Mon, 12 Oct 2026 18:58:53 +0100
Subject: [PATCH] fix: exclude live controller objects from debug exports

---
 apps/predbat/tests/test_control_handoff.py | 39 ++++++++++++++++++++++
 apps/predbat/utils.py                      |  2 ++
 2 files changed, 41 insertions(+)

diff --git a/apps/predbat/tests/test_control_handoff.py b/apps/predbat/tests/test_control_handoff.py
index a3227243a..d2b6e806d 100644
--- a/apps/predbat/tests/test_control_handoff.py
+++ b/apps/predbat/tests/test_control_handoff.py
@@ -764,6 +764,45 @@ def test_opt_out_and_invalid_opt_in_are_strict(self):
             self.assertTrue(self.base.control_write_gate.snapshot()["closed"])
 
 
+class TestControlDebugExport(unittest.TestCase):
+    """Live controller objects must never enter shared debug/state serialization."""
+
+    def test_actual_debug_export_excludes_live_control_objects(self):
+        """Keep debug downloads usable without traversing locks or credentials."""
+        from datetime import datetime, timezone
+        from tempfile import TemporaryDirectory
+
+        import yaml
+        from userinterface import UserInterface
+        from utils import is_debug_excluded_key
+
+        with TemporaryDirectory() as root:
+            base = SimpleNamespace(
+                now_utc=datetime.now(timezone.utc),
+                config_root=root,
+                config_root_p=root,
+                inverters=[],
+                CONFIG_ITEMS=[],
+                components=None,
+                args={},
+                minutes_now=42,
+                log=lambda *_args: None,
+            )
+            gate = make_gate()
+            service = ControlHandoffService(base, "synthetic-instance", "synthetic-boot", "https://example.invalid", "synthetic-private-service-credential")
+            service.gate = gate
+            base.control_write_gate = gate
+            base.control_handoff_service = service
+            text = UserInterface.create_debug_yaml(base, write_file=False)
+            debug = yaml.safe_load(text)
+            self.assertEqual(debug["minutes_now"], 42)
+            for name in ("control_write_gate", "control_handoff_service"):
+                self.assertTrue(is_debug_excluded_key(name))
+                self.assertNotIn(name, debug)
+            self.assertNotIn("synthetic-private-service-credential", text)
+            self.assertNotIn("python/object", text)
+
+
 def run_control_handoff_tests(_predbat=None):
     """Run through Predbat's normal unit-test registry as well as unittest."""
     suite = unittest.defaultTestLoader.loadTestsFromModule(__import__(__name__, fromlist=["_"]))
diff --git a/apps/predbat/utils.py b/apps/predbat/utils.py
index 35033d4f8..6905b453d 100644
--- a/apps/predbat/utils.py
+++ b/apps/predbat/utils.py
@@ -236,6 +236,8 @@ def copy(self):
     "ha_interface",
     "components",
     "coordinator",
+    "control_write_gate",
+    "control_handoff_service",
     "prediction",
     "logfile",
     "predheat",