From 4c74dc0f86a27af64624b21abc81e9eab4bb5e85 Mon Sep 17 00:00:00 2001
From: Greyson LaLonde <greyson.r.lalonde@gmail.com>
Date: Wed, 29 Apr 2026 02:10:17 +0800
Subject: [PATCH] fix(executor): reset messages and iterations between
 invocations

CrewAgentExecutor is reused across sequential tasks but invoke/ainvoke
only appended to self.messages and never reset self.iterations, so
task 2 inherited task 1's history and iteration count.
---
 .../src/crewai/agents/crew_agent_executor.py  |  4 ++
 .../tests/agents/test_async_agent_executor.py | 70 +++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/lib/crewai/src/crewai/agents/crew_agent_executor.py b/lib/crewai/src/crewai/agents/crew_agent_executor.py
index 62369bfb9..8bb27b395 100644
--- a/lib/crewai/src/crewai/agents/crew_agent_executor.py
+++ b/lib/crewai/src/crewai/agents/crew_agent_executor.py
@@ -201,6 +201,8 @@ class CrewAgentExecutor(BaseAgentExecutor):
         if self._resuming:
             self._resuming = False
         else:
+            self.messages = []
+            self.iterations = 0
             self._setup_messages(inputs)
             self._inject_multimodal_files(inputs)
 
@@ -1071,6 +1073,8 @@ class CrewAgentExecutor(BaseAgentExecutor):
         if self._resuming:
             self._resuming = False
         else:
+            self.messages = []
+            self.iterations = 0
             self._setup_messages(inputs)
             await self._ainject_multimodal_files(inputs)
 
diff --git a/lib/crewai/tests/agents/test_async_agent_executor.py b/lib/crewai/tests/agents/test_async_agent_executor.py
index 0ed37d824..e4dc7f63f 100644
--- a/lib/crewai/tests/agents/test_async_agent_executor.py
+++ b/lib/crewai/tests/agents/test_async_agent_executor.py
@@ -288,6 +288,76 @@ class TestAsyncAgentExecutor:
         assert max_concurrent > 1, f"Expected concurrent execution, max concurrent was {max_concurrent}"
 
 
+class TestExecutorStateResetBetweenInvocations:
+    """Regression tests: executor state must reset across sequential invocations."""
+
+    def test_invoke_resets_messages_and_iterations(
+        self, executor: CrewAgentExecutor
+    ) -> None:
+        executor.messages = [{"role": "assistant", "content": "leftover from task 1"}]
+        executor.iterations = 7
+
+        with patch.object(
+            executor,
+            "_invoke_loop",
+            return_value=AgentFinish(thought="", output="ok", text="ok"),
+        ), patch.object(executor, "_show_start_logs"), patch.object(
+            executor, "_save_to_memory"
+        ):
+            executor.invoke({"input": "task 2", "tool_names": "", "tools": ""})
+
+        assert executor.iterations == 0
+        assert all(
+            "leftover from task 1" not in (m.get("content") or "")
+            for m in executor.messages
+        )
+
+    @pytest.mark.asyncio
+    async def test_ainvoke_resets_messages_and_iterations(
+        self, executor: CrewAgentExecutor
+    ) -> None:
+        executor.messages = [{"role": "assistant", "content": "leftover from task 1"}]
+        executor.iterations = 7
+
+        with patch.object(
+            executor,
+            "_ainvoke_loop",
+            new_callable=AsyncMock,
+            return_value=AgentFinish(thought="", output="ok", text="ok"),
+        ), patch.object(executor, "_show_start_logs"), patch.object(
+            executor, "_save_to_memory"
+        ):
+            await executor.ainvoke({"input": "task 2", "tool_names": "", "tools": ""})
+
+        assert executor.iterations == 0
+        assert all(
+            "leftover from task 1" not in (m.get("content") or "")
+            for m in executor.messages
+        )
+
+    def test_invoke_preserves_state_when_resuming(
+        self, executor: CrewAgentExecutor
+    ) -> None:
+        executor.messages = [{"role": "assistant", "content": "in-flight context"}]
+        executor.iterations = 4
+        executor._resuming = True
+
+        with patch.object(
+            executor,
+            "_invoke_loop",
+            return_value=AgentFinish(thought="", output="ok", text="ok"),
+        ), patch.object(executor, "_show_start_logs"), patch.object(
+            executor, "_save_to_memory"
+        ):
+            executor.invoke({"input": "resumed", "tool_names": "", "tools": ""})
+
+        assert executor.iterations == 4
+        assert any(
+            "in-flight context" in (m.get("content") or "") for m in executor.messages
+        )
+        assert executor._resuming is False
+
+
 class TestInvokeStepCallback:
     """Tests for _invoke_step_callback with sync and async callbacks."""