fix(test): create fresh server in code mode E2E fixture

The session-scoped mcp_server fixture is created before the module-scoped
code_mode_enabled fixture can set ENABLE_CODE_MODE. Fix by creating a
fresh HomeAssistantSmartMCPServer instance in the test fixture after the
env var is set, and resetting the settings singleton so the new server
reads the updated config.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: kingpanther13

tests/src/e2e/tools/test_create_custom_tool.py

@@ -30,21 +30,35 @@
 @pytest.fixture(scope="module")
 def code_mode_enabled(ha_container_with_fresh_config):
     """Enable code mode feature flag for the test module."""
+    old_val = os.environ.get(FEATURE_FLAG, "")
     os.environ[FEATURE_FLAG] = "true"
+    # Reset cached settings so the new server reads the fresh env var
+    import ha_mcp.config
+    ha_mcp.config._settings = None
     logger.info("Code mode feature flag enabled")
     yield
-    os.environ.pop(FEATURE_FLAG, None)
+    os.environ["ENABLE_CODE_MODE"] = old_val
+    ha_mcp.config._settings = None
 
 
 @pytest.fixture
-async def mcp_client_with_code_mode(code_mode_enabled, mcp_server):
-    """Create MCP client with code mode enabled."""
+async def mcp_client_with_code_mode(code_mode_enabled, ha_container_with_fresh_config):
+    """Create MCP client with a fresh server that has code mode enabled."""
     from fastmcp import Client
 
-    client = Client(mcp_server.mcp)
-    async with client:
-        logger.debug("FastMCP client with code mode connected")
-        yield client
+    from ha_mcp.client.rest_client import HomeAssistantClient
+    from ha_mcp.server import HomeAssistantSmartMCPServer
+    from tests.test_constants import TEST_TOKEN
+
+    container_info = ha_container_with_fresh_config
+    base_url = container_info["base_url"]
+    client = HomeAssistantClient(base_url=base_url, token=TEST_TOKEN)
+    server = HomeAssistantSmartMCPServer(client=client)
+
+    mcp_client = Client(server.mcp)
+    async with mcp_client:
+        logger.debug("FastMCP client with code mode connected (fresh server)")
+        yield mcp_client
 
 
 async def _check_tool_available(mcp_client) -> tuple[bool, str | None]: