fix: limit proactive cron llm retries

Author: qiuC123

astrbot/core/config/default.py

@@ -169,6 +169,7 @@
         },
         "proactive_capability": {
             "add_cron_tools": True,
+            "request_max_retries": 1,
         },
         "computer_use_runtime": "none",
         "computer_use_require_admin": True,
@@ -2895,6 +2896,9 @@
                             "add_cron_tools": {
                                 "type": "bool",
                             },
+                            "request_max_retries": {
+                                "type": "int",
+                            },
                         },
                     },
                 },

astrbot/core/cron/manager.py

@@ -26,6 +26,7 @@
 
 _CRONTAB_WEEKDAY_NAMES = ("sun", "mon", "tue", "wed", "thu", "fri", "sat")
 _CRONTAB_WEEKDAY_PATTERN = re.compile(r"^(?:(\*)|(\d+)(?:-(\d+))?)(?:/(\d+))?$")
+_DEFAULT_PROACTIVE_REQUEST_MAX_RETRIES = 1
 
 
 def _normalize_crontab_day_of_week(day_of_week: str) -> str:
@@ -417,12 +418,22 @@ async def _woke_main_agent(
             cron_event.role = "admin"
 
         provider_settings = cfg.get("provider_settings", {}) or {}
+        proactive_settings = provider_settings.get("proactive_capability", {})
+        if not isinstance(proactive_settings, dict):
+            proactive_settings = {}
+        proactive_request_max_retries = proactive_settings.get("request_max_retries")
+        if proactive_request_max_retries is None:
+            proactive_request_max_retries = _DEFAULT_PROACTIVE_REQUEST_MAX_RETRIES
+        cron_provider_settings = {
+            **provider_settings,
+            "request_max_retries": proactive_request_max_retries,
+        }
         tool_call_timeout = provider_settings.get("tool_call_timeout", 120)
         config = MainAgentBuildConfig(
             tool_call_timeout=tool_call_timeout,
             llm_safety_mode=False,
             streaming_response=False,
-            provider_settings=provider_settings,
+            provider_settings=cron_provider_settings,
         )
         req = ProviderRequest()
         conv = await _get_session_conv(event=cron_event, plugin_context=self.ctx)

tests/unit/test_cron_manager.py

@@ -596,8 +596,128 @@ async def fake_persist_agent_history(*args, **kwargs):
 
         config = captured["config"]
         assert config.tool_call_timeout == 77
-        assert config.provider_settings is provider_settings
+        assert config.provider_settings is not provider_settings
         assert config.provider_settings["fallback_chat_models"] == ["fallback-provider"]
+        assert config.provider_settings["request_max_retries"] == 1
+        assert "request_max_retries" not in provider_settings
+
+    @pytest.mark.asyncio
+    async def test_woke_main_agent_allows_proactive_retry_override(
+        self, cron_manager
+    ):
+        """Test active cron agent can override request retries for proactive runs."""
+        provider_settings = {
+            "tool_call_timeout": 77,
+            "request_max_retries": 5,
+            "proactive_capability": {"request_max_retries": 2},
+        }
+        ctx = MagicMock()
+        ctx.get_config.return_value = {
+            "admins_id": [],
+            "provider_settings": provider_settings,
+        }
+        cron_manager.ctx = ctx
+
+        conv = MagicMock()
+        conv.history = "[]"
+
+        class FakeRunner:
+            def step_until_done(self, max_step):
+                async def gen():
+                    if False:
+                        yield None
+
+                return gen()
+
+            def get_final_llm_resp(self):
+                return None
+
+        captured = {}
+
+        async def fake_build_main_agent(*, event, plugin_context, config, req):
+            captured["config"] = config
+            return MagicMock(agent_runner=FakeRunner())
+
+        with (
+            patch(
+                "astrbot.core.astr_main_agent._get_session_conv",
+                AsyncMock(return_value=conv),
+            ),
+            patch(
+                "astrbot.core.astr_main_agent.build_main_agent",
+                side_effect=fake_build_main_agent,
+            ),
+            patch(
+                "astrbot.core.cron.manager.persist_agent_history",
+                AsyncMock(return_value=None),
+            ),
+        ):
+            await cron_manager._woke_main_agent(
+                message="run scheduled task",
+                session_str="test:FriendMessage:user123",
+                extras={"cron_job": {"id": "job-1"}, "cron_payload": {}},
+            )
+
+        assert captured["config"].provider_settings["request_max_retries"] == 2
+        assert provider_settings["request_max_retries"] == 5
+
+    @pytest.mark.asyncio
+    async def test_woke_main_agent_uses_default_when_proactive_retry_is_none(
+        self, cron_manager
+    ):
+        """Test None proactive retry config falls back to the cron default."""
+        provider_settings = {
+            "request_max_retries": 5,
+            "proactive_capability": {"request_max_retries": None},
+        }
+        ctx = MagicMock()
+        ctx.get_config.return_value = {
+            "admins_id": [],
+            "provider_settings": provider_settings,
+        }
+        cron_manager.ctx = ctx
+
+        conv = MagicMock()
+        conv.history = "[]"
+
+        class FakeRunner:
+            def step_until_done(self, max_step):
+                async def gen():
+                    if False:
+                        yield None
+
+                return gen()
+
+            def get_final_llm_resp(self):
+                return None
+
+        captured = {}
+
+        async def fake_build_main_agent(*, event, plugin_context, config, req):
+            captured["config"] = config
+            return MagicMock(agent_runner=FakeRunner())
+
+        with (
+            patch(
+                "astrbot.core.astr_main_agent._get_session_conv",
+                AsyncMock(return_value=conv),
+            ),
+            patch(
+                "astrbot.core.astr_main_agent.build_main_agent",
+                side_effect=fake_build_main_agent,
+            ),
+            patch(
+                "astrbot.core.cron.manager.persist_agent_history",
+                AsyncMock(return_value=None),
+            ),
+        ):
+            await cron_manager._woke_main_agent(
+                message="run scheduled task",
+                session_str="test:FriendMessage:user123",
+                extras={"cron_job": {"id": "job-1"}, "cron_payload": {}},
+            )
+
+        assert captured["config"].provider_settings["request_max_retries"] == 1
 
 
 class TestGetNextRunTime: