Fixes forwarding of authentication token for claude when using vLLM as backend

Author: nezhar

src/vibepod/commands/run.py

@@ -276,7 +276,9 @@ def run(
         for key, env_var in spec.llm_env_map.items():
             value = llm_values.get(key, "")
             if value:
-                merged_env.setdefault(env_var, value)
+                targets = [env_var] if isinstance(env_var, str) else env_var
+                for target in targets:
+                    merged_env.setdefault(target, value)
         llm_model = llm_values["model"]
         if llm_model and spec.llm_model_args:
             llm_command_extra = [*spec.llm_model_args, llm_model]

src/vibepod/core/agents.py

@@ -22,7 +22,7 @@ class AgentSpec:
     platform: str | None = None
     run_as_host_user: bool = False
     ikwid_args: list[str] | None = None
-    llm_env_map: dict[str, str] | None = None
+    llm_env_map: dict[str, str | list[str]] | None = None
     llm_model_args: list[str] | None = None
 
 
@@ -36,7 +36,15 @@ class AgentSpec:
         "/claude",
         {"CLAUDE_CONFIG_DIR": "/claude"},
         ikwid_args=["--dangerously-skip-permissions"],
-        llm_env_map={"base_url": "ANTHROPIC_BASE_URL", "api_key": "ANTHROPIC_API_KEY"},
+        llm_env_map={
+            "base_url": "ANTHROPIC_BASE_URL",
+            "api_key": ["ANTHROPIC_API_KEY", "ANTHROPIC_AUTH_TOKEN"],
+            "model": [
+                "ANTHROPIC_DEFAULT_OPUS_MODEL",
+                "ANTHROPIC_DEFAULT_SONNET_MODEL",
+                "ANTHROPIC_DEFAULT_HAIKU_MODEL",
+            ],
+        },
         llm_model_args=["--model"],
     ),
     "gemini": AgentSpec(

tests/test_agents.py

@@ -83,7 +83,12 @@ def test_claude_spec_has_llm_env_map() -> None:
     spec = get_agent_spec("claude")
     assert spec.llm_env_map == {
         "base_url": "ANTHROPIC_BASE_URL",
-        "api_key": "ANTHROPIC_API_KEY",
+        "api_key": ["ANTHROPIC_API_KEY", "ANTHROPIC_AUTH_TOKEN"],
+        "model": [
+            "ANTHROPIC_DEFAULT_OPUS_MODEL",
+            "ANTHROPIC_DEFAULT_SONNET_MODEL",
+            "ANTHROPIC_DEFAULT_HAIKU_MODEL",
+        ],
     }
     assert spec.llm_model_args == ["--model"]
 

tests/test_run.py

@@ -757,6 +757,10 @@ def run_agent(self, **kwargs) -> object:  # type: ignore[no-untyped-def]
     env = captured["env"]
     assert env["ANTHROPIC_BASE_URL"] == "http://localhost:11434/v1"
     assert env["ANTHROPIC_API_KEY"] == "sk-test-key"
+    assert env["ANTHROPIC_AUTH_TOKEN"] == "sk-test-key"
+    assert env["ANTHROPIC_DEFAULT_OPUS_MODEL"] == "llama3"
+    assert env["ANTHROPIC_DEFAULT_SONNET_MODEL"] == "llama3"
+    assert env["ANTHROPIC_DEFAULT_HAIKU_MODEL"] == "llama3"
     assert "ANTHROPIC_MODEL" not in env
     assert captured["command"] == ["claude", "--model", "llama3"]
 
@@ -863,6 +867,10 @@ def run_agent(self, **kwargs) -> object:  # type: ignore[no-untyped-def]
     env = captured["env"]
     assert "ANTHROPIC_BASE_URL" not in env
     assert "ANTHROPIC_API_KEY" not in env
+    assert "ANTHROPIC_AUTH_TOKEN" not in env
+    assert "ANTHROPIC_DEFAULT_OPUS_MODEL" not in env
+    assert "ANTHROPIC_DEFAULT_SONNET_MODEL" not in env
+    assert "ANTHROPIC_DEFAULT_HAIKU_MODEL" not in env
     assert "ANTHROPIC_MODEL" not in env
 
 
@@ -966,6 +974,9 @@ def run_agent(self, **kwargs) -> object:  # type: ignore[no-untyped-def]
 
     env = captured["env"]
     assert env["ANTHROPIC_BASE_URL"] == "http://localhost:11434/v1"
+    assert "ANTHROPIC_DEFAULT_OPUS_MODEL" not in env
+    assert "ANTHROPIC_DEFAULT_SONNET_MODEL" not in env
+    assert "ANTHROPIC_DEFAULT_HAIKU_MODEL" not in env
     assert captured["command"] == ["claude"]