feat：新增用户请求过滤器以改善交互逻辑

Author: Rasic2

agents/matmaster_agent/constant.py

@@ -16,6 +16,7 @@
 MATMASTER_AGENT_NAME = 'matmaster_agent'
 
 ModelRole = 'model'
+UserRole = 'user'
 
 Transfer2Agent = 'transfer_to_agent'
 

agents/matmaster_agent/core_agents/public_agents/job_agents/submit_core_agent/agent.py

@@ -270,10 +270,10 @@ async def _run_events(self, ctx: InvocationContext) -> AsyncGenerator[Event, Non
                         ctx, self.name, '工具参数无变化，本次跳过执行', ModelRole
                     ):
                         yield _info_event
-                    update_plan = copy.deepcopy(ctx.session.state['plan'])
-                    update_plan['steps'][ctx.session.state['plan_index']][
-                        'status'
-                    ] = PlanStepStatusEnum.FAILED
-                    yield update_state_event(ctx, state_delta={'plan': update_plan})
+                    post_execution_step = copy.deepcopy(ctx.session.state[CURRENT_STEP])
+                    post_execution_step['status'] = PlanStepStatusEnum.FAILED
+                    yield update_state_event(
+                        ctx, state_delta={CURRENT_STEP: post_execution_step}
+                    )
             else:
                 yield event

agents/matmaster_agent/flow_agents/agent.py

@@ -26,6 +26,9 @@
 from agents.matmaster_agent.core_agents.comp_agents.dntransfer_climit_agent import (
     DisallowTransferAndContentLimitLlmAgent,
 )
+from agents.matmaster_agent.flow_agents.all_finished_agent.callback import (
+    only_select_user_request,
+)
 from agents.matmaster_agent.flow_agents.all_finished_agent.constant import (
     ALL_FINISHED_AGENT,
 )
@@ -228,6 +231,7 @@ def after_init(self):
             description='检查用户的目标是否完成',
             output_schema=AllFinishedSchema,
             state_key=FINISHED_STATE,
+            before_model_callback=only_select_user_request,
         )
 
         self._analysis_agent = DisallowTransferAndContentLimitLlmAgent(
@@ -790,10 +794,11 @@ async def _run_research_flow(
                 yield _plan_execute_event
 
             # 回顾历史执行
+            user_request = ctx.user_content.parts[0].text
             history_steps = ctx.session.state[HISTORY_STEPS]
             session_files = await get_session_files(ctx.session.id)
             self.all_finished_agent.instruction = create_all_finished_instruction(
-                history_steps, session_files
+                user_request, history_steps, session_files
             )
             async for _all_finished_event in self.all_finished_agent.run_async(ctx):
                 yield _all_finished_event

agents/matmaster_agent/flow_agents/all_finished_agent/callback.py

@@ -0,0 +1,24 @@
+import logging
+from typing import Optional
+
+from google.adk.agents.callback_context import CallbackContext
+from google.adk.models import LlmRequest, LlmResponse
+from google.genai.types import Content, Part
+
+from agents.matmaster_agent.constant import MATMASTER_AGENT_NAME, UserRole
+from agents.matmaster_agent.logger import PrefixFilter
+
+logger = logging.getLogger(__name__)
+logger.addFilter(PrefixFilter(MATMASTER_AGENT_NAME))
+logger.setLevel(logging.INFO)
+
+
+async def only_select_user_request(
+    callback_context: CallbackContext, llm_request: LlmRequest
+) -> Optional[LlmResponse]:
+    llm_request.contents = [
+        Content(
+            role=UserRole,
+            parts=[Part(text=callback_context.user_content.parts[0].text)],
+        )
+    ]

agents/matmaster_agent/flow_agents/all_finished_agent/prompt.py

@@ -1,7 +1,7 @@
 import json
 
 
-def create_all_finished_instruction(history_steps, session_files):
+def create_all_finished_instruction(user_request, history_steps, session_files):
     """
     Build an instruction prompt for an agent that decides whether the user's overall goal
     has been completed up to the current point in the tool-call history.
@@ -27,6 +27,9 @@ def create_all_finished_instruction(history_steps, session_files):
 and persisted for this session will appear here. Use session_files as verifiable evidence
 that a file deliverable truly exists.
 
+Below in the raw user_request:
+{user_request}
+
 Below is the raw history_steps data (JSON):
 {history_text}