Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion docs/llm.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ VibePod can connect agents to external LLM servers that expose OpenAI- or Anthro

| Agent | Env vars injected | CLI flags appended |
|-------|------------------|--------------------|
| claude | `ANTHROPIC_BASE_URL`, `ANTHROPIC_API_KEY` | `--model <model>` |
| claude | `ANTHROPIC_BASE_URL`, `ANTHROPIC_API_KEY`, `ANTHROPIC_AUTH_TOKEN`, `ANTHROPIC_MODEL`, `ANTHROPIC_DEFAULT_OPUS_MODEL`, `ANTHROPIC_DEFAULT_SONNET_MODEL`, `ANTHROPIC_DEFAULT_HAIKU_MODEL` | `--model <model>` |
| codex | `CODEX_OSS_BASE_URL` | `--oss -m <model>` |

Other agents do not yet have LLM mapping and will not receive any LLM configuration.
Expand Down Expand Up @@ -42,6 +42,11 @@ vp run claude
# Starts Claude Code with:
# ANTHROPIC_BASE_URL=http://host.docker.internal:11434
# ANTHROPIC_API_KEY=ollama
# ANTHROPIC_AUTH_TOKEN=ollama
# ANTHROPIC_MODEL=qwen3:14b
# ANTHROPIC_DEFAULT_OPUS_MODEL=qwen3:14b
# ANTHROPIC_DEFAULT_SONNET_MODEL=qwen3:14b
# ANTHROPIC_DEFAULT_HAIKU_MODEL=qwen3:14b
# claude --model qwen3:14b

vp run codex
Expand Down
4 changes: 3 additions & 1 deletion src/vibepod/commands/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
13 changes: 11 additions & 2 deletions src/vibepod/core/agents.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand All @@ -36,7 +36,16 @@ 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_MODEL",
"ANTHROPIC_DEFAULT_OPUS_MODEL",
"ANTHROPIC_DEFAULT_SONNET_MODEL",
"ANTHROPIC_DEFAULT_HAIKU_MODEL",
],
},
llm_model_args=["--model"],
),
"gemini": AgentSpec(
Expand Down
8 changes: 7 additions & 1 deletion tests/test_agents.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,13 @@ 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_MODEL",
"ANTHROPIC_DEFAULT_OPUS_MODEL",
"ANTHROPIC_DEFAULT_SONNET_MODEL",
"ANTHROPIC_DEFAULT_HAIKU_MODEL",
],
}
assert spec.llm_model_args == ["--model"]

Expand Down
13 changes: 12 additions & 1 deletion tests/test_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,11 @@ 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 "ANTHROPIC_MODEL" not in env
assert env["ANTHROPIC_AUTH_TOKEN"] == "sk-test-key"
assert env["ANTHROPIC_MODEL"] == "llama3"
assert env["ANTHROPIC_DEFAULT_OPUS_MODEL"] == "llama3"
assert env["ANTHROPIC_DEFAULT_SONNET_MODEL"] == "llama3"
assert env["ANTHROPIC_DEFAULT_HAIKU_MODEL"] == "llama3"
assert captured["command"] == ["claude", "--model", "llama3"]


Expand Down Expand Up @@ -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


Expand Down Expand Up @@ -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
Comment on lines +977 to +979
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Missing ANTHROPIC_MODEL assertion in empty-model test

test_llm_empty_model_not_injected now checks that the three ANTHROPIC_DEFAULT_*_MODEL vars are absent when model is empty, but it does not assert that ANTHROPIC_MODEL itself is also absent. Since "model" is now a key in llm_env_map (mapping to all four vars including ANTHROPIC_MODEL), the omission creates a coverage gap — a regression that accidentally injected ANTHROPIC_MODEL with a blank value wouldn't be caught.

Suggested change
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
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"]


Expand Down
Loading