forked from molecule-ai/molecule-core
External feedback (2026-04-30): "Provisioner doesn't read model from config.yaml and doesn't set MODEL env var. Without MODEL, the adapter defaults to sonnet and bypasses the mimo routing." Confirmed accurate for SaaS workspaces. Trace: claude-code-default/adapter.py reads `runtime_config.model or "sonnet"` (and hermes reads HERMES_DEFAULT_MODEL via install.sh, which IS plumbed). For claude-code there's nothing — workspace/config.py loaded `runtime_config.model` only from YAML, ignoring MODEL_PROVIDER env. The CP user-data script regenerates /configs/config.yaml at every boot with only `name`, `runtime`, `a2a` keys (intentionally minimal so it doesn't carry stale state) — so any user-set runtime_config.model is wiped on every restart, and the adapter falls back to "sonnet" even when the user picked Opus in the canvas Config tab. Fix: when YAML omits runtime_config.model, fall back to the top-level resolved `model`, which already honors MODEL_PROVIDER env override. One-line in workspace/config.py. Now MODEL_PROVIDER → top-level model → runtime_config.model → adapter sees the user's selection. Sticky across CP-driven restarts; the canvas Save+Restart loop works as intended for every runtime, not just hermes. Tests: test_runtime_config_model_falls_back_to_top_level — top-level set, runtime_config empty → fallback wins test_runtime_config_model_yaml_wins_over_top_level — YAML explicit → fallback skipped (precedence) test_runtime_config_model_picks_up_env_via_top_level — full canvas Save+Restart simulation: env → top-level → runtime_config.model Negative-control verified: removing the `or model` flips both fallback tests red with the expected "" vs expected-model mismatch; restoring flips them green. The yaml-wins test passes either way (correctly, because precedence is preserved). Replaces closed PR #2435 — that PR's commit was on a contaminated branch and accidentally captured unrelated WIP changes (build script + a2a_mcp_server refactor) instead of this fix. Self-review caught it and closed the PR. This branch is clean off main + diff verified before push. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
375 lines
13 KiB
Python
375 lines
13 KiB
Python
"""Tests for config.py — workspace configuration loading."""
|
|
|
|
import os
|
|
|
|
import pytest
|
|
import yaml
|
|
|
|
from config import (
|
|
A2AConfig,
|
|
ComplianceConfig,
|
|
DelegationConfig,
|
|
SandboxConfig,
|
|
WorkspaceConfig,
|
|
load_config,
|
|
)
|
|
|
|
|
|
def test_load_config_basic(tmp_path):
|
|
"""load_config reads a YAML file and returns a WorkspaceConfig."""
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(
|
|
yaml.dump(
|
|
{
|
|
"name": "Test Agent",
|
|
"description": "A test workspace",
|
|
"version": "2.0.0",
|
|
"tier": 3,
|
|
"model": "openai:gpt-4o",
|
|
"skills": ["seo", "writing"],
|
|
"tools": ["delegation", "sandbox"],
|
|
"prompt_files": ["SOUL.md", "TOOLS.md"],
|
|
}
|
|
)
|
|
)
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.name == "Test Agent"
|
|
assert cfg.description == "A test workspace"
|
|
assert cfg.version == "2.0.0"
|
|
assert cfg.tier == 3
|
|
assert cfg.model == "openai:gpt-4o"
|
|
assert cfg.skills == ["seo", "writing"]
|
|
assert cfg.tools == ["delegation", "sandbox"]
|
|
assert cfg.prompt_files == ["SOUL.md", "TOOLS.md"]
|
|
|
|
|
|
def test_load_config_defaults(tmp_path):
|
|
"""Missing fields fall back to WorkspaceConfig defaults."""
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(yaml.dump({}))
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.name == "Workspace"
|
|
assert cfg.description == ""
|
|
assert cfg.version == "1.0.0"
|
|
assert cfg.tier == 1
|
|
assert cfg.model == "anthropic:claude-opus-4-7"
|
|
assert cfg.skills == []
|
|
assert cfg.tools == []
|
|
assert cfg.prompt_files == []
|
|
assert cfg.sub_workspaces == []
|
|
|
|
|
|
def test_load_config_model_env_override(tmp_path, monkeypatch):
|
|
"""MODEL_PROVIDER env var overrides the model from YAML."""
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(yaml.dump({"model": "openai:gpt-4o"}))
|
|
|
|
monkeypatch.setenv("MODEL_PROVIDER", "google:gemini-2.0-flash")
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.model == "google:gemini-2.0-flash"
|
|
|
|
|
|
def test_load_config_model_no_env(tmp_path, monkeypatch):
|
|
"""Without MODEL_PROVIDER, model comes from YAML."""
|
|
monkeypatch.delenv("MODEL_PROVIDER", raising=False)
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(yaml.dump({"model": "openai:gpt-4o"}))
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.model == "openai:gpt-4o"
|
|
|
|
|
|
def test_runtime_config_model_falls_back_to_top_level(tmp_path, monkeypatch):
|
|
"""When YAML omits runtime_config.model, fall back to the top-level
|
|
resolved model.
|
|
|
|
Without this fallback, SaaS workspaces silently boot with the
|
|
adapter's hard-coded default — claude-code-default reads
|
|
``runtime_config.model or "sonnet"``, so even a user who picks Opus
|
|
in the canvas Config tab gets Sonnet on the next restart. Root
|
|
cause: the CP user-data script regenerates /configs/config.yaml
|
|
at every boot with only ``name``, ``runtime``, ``a2a`` keys
|
|
(intentionally minimal so it doesn't carry stale state), losing
|
|
runtime_config.model. MODEL_PROVIDER is plumbed as an env var, so
|
|
picking it up via the top-level resolved ``model`` keeps the
|
|
selection sticky across restarts.
|
|
"""
|
|
monkeypatch.delenv("MODEL_PROVIDER", raising=False)
|
|
config_yaml = tmp_path / "config.yaml"
|
|
# Top-level model set, runtime_config.model NOT set — exactly the
|
|
# shape the CP user-data writes after restart.
|
|
config_yaml.write_text(yaml.dump({"model": "anthropic:claude-opus-4-7"}))
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.runtime_config.model == "anthropic:claude-opus-4-7"
|
|
|
|
|
|
def test_runtime_config_model_yaml_wins_over_top_level(tmp_path, monkeypatch):
|
|
"""When YAML explicitly sets runtime_config.model, it takes precedence
|
|
over the top-level model. Tests the fallback is only a fallback —
|
|
not a clobber that would break workspaces with intentionally
|
|
different runtime_config.model vs top-level model values.
|
|
"""
|
|
monkeypatch.delenv("MODEL_PROVIDER", raising=False)
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(
|
|
yaml.dump(
|
|
{
|
|
"model": "anthropic:claude-opus-4-7",
|
|
"runtime_config": {"model": "openai:gpt-4o"},
|
|
}
|
|
)
|
|
)
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
# Top-level still resolves to its own value.
|
|
assert cfg.model == "anthropic:claude-opus-4-7"
|
|
# runtime_config.model wins — fallback only fires when YAML is empty.
|
|
assert cfg.runtime_config.model == "openai:gpt-4o"
|
|
|
|
|
|
def test_runtime_config_model_picks_up_env_via_top_level(tmp_path, monkeypatch):
|
|
"""End-to-end path the canvas Save+Restart relies on: user picks
|
|
a model → workspace_secrets.MODEL_PROVIDER updated → CP user-data
|
|
re-renders /configs/config.yaml WITHOUT runtime_config.model →
|
|
workspace boots with MODEL_PROVIDER env var. The top-level model
|
|
resolves from MODEL_PROVIDER (line 277), then runtime_config.model
|
|
falls back to that. Adapter sees the user's selection.
|
|
|
|
This is the regression test for the canvas-side feedback
|
|
"Provisioner doesn't read model from config.yaml and doesn't set
|
|
MODEL env var. Without MODEL, the adapter defaults to sonnet and
|
|
bypasses the mimo routing." (2026-04-30).
|
|
"""
|
|
monkeypatch.setenv("MODEL_PROVIDER", "minimax/abab7-chat-preview")
|
|
config_yaml = tmp_path / "config.yaml"
|
|
# CP-shaped minimal config.yaml: only name + runtime + a2a, NO
|
|
# top-level model, NO runtime_config.model.
|
|
config_yaml.write_text(
|
|
yaml.dump(
|
|
{
|
|
"name": "Test Agent",
|
|
"runtime": "claude-code",
|
|
"a2a": {"port": 8000, "streaming": True},
|
|
}
|
|
)
|
|
)
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.model == "minimax/abab7-chat-preview"
|
|
# The adapter (claude-code-default reads runtime_config.model or "sonnet")
|
|
# now sees the user's selected model instead of "sonnet".
|
|
assert cfg.runtime_config.model == "minimax/abab7-chat-preview"
|
|
|
|
|
|
def test_delegation_config_defaults(tmp_path):
|
|
"""DelegationConfig nested defaults are applied."""
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(yaml.dump({}))
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.delegation.retry_attempts == 3
|
|
assert cfg.delegation.retry_delay == 5.0
|
|
assert cfg.delegation.timeout == 120.0
|
|
assert cfg.delegation.escalate is True
|
|
|
|
|
|
def test_delegation_config_override(tmp_path):
|
|
"""Delegation values from YAML override defaults."""
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(
|
|
yaml.dump(
|
|
{"delegation": {"retry_attempts": 5, "timeout": 60.0, "escalate": False}}
|
|
)
|
|
)
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.delegation.retry_attempts == 5
|
|
assert cfg.delegation.timeout == 60.0
|
|
assert cfg.delegation.escalate is False
|
|
# retry_delay still default
|
|
assert cfg.delegation.retry_delay == 5.0
|
|
|
|
|
|
def test_a2a_config_defaults(tmp_path):
|
|
"""A2AConfig nested defaults are applied."""
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(yaml.dump({}))
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.a2a.port == 8000
|
|
assert cfg.a2a.streaming is True
|
|
assert cfg.a2a.push_notifications is True
|
|
|
|
|
|
def test_a2a_config_override(tmp_path):
|
|
"""A2A values from YAML override defaults."""
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(
|
|
yaml.dump({"a2a": {"port": 9000, "streaming": False}})
|
|
)
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.a2a.port == 9000
|
|
assert cfg.a2a.streaming is False
|
|
assert cfg.a2a.push_notifications is True
|
|
|
|
|
|
def test_sandbox_config_defaults(tmp_path):
|
|
"""SandboxConfig nested defaults are applied."""
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(yaml.dump({}))
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.sandbox.backend == "subprocess"
|
|
assert cfg.sandbox.memory_limit == "256m"
|
|
assert cfg.sandbox.timeout == 30
|
|
|
|
|
|
def test_sandbox_config_override(tmp_path):
|
|
"""Sandbox values from YAML override defaults."""
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(
|
|
yaml.dump({"sandbox": {"backend": "docker", "memory_limit": "512m", "timeout": 60}})
|
|
)
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.sandbox.backend == "docker"
|
|
assert cfg.sandbox.memory_limit == "512m"
|
|
assert cfg.sandbox.timeout == 60
|
|
|
|
|
|
def test_load_config_file_not_found(tmp_path):
|
|
"""load_config raises FileNotFoundError when config.yaml is missing."""
|
|
import pytest
|
|
|
|
with pytest.raises(FileNotFoundError):
|
|
load_config(str(tmp_path))
|
|
|
|
|
|
def test_load_config_env_path(tmp_path, monkeypatch):
|
|
"""load_config reads from WORKSPACE_CONFIG_PATH env var when no arg given."""
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(yaml.dump({"name": "EnvAgent"}))
|
|
|
|
monkeypatch.setenv("WORKSPACE_CONFIG_PATH", str(tmp_path))
|
|
cfg = load_config() # no argument
|
|
assert cfg.name == "EnvAgent"
|
|
|
|
|
|
def test_initial_prompt_inline(tmp_path):
|
|
"""initial_prompt reads inline string from YAML."""
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(yaml.dump({"initial_prompt": "Wake up and clone the repo"}))
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.initial_prompt == "Wake up and clone the repo"
|
|
|
|
|
|
def test_initial_prompt_from_file(tmp_path):
|
|
"""initial_prompt_file reads prompt from a file."""
|
|
prompt_file = tmp_path / "init.md"
|
|
prompt_file.write_text("Clone repo and read CLAUDE.md")
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(yaml.dump({"initial_prompt_file": "init.md"}))
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.initial_prompt == "Clone repo and read CLAUDE.md"
|
|
|
|
|
|
def test_initial_prompt_inline_overrides_file(tmp_path):
|
|
"""Inline initial_prompt takes precedence over initial_prompt_file."""
|
|
prompt_file = tmp_path / "init.md"
|
|
prompt_file.write_text("From file")
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(yaml.dump({
|
|
"initial_prompt": "From inline",
|
|
"initial_prompt_file": "init.md",
|
|
}))
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.initial_prompt == "From inline"
|
|
|
|
|
|
def test_initial_prompt_default_empty(tmp_path):
|
|
"""initial_prompt defaults to empty string when not specified."""
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(yaml.dump({}))
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.initial_prompt == ""
|
|
|
|
|
|
def test_initial_prompt_file_missing(tmp_path):
|
|
"""initial_prompt_file gracefully handles missing file."""
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(yaml.dump({"initial_prompt_file": "nonexistent.md"}))
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.initial_prompt == ""
|
|
|
|
|
|
def test_shared_context_default(tmp_path):
|
|
"""shared_context defaults to empty list when not specified in YAML."""
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(yaml.dump({}))
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.shared_context == []
|
|
|
|
|
|
def test_shared_context_from_yaml(tmp_path):
|
|
"""shared_context reads file paths from YAML."""
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(
|
|
yaml.dump({"shared_context": ["guidelines.md", "architecture.md"]})
|
|
)
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.shared_context == ["guidelines.md", "architecture.md"]
|
|
|
|
|
|
# ===== Compliance default lock (#2059) =====
|
|
#
|
|
# PR #2056 flipped ComplianceConfig.mode default from "" to "owasp_agentic"
|
|
# so every shipped template gets prompt-injection detection + PII redaction
|
|
# by default. These tests pin the new default at all four entry points so
|
|
# a silent revert (or a refactor that reintroduces the old no-op default)
|
|
# fails fast instead of shipping a workspace with compliance silently off.
|
|
|
|
|
|
def test_compliance_dataclass_default():
|
|
"""ComplianceConfig() — no args — must default to owasp_agentic + detect."""
|
|
cfg = ComplianceConfig()
|
|
assert cfg.mode == "owasp_agentic"
|
|
assert cfg.prompt_injection == "detect"
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"yaml_payload, expected_mode",
|
|
[
|
|
# No `compliance:` key at all — full default path.
|
|
({}, "owasp_agentic"),
|
|
# Explicit empty block — exercises load_config's
|
|
# `.get("mode", "owasp_agentic")` default-fill at config.py:377.
|
|
# Common shape during template editing.
|
|
({"compliance": {}}, "owasp_agentic"),
|
|
# Documented opt-out: explicit `mode: ""` disables compliance.
|
|
({"compliance": {"mode": ""}}, ""),
|
|
],
|
|
ids=["yaml_omits_block", "yaml_block_empty", "yaml_explicit_optout"],
|
|
)
|
|
def test_compliance_default_via_load_config(tmp_path, yaml_payload, expected_mode):
|
|
"""load_config honors the owasp_agentic default at every yaml shape and
|
|
still respects explicit opt-out."""
|
|
config_yaml = tmp_path / "config.yaml"
|
|
config_yaml.write_text(yaml.dump(yaml_payload))
|
|
|
|
cfg = load_config(str(tmp_path))
|
|
assert cfg.compliance.mode == expected_mode
|
|
# prompt_injection was never overridden in any payload — must stay at
|
|
# the dataclass default regardless of the mode value.
|
|
assert cfg.compliance.prompt_injection == "detect"
|