fix(interface): resolve the DI container from the request context in system handlers

The provider health, metrics, config, list, and system status/metrics handlers
resolved the DI container through the global service locator, so a caller that
injected its own container (CLI router and MCP server both attach one to the
request args) was ignored. Read the injected container when present and fall
back to the global lookup otherwise, matching the machine handlers. Also make
three environment-dependent unit tests order-independent by clearing ambient
ORB_* vars and asserting the variables the shared test fixture actually sets.

Author: fgogolli

src/orb/interface/system_command_handlers.py

@@ -26,7 +26,7 @@ async def handle_provider_health(args) -> dict[str, Any]:
         GetProviderHealthOrchestrator,
     )
 
-    container = get_container()
+    container = getattr(args, "_container", None) or get_container()
     orchestrator = container.get(GetProviderHealthOrchestrator)
     result = await orchestrator.execute(
         GetProviderHealthInput(
@@ -43,7 +43,7 @@ async def handle_list_providers(args) -> dict[str, Any]:
     from orb.application.services.orchestration.dtos import ListProvidersInput
     from orb.application.services.orchestration.list_providers import ListProvidersOrchestrator
 
-    container = get_container()
+    container = getattr(args, "_container", None) or get_container()
     orchestrator = container.get(ListProvidersOrchestrator)
     result = await orchestrator.execute(
         ListProvidersInput(
@@ -68,7 +68,7 @@ async def handle_provider_config(args) -> dict[str, Any]:
         GetProviderConfigOrchestrator,
     )
 
-    container = get_container()
+    container = getattr(args, "_container", None) or get_container()
     orchestrator = container.get(GetProviderConfigOrchestrator)
     result = await orchestrator.execute(GetProviderConfigInput())
     return {"config": result.config, "message": result.message}
@@ -110,7 +110,7 @@ async def handle_provider_metrics(args) -> dict[str, Any]:
         GetProviderMetricsOrchestrator,
     )
 
-    container = get_container()
+    container = getattr(args, "_container", None) or get_container()
     orchestrator = container.get(GetProviderMetricsOrchestrator)
     result = await orchestrator.execute(
         GetProviderMetricsInput(
@@ -127,7 +127,7 @@ async def handle_reload_provider_config(args) -> InterfaceResponse:
     from orb.application.services.provider_registry_service import ProviderRegistryService
     from orb.interface.response_formatting_service import ResponseFormattingService
 
-    container = get_container()
+    container = getattr(args, "_container", None) or get_container()
     formatter = container.get(ResponseFormattingService)
     try:
         registry = container.get(ProviderRegistryService)
@@ -145,7 +145,7 @@ async def handle_system_status(args) -> InterfaceResponse:
     from orb.infrastructure.di.buses import QueryBus
     from orb.interface.response_formatting_service import ResponseFormattingService
 
-    container = get_container()
+    container = getattr(args, "_container", None) or get_container()
     query_bus = container.get(QueryBus)
     formatter = container.get(ResponseFormattingService)
 

tests/unit/monitoring/test_health_path_resolution.py

@@ -5,10 +5,17 @@
 from unittest.mock import patch
 
 
-def test_orb_root_dir_flows_through_to_health_check():
+def test_orb_root_dir_flows_through_to_health_check(monkeypatch):
     """ORB_ROOT_DIR env var should produce root/work/health as health location."""
     from orb.config.platform_dirs import get_health_location
 
+    # Remove any ambient ORB_WORK_DIR / ORB_HEALTH_DIR that a previous test
+    # (e.g. one that drives CLI main() through its full setup_environment() path)
+    # may have left via os.environ.setdefault.  Without this guard the
+    # per-dir overrides would short-circuit the ORB_ROOT_DIR derivation path.
+    monkeypatch.delenv("ORB_WORK_DIR", raising=False)
+    monkeypatch.delenv("ORB_HEALTH_DIR", raising=False)
+
     with patch.dict(os.environ, {"ORB_ROOT_DIR": "/myroot"}, clear=False):
         result = get_health_location()
     assert result == Path("/myroot/work/health")

tests/unit/test_platform_dirs.py

@@ -460,8 +460,15 @@ def test_scripts_dir_env_override(self, monkeypatch):
 class TestEnvironmentOverrides:
     """Test environment variable overrides."""
 
-    def test_all_env_vars_set(self):
+    def test_all_env_vars_set(self, monkeypatch):
         """Test all ORB_* environment variables set."""
+        # Remove any ambient ORB_* vars that a previous test (e.g. one that
+        # drives CLI main() through its full init path) may have left in the
+        # environment via os.environ.setdefault, then overlay only what this
+        # test needs so the assertions are order-independent.
+        monkeypatch.delenv("ORB_ROOT_DIR", raising=False)
+        monkeypatch.delenv("ORB_SCRIPTS_DIR", raising=False)
+
         env_vars = {
             "ORB_CONFIG_DIR": "/env/config",
             "ORB_WORK_DIR": "/env/work",

tests/unit/test_setup.py

@@ -9,13 +9,18 @@
 
 @pytest.mark.unit
 def test_environment_setup():
-    """Test that test environment is properly set up."""
-    # Check environment variables - TESTING is set by pytest automatically
+    """Test that test environment is properly set up.
+
+    Asserts what the root conftest ``setup_test_environment`` fixture actually
+    sets.  Cloud-provider credentials (AWS_DEFAULT_REGION, AWS_ACCESS_KEY_ID,
+    etc.) are deliberately NOT set by the root conftest so that live suites
+    inherit the operator's real environment untouched.
+    """
+    # PYTEST_CURRENT_TEST is set by pytest for the duration of each test
     assert os.environ.get("PYTEST_CURRENT_TEST") is not None
-    assert os.environ.get("AWS_DEFAULT_REGION") == "us-east-1"
-    assert os.environ.get("AWS_ACCESS_KEY_ID") == "testing"
-    # ENVIRONMENT variable is set by conftest.py during test runs
-    assert os.environ.get("AWS_DEFAULT_REGION") is not None
+    # These vars are explicitly set by setup_test_environment in conftest.py
+    assert os.environ.get("TESTING") == "true"
+    assert os.environ.get("LOG_LEVEL") == "DEBUG"
 
 
 @pytest.mark.unit