Revamp AgentRejectAction and allow ManagerAgent to handle rejection

opendevin/controller/agent_controller.py

@@ -19,6 +19,7 @@
     AddTaskAction,
     AgentDelegateAction,
     AgentFinishAction,
+    AgentRejectAction,
     ChangeAgentStateAction,
     MessageAction,
     ModifyTaskAction,
@@ -114,7 +115,7 @@
         self, action: Action, observation: Observation, add_to_stream=True
     ):
         if self.state is None:
             raise ValueError('Added history while state was None')
         if not isinstance(action, Action):
             raise TypeError(
                 f'action must be an instance of Action, got {type(action).__name__} instead'
@@ -187,7 +188,9 @@
         self.agent.reset()
 
     async def set_agent_state_to(self, new_state: AgentState):
-        logger.info(f'Setting agent({type(self.agent).__name__}) state from {self._agent_state} to {new_state}')
+        logger.info(
+            f'Setting agent({type(self.agent).__name__}) state from {self._agent_state} to {new_state}'
+        )
         if new_state == self._agent_state:
             return
 
@@ -201,7 +204,11 @@
             self._cur_step += 1
             if self.agent_task is not None:
                 self.agent_task.cancel()
-        elif new_state == AgentState.STOPPED or new_state == AgentState.ERROR or new_state == AgentState.FINISHED:
+        elif (
+            new_state == AgentState.STOPPED
+            or new_state == AgentState.ERROR
+            or new_state == AgentState.FINISHED
+        ):
             await self.reset_task()
 
         await self.event_stream.add_event(
@@ -262,7 +269,9 @@
 
         self.update_state_after_step()
 
-        if isinstance(action, AgentFinishAction):
+        if isinstance(action, AgentFinishAction) or isinstance(
+            action, AgentRejectAction
+        ):
             self.state.outputs = action.outputs  # type: ignore[attr-defined]
             logger.info(action, extra={'msg_type': 'INFO'})
             return True