feat(subagents): make subagent timeout configurable via config.yaml (#897)

* feat(subagents): make subagent timeout configurable via config.yaml

- Add SubagentsAppConfig supporting global and per-agent timeout_seconds
- Load subagents config section in AppConfig.from_file()
- Registry now applies config.yaml overrides without mutating builtin defaults
- Polling safety-net in task_tool is now dynamic (execution timeout + 60s buffer)
- Document subagents section in config.example.yaml
- Add make test command and enforce TDD policy in CLAUDE.md
- Add 38 unit tests covering config validation, timeout resolution, registry
  override behavior, and polling timeout formula

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* feat(subagents): add logging for subagent timeout config and execution

- Log loaded timeout config (global default + per-agent overrides) on startup
- Log debug message in registry when config.yaml overrides a builtin timeout
- Include timeout in executor's async execution start log
- Log effective timeout and polling limit when a task is dispatched
- Fix UnboundLocalError: move max_poll_count assignment before logger.info

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* ci(backend): add lint step and run all unit tests via Makefile

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix lint

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

backend/tests/conftest.py

@@ -0,0 +1,33 @@
+"""Test configuration for the backend test suite.
+
+Sets up sys.path and pre-mocks modules that would cause circular import
+issues when unit-testing lightweight config/registry code in isolation.
+"""
+
+import sys
+from pathlib import Path
+from unittest.mock import MagicMock
+
+# Make 'src' importable from any working directory
+sys.path.insert(0, str(Path(__file__).parent.parent))
+
+# Break the circular import chain that exists in production code:
+#   src.subagents.__init__
+#     -> .executor (SubagentExecutor, SubagentResult)
+#       -> src.agents.thread_state
+#         -> src.agents.__init__
+#           -> lead_agent.agent
+#             -> subagent_limit_middleware
+#               -> src.subagents.executor  <-- circular!
+#
+# By injecting a mock for src.subagents.executor *before* any test module
+# triggers the import, __init__.py's "from .executor import ..." succeeds
+# immediately without running the real executor module.
+_executor_mock = MagicMock()
+_executor_mock.SubagentExecutor = MagicMock
+_executor_mock.SubagentResult = MagicMock
+_executor_mock.SubagentStatus = MagicMock
+_executor_mock.MAX_CONCURRENT_SUBAGENTS = 3
+_executor_mock.get_background_task_result = MagicMock()
+
+sys.modules["src.subagents.executor"] = _executor_mock

backend/tests/test_docker_sandbox_mode_detection.py

@@ -16,11 +16,7 @@ def _detect_mode_with_config(config_content: str) -> str:
         tmp_root = Path(tmpdir)
         (tmp_root / "config.yaml").write_text(config_content)
 
-        command = (
-            f"source '{SCRIPT_PATH}' && "
-            f"PROJECT_ROOT='{tmp_root}' && "
-            "detect_sandbox_mode"
-        )
+        command = f"source '{SCRIPT_PATH}' && PROJECT_ROOT='{tmp_root}' && detect_sandbox_mode"
 
         output = subprocess.check_output(
             ["bash", "-lc", command],
@@ -33,11 +29,7 @@ def _detect_mode_with_config(config_content: str) -> str:
 def test_detect_mode_defaults_to_local_when_config_missing():
     """No config file should default to local mode."""
     with tempfile.TemporaryDirectory() as tmpdir:
-        command = (
-            f"source '{SCRIPT_PATH}' && "
-            f"PROJECT_ROOT='{tmpdir}' && "
-            "detect_sandbox_mode"
-        )
+        command = f"source '{SCRIPT_PATH}' && PROJECT_ROOT='{tmpdir}' && detect_sandbox_mode"
         output = subprocess.check_output(["bash", "-lc", command], text=True).strip()
 
     assert output == "local"

backend/tests/test_provisioner_kubeconfig.py

@@ -90,9 +90,7 @@ def test_init_k8s_client_uses_file_kubeconfig(tmp_path, monkeypatch):
     assert result == "core-v1"
 
 
-def test_init_k8s_client_falls_back_to_incluster_when_missing(
-    tmp_path, monkeypatch
-):
+def test_init_k8s_client_falls_back_to_incluster_when_missing(tmp_path, monkeypatch):
     """When kubeconfig file is missing, in-cluster config should be attempted."""
     provisioner_module = _load_provisioner_module()
     missing_path = tmp_path / "missing-config"

backend/tests/test_subagent_timeout_config.py

@@ -0,0 +1,354 @@
+"""Tests for subagent timeout configuration.
+
+Covers:
+- SubagentsAppConfig / SubagentOverrideConfig model validation and defaults
+- get_timeout_for() resolution logic (global vs per-agent)
+- load_subagents_config_from_dict() and get_subagents_app_config() singleton
+- registry.get_subagent_config() applies config overrides
+- registry.list_subagents() applies overrides for all agents
+- Polling timeout calculation in task_tool is consistent with config
+"""
+
+import pytest
+
+from src.config.subagents_config import (
+    SubagentOverrideConfig,
+    SubagentsAppConfig,
+    get_subagents_app_config,
+    load_subagents_config_from_dict,
+)
+from src.subagents.config import SubagentConfig
+
+# ---------------------------------------------------------------------------
+# Helpers
+# ---------------------------------------------------------------------------
+
+
+def _reset_subagents_config(timeout_seconds: int = 900, agents: dict | None = None) -> None:
+    """Reset global subagents config to a known state."""
+    load_subagents_config_from_dict({"timeout_seconds": timeout_seconds, "agents": agents or {}})
+
+
+# ---------------------------------------------------------------------------
+# SubagentOverrideConfig
+# ---------------------------------------------------------------------------
+
+
+class TestSubagentOverrideConfig:
+    def test_default_is_none(self):
+        override = SubagentOverrideConfig()
+        assert override.timeout_seconds is None
+
+    def test_explicit_value(self):
+        override = SubagentOverrideConfig(timeout_seconds=300)
+        assert override.timeout_seconds == 300
+
+    def test_rejects_zero(self):
+        with pytest.raises(ValueError):
+            SubagentOverrideConfig(timeout_seconds=0)
+
+    def test_rejects_negative(self):
+        with pytest.raises(ValueError):
+            SubagentOverrideConfig(timeout_seconds=-1)
+
+    def test_minimum_valid_value(self):
+        override = SubagentOverrideConfig(timeout_seconds=1)
+        assert override.timeout_seconds == 1
+
+
+# ---------------------------------------------------------------------------
+# SubagentsAppConfig – defaults and validation
+# ---------------------------------------------------------------------------
+
+
+class TestSubagentsAppConfigDefaults:
+    def test_default_timeout(self):
+        config = SubagentsAppConfig()
+        assert config.timeout_seconds == 900
+
+    def test_default_agents_empty(self):
+        config = SubagentsAppConfig()
+        assert config.agents == {}
+
+    def test_custom_global_timeout(self):
+        config = SubagentsAppConfig(timeout_seconds=1800)
+        assert config.timeout_seconds == 1800
+
+    def test_rejects_zero_timeout(self):
+        with pytest.raises(ValueError):
+            SubagentsAppConfig(timeout_seconds=0)
+
+    def test_rejects_negative_timeout(self):
+        with pytest.raises(ValueError):
+            SubagentsAppConfig(timeout_seconds=-60)
+
+
+# ---------------------------------------------------------------------------
+# SubagentsAppConfig.get_timeout_for()
+# ---------------------------------------------------------------------------
+
+
+class TestGetTimeoutFor:
+    def test_returns_global_default_when_no_override(self):
+        config = SubagentsAppConfig(timeout_seconds=600)
+        assert config.get_timeout_for("general-purpose") == 600
+        assert config.get_timeout_for("bash") == 600
+        assert config.get_timeout_for("unknown-agent") == 600
+
+    def test_returns_per_agent_override_when_set(self):
+        config = SubagentsAppConfig(
+            timeout_seconds=900,
+            agents={"bash": SubagentOverrideConfig(timeout_seconds=300)},
+        )
+        assert config.get_timeout_for("bash") == 300
+
+    def test_other_agents_still_use_global_default(self):
+        config = SubagentsAppConfig(
+            timeout_seconds=900,
+            agents={"bash": SubagentOverrideConfig(timeout_seconds=300)},
+        )
+        assert config.get_timeout_for("general-purpose") == 900
+
+    def test_agent_with_none_override_falls_back_to_global(self):
+        config = SubagentsAppConfig(
+            timeout_seconds=900,
+            agents={"general-purpose": SubagentOverrideConfig(timeout_seconds=None)},
+        )
+        assert config.get_timeout_for("general-purpose") == 900
+
+    def test_multiple_per_agent_overrides(self):
+        config = SubagentsAppConfig(
+            timeout_seconds=900,
+            agents={
+                "general-purpose": SubagentOverrideConfig(timeout_seconds=1800),
+                "bash": SubagentOverrideConfig(timeout_seconds=120),
+            },
+        )
+        assert config.get_timeout_for("general-purpose") == 1800
+        assert config.get_timeout_for("bash") == 120
+
+
+# ---------------------------------------------------------------------------
+# load_subagents_config_from_dict / get_subagents_app_config singleton
+# ---------------------------------------------------------------------------
+
+
+class TestLoadSubagentsConfig:
+    def teardown_method(self):
+        """Restore defaults after each test."""
+        _reset_subagents_config()
+
+    def test_load_global_timeout(self):
+        load_subagents_config_from_dict({"timeout_seconds": 300})
+        assert get_subagents_app_config().timeout_seconds == 300
+
+    def test_load_with_per_agent_overrides(self):
+        load_subagents_config_from_dict(
+            {
+                "timeout_seconds": 900,
+                "agents": {
+                    "general-purpose": {"timeout_seconds": 1800},
+                    "bash": {"timeout_seconds": 60},
+                },
+            }
+        )
+        cfg = get_subagents_app_config()
+        assert cfg.get_timeout_for("general-purpose") == 1800
+        assert cfg.get_timeout_for("bash") == 60
+
+    def test_load_partial_override(self):
+        load_subagents_config_from_dict(
+            {
+                "timeout_seconds": 600,
+                "agents": {"bash": {"timeout_seconds": 120}},
+            }
+        )
+        cfg = get_subagents_app_config()
+        assert cfg.get_timeout_for("general-purpose") == 600
+        assert cfg.get_timeout_for("bash") == 120
+
+    def test_load_empty_dict_uses_defaults(self):
+        load_subagents_config_from_dict({})
+        cfg = get_subagents_app_config()
+        assert cfg.timeout_seconds == 900
+        assert cfg.agents == {}
+
+    def test_load_replaces_previous_config(self):
+        load_subagents_config_from_dict({"timeout_seconds": 100})
+        assert get_subagents_app_config().timeout_seconds == 100
+
+        load_subagents_config_from_dict({"timeout_seconds": 200})
+        assert get_subagents_app_config().timeout_seconds == 200
+
+    def test_singleton_returns_same_instance_between_calls(self):
+        load_subagents_config_from_dict({"timeout_seconds": 777})
+        assert get_subagents_app_config() is get_subagents_app_config()
+
+
+# ---------------------------------------------------------------------------
+# registry.get_subagent_config – timeout override applied
+# ---------------------------------------------------------------------------
+
+
+class TestRegistryGetSubagentConfig:
+    def teardown_method(self):
+        _reset_subagents_config()
+
+    def test_returns_none_for_unknown_agent(self):
+        from src.subagents.registry import get_subagent_config
+
+        assert get_subagent_config("nonexistent") is None
+
+    def test_returns_config_for_builtin_agents(self):
+        from src.subagents.registry import get_subagent_config
+
+        assert get_subagent_config("general-purpose") is not None
+        assert get_subagent_config("bash") is not None
+
+    def test_default_timeout_preserved_when_no_config(self):
+        from src.subagents.registry import get_subagent_config
+
+        _reset_subagents_config(timeout_seconds=900)
+        config = get_subagent_config("general-purpose")
+        assert config.timeout_seconds == 900
+
+    def test_global_timeout_override_applied(self):
+        from src.subagents.registry import get_subagent_config
+
+        _reset_subagents_config(timeout_seconds=1800)
+        config = get_subagent_config("general-purpose")
+        assert config.timeout_seconds == 1800
+
+    def test_per_agent_timeout_override_applied(self):
+        from src.subagents.registry import get_subagent_config
+
+        load_subagents_config_from_dict(
+            {
+                "timeout_seconds": 900,
+                "agents": {"bash": {"timeout_seconds": 120}},
+            }
+        )
+        bash_config = get_subagent_config("bash")
+        assert bash_config.timeout_seconds == 120
+
+    def test_per_agent_override_does_not_affect_other_agents(self):
+        from src.subagents.registry import get_subagent_config
+
+        load_subagents_config_from_dict(
+            {
+                "timeout_seconds": 900,
+                "agents": {"bash": {"timeout_seconds": 120}},
+            }
+        )
+        gp_config = get_subagent_config("general-purpose")
+        assert gp_config.timeout_seconds == 900
+
+    def test_builtin_config_object_is_not_mutated(self):
+        """Registry must return a new object, leaving the builtin default intact."""
+        from src.subagents.builtins import BUILTIN_SUBAGENTS
+        from src.subagents.registry import get_subagent_config
+
+        original_timeout = BUILTIN_SUBAGENTS["bash"].timeout_seconds
+        load_subagents_config_from_dict({"timeout_seconds": 42})
+
+        returned = get_subagent_config("bash")
+        assert returned.timeout_seconds == 42
+        assert BUILTIN_SUBAGENTS["bash"].timeout_seconds == original_timeout
+
+    def test_config_preserves_other_fields(self):
+        """Applying timeout override must not change other SubagentConfig fields."""
+        from src.subagents.builtins import BUILTIN_SUBAGENTS
+        from src.subagents.registry import get_subagent_config
+
+        _reset_subagents_config(timeout_seconds=300)
+        original = BUILTIN_SUBAGENTS["general-purpose"]
+        overridden = get_subagent_config("general-purpose")
+
+        assert overridden.name == original.name
+        assert overridden.description == original.description
+        assert overridden.max_turns == original.max_turns
+        assert overridden.model == original.model
+        assert overridden.tools == original.tools
+        assert overridden.disallowed_tools == original.disallowed_tools
+
+
+# ---------------------------------------------------------------------------
+# registry.list_subagents – all agents get overrides
+# ---------------------------------------------------------------------------
+
+
+class TestRegistryListSubagents:
+    def teardown_method(self):
+        _reset_subagents_config()
+
+    def test_lists_both_builtin_agents(self):
+        from src.subagents.registry import list_subagents
+
+        names = {cfg.name for cfg in list_subagents()}
+        assert "general-purpose" in names
+        assert "bash" in names
+
+    def test_all_returned_configs_get_global_override(self):
+        from src.subagents.registry import list_subagents
+
+        _reset_subagents_config(timeout_seconds=123)
+        for cfg in list_subagents():
+            assert cfg.timeout_seconds == 123, f"{cfg.name} has wrong timeout"
+
+    def test_per_agent_overrides_reflected_in_list(self):
+        from src.subagents.registry import list_subagents
+
+        load_subagents_config_from_dict(
+            {
+                "timeout_seconds": 900,
+                "agents": {
+                    "general-purpose": {"timeout_seconds": 1800},
+                    "bash": {"timeout_seconds": 60},
+                },
+            }
+        )
+        by_name = {cfg.name: cfg for cfg in list_subagents()}
+        assert by_name["general-purpose"].timeout_seconds == 1800
+        assert by_name["bash"].timeout_seconds == 60
+
+
+# ---------------------------------------------------------------------------
+# Polling timeout calculation (logic extracted from task_tool)
+# ---------------------------------------------------------------------------
+
+
+class TestPollingTimeoutCalculation:
+    """Verify the formula (timeout_seconds + 60) // 5 is correct for various inputs."""
+
+    @pytest.mark.parametrize(
+        "timeout_seconds, expected_max_polls",
+        [
+            (900, 192),  # default 15 min → (900+60)//5 = 192
+            (300, 72),  # 5 min → (300+60)//5 = 72
+            (1800, 372),  # 30 min → (1800+60)//5 = 372
+            (60, 24),  # 1 min → (60+60)//5 = 24
+            (1, 12),  # minimum → (1+60)//5 = 12
+        ],
+    )
+    def test_polling_timeout_formula(self, timeout_seconds: int, expected_max_polls: int):
+        dummy_config = SubagentConfig(
+            name="test",
+            description="test",
+            system_prompt="test",
+            timeout_seconds=timeout_seconds,
+        )
+        max_poll_count = (dummy_config.timeout_seconds + 60) // 5
+        assert max_poll_count == expected_max_polls
+
+    def test_polling_timeout_exceeds_execution_timeout(self):
+        """Safety-net polling window must always be longer than the execution timeout."""
+        for timeout_seconds in [60, 300, 900, 1800]:
+            dummy_config = SubagentConfig(
+                name="test",
+                description="test",
+                system_prompt="test",
+                timeout_seconds=timeout_seconds,
+            )
+            max_poll_count = (dummy_config.timeout_seconds + 60) // 5
+            polling_window_seconds = max_poll_count * 5
+            assert polling_window_seconds > timeout_seconds