Merge pull request #725 from AnguseZhang/feat/intent_ui

feat: 添加用户意图识别时的UI通知事件

Author: Rasic2

agents/matmaster_agent/flow_agents/agent.py

@@ -42,6 +42,8 @@
     MATMASTER_FLOW,
     MATMASTER_FLOW_PLANS,
     MATMASTER_GENERATE_NPS,
+    MATMASTER_INTENT_UI,
+    MATMASTER_THINKING_UI,
 )
 from agents.matmaster_agent.flow_agents.execution_agent.agent import (
     MatMasterSupervisorAgent,
@@ -368,9 +370,42 @@ async def _run_expand_agent(
             context + EXPAND_INSTRUCTION + EXPAND_INPUT_EXAMPLES_PROMPT
         )
         # 3. 运行 Agent
+        for _intent_ui_event in context_function_event(
+            ctx,
+            self.name,
+            MATMASTER_INTENT_UI,
+            None,
+            ModelRole,
+            {
+                'matmaster_intent_ui_args': json.dumps(
+                    {
+                        'title': '正在进行用户问题扩写...',
+                        'status': 'start',
+                    }
+                )
+            },
+        ):
+            yield _intent_ui_event
+
         async for expand_event in self.expand_agent.run_async(ctx):
             yield expand_event
 
+        for _intent_ui_event in context_function_event(
+            ctx,
+            self.name,
+            MATMASTER_INTENT_UI,
+            None,
+            ModelRole,
+            {
+                'matmaster_intent_ui_args': json.dumps(
+                    {
+                        'status': 'end',
+                    }
+                )
+            },
+        ):
+            yield _intent_ui_event
+
     async def _build_icl_prompt(self, ctx: InvocationContext):
         raw_content = ctx.session.state['expand']['update_user_content']
         UPDATE_USER_CONTENT = '\nUSER INPUT FOR THIS TASK:\n' + sanitize_braces(
@@ -397,9 +432,42 @@ async def _run_scene_agent(
             SCENE_INSTRUCTION + UPDATE_USER_CONTENT + SCENE_EXAMPLES_PROMPT
         )
         # 3. 运行 Agent
+        for _intent_ui_event in context_function_event(
+            ctx,
+            self.name,
+            MATMASTER_INTENT_UI,
+            None,
+            ModelRole,
+            {
+                'matmaster_intent_ui_args': json.dumps(
+                    {
+                        'title': '正在进行场景划分...',
+                        'status': 'start',
+                    }
+                )
+            },
+        ):
+            yield _intent_ui_event
+
         async for scene_event in self.scene_agent.run_async(ctx):
             yield scene_event
 
+        for _intent_ui_event in context_function_event(
+            ctx,
+            self.name,
+            MATMASTER_INTENT_UI,
+            None,
+            ModelRole,
+            {
+                'matmaster_intent_ui_args': json.dumps(
+                    {
+                        'status': 'end',
+                    }
+                )
+            },
+        ):
+            yield _intent_ui_event
+
         # 4. 将之前的场景带到后面的会话中去
         before_scenes = ctx.session.state['scenes']
         single_scene = ctx.session.state['single_scenes']['type']
@@ -481,6 +549,23 @@ async def _run_plan_make_agent(
         thinking_text = ''
         if not skip_thinking:
             try:
+                for _thinking_ui_event in context_function_event(
+                    ctx,
+                    self.name,
+                    MATMASTER_THINKING_UI,
+                    None,
+                    ModelRole,
+                    {
+                        'matmaster_thinking_ui_args': json.dumps(
+                            {
+                                'title': '正在思考',
+                                'status': 'start',
+                            }
+                        )
+                    },
+                ):
+                    yield _thinking_ui_event
+
                 self._thinking_agent.set_thinking_params(
                     available_tools_with_info_str,
                     session_file_summary,
@@ -513,6 +598,21 @@ async def _run_plan_make_agent(
                     f'{ctx.session.id} reasoning_agent result length={len(thinking_text)}, '
                     f'preview={repr(thinking_text[:300]) if thinking_text else "empty"}'
                 )
+                for _thinking_ui_event in context_function_event(
+                    ctx,
+                    self.name,
+                    MATMASTER_THINKING_UI,
+                    None,
+                    ModelRole,
+                    {
+                        'matmaster_thinking_ui_args': json.dumps(
+                            {
+                                'status': 'end',
+                            }
+                        )
+                    },
+                ):
+                    yield _thinking_ui_event
             except Exception as e:
                 logger.warning(
                     f'{ctx.session.id} reasoning_agent failed: {e}, proceed without thinking'
@@ -961,9 +1061,42 @@ async def _run_async_impl(
 
             # 用户意图识别（一旦进入 research 模式，暂时无法退出）
             if ctx.session.state['intent'].get('type', None) != IntentEnum.RESEARCH:
+                for _intent_ui_event in context_function_event(
+                    ctx,
+                    self.name,
+                    MATMASTER_INTENT_UI,
+                    None,
+                    ModelRole,
+                    {
+                        'matmaster_intent_ui_args': json.dumps(
+                            {
+                                'title': '正在进行意图识别...',
+                                'status': 'start',
+                            }
+                        )
+                    },
+                ):
+                    yield _intent_ui_event
+
                 async for intent_event in self.intent_agent.run_async(ctx):
                     yield intent_event
 
+                for _intent_ui_event in context_function_event(
+                    ctx,
+                    self.name,
+                    MATMASTER_INTENT_UI,
+                    None,
+                    ModelRole,
+                    {
+                        'matmaster_intent_ui_args': json.dumps(
+                            {
+                                'status': 'end',
+                            }
+                        )
+                    },
+                ):
+                    yield _intent_ui_event
+
             # 如果用户上传文件，强制为 research 模式
             if (
                 ctx.session.state[UPLOAD_FILE]

agents/matmaster_agent/flow_agents/constant.py

@@ -9,6 +9,8 @@
 MATMASTER_FLOW = 'matmaster_flow'
 MATMASTER_FLOW_PLANS = 'matmaster_flow_plans'
 MATMASTER_GENERATE_NPS = 'matmaster_generate_nps'
+MATMASTER_INTENT_UI = 'matmaster_intent_ui'
+MATMASTER_THINKING_UI = 'matmaster_thinking_ui'
 
 # matmaster_flow 展示文案，直接传给前端（正常执行无标签则传空字符串）
 EXECUTION_TYPE_LABEL_RETRY = '重试工具'