Normalize the vlaue of the stored runtime

Author: nezhar

src/vibepod/core/config.py

@@ -147,10 +147,14 @@ def deep_merge(base: dict[str, Any], override: dict[str, Any]) -> dict[str, Any]
     return merged
 
 
+def _parse_container_runtime(value: str) -> str:
+    return value.strip().lower()
+
+
 def _apply_env(config: dict[str, Any]) -> dict[str, Any]:
     mappings: dict[str, tuple[str, Any]] = {
         "VP_DEFAULT_AGENT": ("default_agent", str),
-        "VP_CONTAINER_RUNTIME": ("container_runtime", str),
+        "VP_CONTAINER_RUNTIME": ("container_runtime", _parse_container_runtime),
         "VP_CONTAINER_USERNS_MODE": ("container_userns_mode", lambda x: x.strip() or None),
         "VP_AUTO_PULL": ("auto_pull", lambda x: x.lower() == "true"),
         "VP_LOG_LEVEL": ("log_level", str),

src/vibepod/core/runtime.py

@@ -185,7 +185,7 @@ def resolve_runtime(
     available = detect_available_runtimes()
 
     if explicit is not None:
-        explicit = explicit.lower()
+        explicit = explicit.strip().lower()
         if explicit not in SUPPORTED_RUNTIMES:
             raise RuntimeError(
                 f"Unknown container runtime '{explicit}'. "

tests/test_config.py

@@ -139,6 +139,15 @@ def test_container_userns_mode_env_override(monkeypatch, tmp_path: Path) -> None
     assert config["container_userns_mode"] == "keep-id"
 
 
+def test_container_runtime_env_override_is_normalized(
+    monkeypatch, tmp_path: Path
+) -> None:
+    monkeypatch.setenv("VP_CONFIG_DIR", str(tmp_path))
+    monkeypatch.setenv("VP_CONTAINER_RUNTIME", " PodMan ")
+    config = get_config()
+    assert config["container_runtime"] == "podman"
+
+
 def test_per_agent_auto_pull_override(monkeypatch, tmp_path: Path) -> None:
     monkeypatch.setenv("VP_CONFIG_DIR", str(tmp_path))
     global_config = tmp_path / "config.yaml"

tests/test_runtime.py

@@ -107,6 +107,21 @@ def test_resolve_runtime_rejects_unavailable_prompt_choice(monkeypatch) -> None:
         runtime.resolve_runtime()
 
 
+def test_resolve_runtime_normalizes_env_value(monkeypatch) -> None:
+    monkeypatch.setattr(
+        runtime,
+        "detect_available_runtimes",
+        lambda: {
+            "podman": "unix:///run/user/1000/podman/podman.sock",
+        },
+    )
+    monkeypatch.setenv("VP_CONTAINER_RUNTIME", " PodMan ")
+
+    selected = runtime.resolve_runtime()
+
+    assert selected == ("podman", "unix:///run/user/1000/podman/podman.sock")
+
+
 def test_get_manager_wraps_runtime_preference_errors(monkeypatch) -> None:
     def _raise_runtime_preference_error(**kwargs) -> tuple[str, str]:
         del kwargs