fix(review-feedback-1741): limit raw parsing to CUSTOM WEBHOOK BODY TEMPLATE or re-apply the

Author: ZhuLinsen

src/core/config_manager.py

@@ -130,7 +130,17 @@ def _read_config_map(self, *, normalize_values: bool) -> Dict[str, str]:
         if not self._env_path.exists():
             return {}
 
-        values = dotenv_values(self._env_path, interpolate=False)
+        raw_values = dotenv_values(self._env_path, interpolate=False)
+        if normalize_values:
+            values = dotenv_values(self._env_path)
+            for raw_key, raw_value in raw_values.items():
+                if (
+                    raw_key is not None
+                    and str(raw_key).upper() in _COMPOSE_ESCAPED_ENV_VALUE_KEYS
+                ):
+                    values[raw_key] = raw_value
+        else:
+            values = raw_values
         config_map: Dict[str, str] = {}
         for key, value in values.items():
             if key is None:
@@ -191,7 +201,10 @@ def apply_updates(
                     key_upper,
                     value.replace("\n", ""),
                 )
-                if current_value == value and stored_value == canonical_stored_value:
+                if current_value == value and (
+                    key_upper not in _COMPOSE_ESCAPED_ENV_VALUE_KEYS
+                    or stored_value == canonical_stored_value
+                ):
                     continue
 
                 mutable_updates[key_upper] = value

tests/test_config_manager.py

@@ -178,6 +178,39 @@ def test_custom_webhook_template_plain_json_is_not_changed(self) -> None:
             f"CUSTOM_WEBHOOK_BODY_TEMPLATE={template}\n",
         )
 
+    def test_non_template_settings_keep_dotenv_interpolation_semantics(self) -> None:
+        self.env_path.write_text(
+            "\n".join(
+                [
+                    "API_PORT=8000",
+                    "WEBUI_PORT=${API_PORT}",
+                    'CUSTOM_WEBHOOK_BODY_TEMPLATE={"content":$${content_json}}',
+                ]
+            )
+            + "\n",
+            encoding="utf-8",
+        )
+
+        config_map = self.manager.read_config_map()
+
+        self.assertEqual(config_map["API_PORT"], "8000")
+        self.assertEqual(config_map["WEBUI_PORT"], "8000")
+        self.assertEqual(
+            config_map["CUSTOM_WEBHOOK_BODY_TEMPLATE"],
+            '{"content":${content_json}}',
+        )
+
+        self.manager.apply_updates(
+            updates=[("WEBUI_PORT", config_map["WEBUI_PORT"])],
+            sensitive_keys=set(),
+            mask_token="******",
+        )
+
+        self.assertIn(
+            "WEBUI_PORT=${API_PORT}\n",
+            self.env_path.read_text(encoding="utf-8"),
+        )
+
 
 if __name__ == "__main__":
     unittest.main()