jarvis-ai-assistant 0.3.28__py3-none-any.whl → 0.3.29__py3-none-any.whl

jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.3.28"
+__version__ = "0.3.29"

jarvis/jarvis_agent/__init__.py

@@ -34,7 +34,23 @@ from jarvis.jarvis_agent.prompt_manager import PromptManager
 from jarvis.jarvis_agent.event_bus import EventBus
 from jarvis.jarvis_agent.config import AgentConfig
 from jarvis.jarvis_agent.run_loop import AgentRunLoop
+from jarvis.jarvis_agent.events import (
+    BEFORE_SUMMARY,
+    AFTER_SUMMARY,
+    TASK_COMPLETED,
+    TASK_STARTED,
+    BEFORE_ADDON_PROMPT,
+    AFTER_ADDON_PROMPT,
+    BEFORE_HISTORY_CLEAR,
+    AFTER_HISTORY_CLEAR,
+    BEFORE_MODEL_CALL,
+    AFTER_MODEL_CALL,
+    INTERRUPT_TRIGGERED,
+    BEFORE_TOOL_FILTER,
+    TOOL_FILTERED,
+)
 from jarvis.jarvis_agent.user_interaction import UserInteractionHandler
+from jarvis.jarvis_agent.utils import join_prompts
 from jarvis.jarvis_utils.methodology import _load_all_methodologies
 
 # jarvis_platform 相关
@@ -212,6 +228,15 @@ class LoopAction(Enum):
 
 
 class Agent:
+    # Attribute type annotations to satisfy static type checkers
+    event_bus: EventBus
+    memory_manager: MemoryManager
+    task_analyzer: TaskAnalyzer
+    file_methodology_manager: FileMethodologyManager
+    prompt_manager: PromptManager
+    model: BasePlatform
+    session: SessionManager
+
     def clear_history(self):
         """
         Clears the current conversation history by delegating to the session manager.
@@ -219,7 +244,7 @@ class Agent:
         self.session.clear_history()
         # 广播清理历史后的事件
         try:
-            self.event_bus.emit("after_history_clear", agent=self)
+            self.event_bus.emit(AFTER_HISTORY_CLEAR, agent=self)
         except Exception:
             pass
 
@@ -342,12 +367,15 @@ class Agent:
         platform_name = get_normal_platform_name(model_group)
         model_name = get_normal_model_name(model_group)
 
-        self.model = PlatformRegistry().create_platform(platform_name)
-        if self.model is None:
+        maybe_model = PlatformRegistry().create_platform(platform_name)
+        if maybe_model is None:
             PrettyOutput.print(
                 f"平台 {platform_name} 不存在，将使用普通模型", OutputType.WARNING
             )
-            self.model = PlatformRegistry().get_normal_platform()
+            maybe_model = PlatformRegistry().get_normal_platform()
+
+        # 在此处收敛为非可选类型，确保后续赋值满足类型检查
+        self.model = maybe_model
 
         if model_name:
             self.model.set_model_name(model_name)
@@ -555,7 +583,7 @@ class Agent:
         # 广播添加附加提示前事件（不影响主流程）
         try:
             self.event_bus.emit(
-                "before_addon_prompt",
+                BEFORE_ADDON_PROMPT,
                 agent=self,
                 need_complete=need_complete,
                 current_message=message,
@@ -567,16 +595,16 @@ class Agent:
         addon_text = ""
         if self.session.addon_prompt:
             addon_text = self.session.addon_prompt
-            message += f"\n\n{addon_text}"
+            message = join_prompts([message, addon_text])
             self.session.addon_prompt = ""
         else:
             addon_text = self.make_default_addon_prompt(need_complete)
-            message += f"\n\n{addon_text}"
+            message = join_prompts([message, addon_text])
 
         # 广播添加附加提示后事件（不影响主流程）
         try:
             self.event_bus.emit(
-                "after_addon_prompt",
+                AFTER_ADDON_PROMPT,
                 agent=self,
                 need_complete=need_complete,
                 addon_text=addon_text,
@@ -593,7 +621,7 @@ class Agent:
         if self.session.conversation_length > self.max_token_count:
             summary = self._summarize_and_clear_history()
             if summary:
-                message = summary + "\n\n" + message
+                message = join_prompts([summary, message])
             self.session.conversation_length = get_context_token_count(message)
 
         return message
@@ -606,7 +634,7 @@ class Agent:
         # 事件：模型调用前
         try:
             self.event_bus.emit(
-                "before_model_call",
+                BEFORE_MODEL_CALL,
                 agent=self,
                 message=message,
             )
@@ -618,7 +646,7 @@ class Agent:
         # 事件：模型调用后
         try:
             self.event_bus.emit(
-                "after_model_call",
+                AFTER_MODEL_CALL,
                 agent=self,
                 message=message,
                 response=response,
@@ -697,7 +725,7 @@ class Agent:
         if self.model:
             # 广播清理历史前事件
             try:
-                self.event_bus.emit("before_history_clear", agent=self)
+                self.event_bus.emit(BEFORE_HISTORY_CLEAR, agent=self)
             except Exception:
                 pass
             self.model.reset()
@@ -707,7 +735,7 @@ class Agent:
         self.session.clear_history()
         # 广播清理历史后的事件
         try:
-            self.event_bus.emit("after_history_clear", agent=self)
+            self.event_bus.emit(AFTER_HISTORY_CLEAR, agent=self)
         except Exception:
             pass
 
@@ -717,13 +745,13 @@ class Agent:
         """使用文件上传方式处理历史"""
         # 广播清理历史前事件
         try:
-            self.event_bus.emit("before_history_clear", agent=self)
+            self.event_bus.emit(BEFORE_HISTORY_CLEAR, agent=self)
         except Exception:
             pass
         result = self.file_methodology_manager.handle_history_with_file_upload()
         # 广播清理历史后的事件
         try:
-            self.event_bus.emit("after_history_clear", agent=self)
+            self.event_bus.emit(AFTER_HISTORY_CLEAR, agent=self)
         except Exception:
             pass
         return result
@@ -771,7 +799,7 @@ class Agent:
             # 广播将要生成总结事件
             try:
                 self.event_bus.emit(
-                    "before_summary",
+                    BEFORE_SUMMARY,
                     agent=self,
                     prompt=self.session.prompt,
                     auto_completed=auto_completed,
@@ -788,7 +816,7 @@ class Agent:
             # 广播完成总结事件
             try:
                 self.event_bus.emit(
-                    "after_summary",
+                    AFTER_SUMMARY,
                     agent=self,
                     summary=result,
                 )
@@ -798,7 +826,7 @@ class Agent:
         # 广播任务完成事件（不影响主流程）
         try:
             self.event_bus.emit(
-                "task_completed",
+                TASK_COMPLETED,
                 agent=self,
                 auto_completed=auto_completed,
                 need_summary=self.need_summary,
@@ -842,6 +870,7 @@ class Agent:
     {complete_prompt}
     如果没有完成，请进行下一步操作：
     - 仅包含一个操作
+    - 不要询问用户是否继续，直接继续执行直至完成
     - 如果信息不明确，请请求用户补充
     - 如果执行过程中连续失败5次，请使用ask_user询问用户操作
     - 操作列表：{action_handlers}{memory_prompts}
@@ -873,7 +902,7 @@ class Agent:
             # 广播任务开始事件（不影响主流程）
             try:
                 self.event_bus.emit(
-                    "task_started",
+                    TASK_STARTED,
                     agent=self,
                     name=self.name,
                     description=self.description,
@@ -910,7 +939,7 @@ class Agent:
         # 广播中断事件（包含用户输入，可能为空字符串）
         try:
             self.event_bus.emit(
-                "interrupt_triggered",
+                INTERRUPT_TRIGGERED,
                 agent=self,
                 current_response=current_response,
                 user_input=user_input,
@@ -926,10 +955,16 @@ class Agent:
 
         if any(handler.can_handle(current_response) for handler in self.output_handler):
             if self.user_confirm("检测到有工具调用，是否继续处理工具调用？", True):
-                self.session.prompt = f"被用户中断，用户补充信息为：{user_input}\n\n用户同意继续工具调用。"
+                self.session.prompt = join_prompts([
+                    f"被用户中断，用户补充信息为：{user_input}",
+                    "用户同意继续工具调用。"
+                ])
                 return None  # 继续执行工具调用
             else:
-                self.session.prompt = f"被用户中断，用户补充信息为：{user_input}\n\n检测到有工具调用，但被用户拒绝执行。请根据用户的补充信息重新考虑下一步操作。"
+                self.session.prompt = join_prompts([
+                    f"被用户中断，用户补充信息为：{user_input}",
+                    "检测到有工具调用，但被用户拒绝执行。请根据用户的补充信息重新考虑下一步操作。"
+                ])
                 return LoopAction.SKIP_TURN  # 请求主循环 continue
         else:
             self.session.prompt = f"被用户中断，用户补充信息为：{user_input}"
@@ -1020,7 +1055,7 @@ class Agent:
         # 广播工具筛选开始事件
         try:
             self.event_bus.emit(
-                "before_tool_filter",
+                BEFORE_TOOL_FILTER,
                 agent=self,
                 task=task,
                 total_tools=len(all_tools),
@@ -1059,7 +1094,7 @@ class Agent:
                 # 广播工具筛选事件
                 try:
                     self.event_bus.emit(
-                        "tool_filtered",
+                        TOOL_FILTERED,
                         agent=self,
                         task=task,
                         selected_tools=selected_tool_names,
@@ -1075,7 +1110,7 @@ class Agent:
                 # 广播工具筛选事件（无筛选结果）
                 try:
                     self.event_bus.emit(
-                        "tool_filtered",
+                        TOOL_FILTERED,
                         agent=self,
                         task=task,
                         selected_tools=[],

jarvis/jarvis_agent/event_bus.py

@@ -8,7 +8,7 @@
 - 不引入额外依赖，便于在 Agent 中渐进集成
 """
 from collections import defaultdict
-from typing import Callable, DefaultDict, Dict, List
+from typing import Callable, DefaultDict, Dict, List, Any
 
 
 
@@ -36,7 +36,7 @@ class EventBus:
         except ValueError:
             pass
 
-    def emit(self, event: str, **payload: Dict) -> None:
+    def emit(self, event: str, **payload: Any) -> None:
         """
         广播事件。回调中的异常将被捕获并忽略，以保证主流程稳定。
         """

jarvis/jarvis_agent/events.py

@@ -0,0 +1,157 @@
+# -*- coding: utf-8 -*-
+"""
+事件主题与负载类型定义（jarvis_agent.events）
+
+目的：
+- 统一事件名称，避免在代码各处硬编码字符串导致的漂移
+- 提供事件负载的类型提示，便于静态检查与后续文档化
+- 本文件仅提供常量与类型定义，不改变现有行为
+"""
+from typing import Any, TypedDict, List
+
+# 事件主题常量
+BEFORE_TOOL_CALL = "before_tool_call"
+AFTER_TOOL_CALL = "after_tool_call"
+
+# 会话与任务生命周期相关
+TASK_STARTED = "task_started"
+TASK_COMPLETED = "task_completed"
+
+# 总结阶段
+BEFORE_SUMMARY = "before_summary"
+AFTER_SUMMARY = "after_summary"
+
+# 附加提示
+BEFORE_ADDON_PROMPT = "before_addon_prompt"
+AFTER_ADDON_PROMPT = "after_addon_prompt"
+
+# 历史清理
+BEFORE_HISTORY_CLEAR = "before_history_clear"
+AFTER_HISTORY_CLEAR = "after_history_clear"
+
+# 模型调用
+BEFORE_MODEL_CALL = "before_model_call"
+AFTER_MODEL_CALL = "after_model_call"
+
+# 其他
+INTERRUPT_TRIGGERED = "interrupt_triggered"
+BEFORE_TOOL_FILTER = "before_tool_filter"
+TOOL_FILTERED = "tool_filtered"
+
+
+# 事件负载类型（仅用于类型提示）
+class BeforeToolCallEvent(TypedDict, total=False):
+    agent: Any
+    current_response: str
+
+class AfterToolCallEvent(TypedDict, total=False):
+    agent: Any
+    current_response: str
+    need_return: bool
+    tool_prompt: str
+
+# 任务生命周期
+class TaskStartedEvent(TypedDict, total=False):
+    agent: Any
+    name: str
+    description: str
+    user_input: str
+
+class TaskCompletedEvent(TypedDict, total=False):
+    agent: Any
+    auto_completed: bool
+    need_summary: bool
+
+# 总结阶段
+class BeforeSummaryEvent(TypedDict, total=False):
+    agent: Any
+    prompt: str
+    auto_completed: bool
+    need_summary: bool
+
+class AfterSummaryEvent(TypedDict, total=False):
+    agent: Any
+    summary: str
+
+# 附加提示
+class BeforeAddonPromptEvent(TypedDict, total=False):
+    agent: Any
+    need_complete: bool
+    current_message: str
+    has_session_addon: bool
+
+class AfterAddonPromptEvent(TypedDict, total=False):
+    agent: Any
+    need_complete: bool
+    addon_text: str
+    final_message: str
+
+# 历史清理
+class BeforeHistoryClearEvent(TypedDict, total=False):
+    agent: Any
+
+class AfterHistoryClearEvent(TypedDict, total=False):
+    agent: Any
+
+# 模型调用
+class BeforeModelCallEvent(TypedDict, total=False):
+    agent: Any
+    message: str
+
+class AfterModelCallEvent(TypedDict, total=False):
+    agent: Any
+    message: str
+    response: str
+
+# 中断
+class InterruptTriggeredEvent(TypedDict, total=False):
+    agent: Any
+    current_response: str
+    user_input: str
+
+# 工具筛选
+class BeforeToolFilterEvent(TypedDict, total=False):
+    agent: Any
+    task: str
+    total_tools: int
+    threshold: int
+
+class ToolFilteredEvent(TypedDict, total=False):
+    agent: Any
+    task: str
+    selected_tools: List[str]
+    total_tools: int
+    threshold: int
+
+__all__ = [
+    "BEFORE_TOOL_CALL",
+    "AFTER_TOOL_CALL",
+    "TASK_STARTED",
+    "TASK_COMPLETED",
+    "BEFORE_SUMMARY",
+    "AFTER_SUMMARY",
+    "BEFORE_ADDON_PROMPT",
+    "AFTER_ADDON_PROMPT",
+    "BEFORE_HISTORY_CLEAR",
+    "AFTER_HISTORY_CLEAR",
+    "BEFORE_MODEL_CALL",
+    "AFTER_MODEL_CALL",
+    "INTERRUPT_TRIGGERED",
+    "BEFORE_TOOL_FILTER",
+    "TOOL_FILTERED",
+    "BeforeToolCallEvent",
+    "AfterToolCallEvent",
+    "TaskStartedEvent",
+    "TaskCompletedEvent",
+    "BeforeSummaryEvent",
+    "AfterSummaryEvent",
+    "BeforeAddonPromptEvent",
+    "AfterAddonPromptEvent",
+    "BeforeHistoryClearEvent",
+    "AfterHistoryClearEvent",
+    "BeforeModelCallEvent",
+    "AfterModelCallEvent",
+    "InterruptTriggeredEvent",
+    "BeforeToolFilterEvent",
+    "ToolFilteredEvent",
+]

jarvis/jarvis_agent/file_methodology_manager.py

@@ -8,6 +8,7 @@ import tempfile
 
 from jarvis.jarvis_utils.methodology import load_methodology, upload_methodology
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_agent.utils import join_prompts
 
 
 class FileMethodologyManager:
@@ -47,16 +48,25 @@ class FileMethodologyManager:
             # 上传成功
 
             if self.agent.files:
-                self.agent.session.prompt = f"{self.agent.session.prompt}\n\n上传的文件包含历史对话信息和方法论文件，可以从中获取一些经验信息。"
+                self.agent.session.prompt = join_prompts([
+                    self.agent.session.prompt,
+                    "上传的文件包含历史对话信息和方法论文件，可以从中获取一些经验信息。"
+                ])
             else:
-                self.agent.session.prompt = f"{self.agent.session.prompt}\n\n上传的文件包含历史对话信息，可以从中获取一些经验信息。"
+                self.agent.session.prompt = join_prompts([
+                    self.agent.session.prompt,
+                    "上传的文件包含历史对话信息，可以从中获取一些经验信息。"
+                ])
 
     def _handle_files_upload(self):
         """处理普通文件上传"""
         if not self.agent.model.upload_files(self.agent.files):  # type: ignore
             PrettyOutput.print("文件上传失败，将忽略文件列表", OutputType.WARNING)
         else:
-            self.agent.session.prompt = f"{self.agent.session.prompt}\n\n上传的文件包含历史对话信息，可以从中获取一些经验信息。"
+            self.agent.session.prompt = join_prompts([
+                self.agent.session.prompt,
+                "上传的文件包含历史对话信息，可以从中获取一些经验信息。"
+            ])
 
     def _handle_local_mode(self):
         """处理本地模式（不支持文件上传）"""
@@ -80,7 +90,10 @@ class FileMethodologyManager:
             platform_name=self.agent.model.platform_name(),
             model_name=self.agent.model.name(),
         )
-        self.agent.session.prompt = f"{self.agent.session.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{methodology}"
+        self.agent.session.prompt = join_prompts([
+            self.agent.session.prompt,
+            f"以下是历史类似问题的执行经验，可参考：\n{methodology}"
+        ])
 
     def handle_history_with_file_upload(self) -> str:
         """使用文件上传方式处理历史"""

jarvis/jarvis_agent/jarvis.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI 助手主入口模块"""
-from typing import Optional
+from typing import Optional, List
 
 import typer
 
@@ -391,7 +391,7 @@ def handle_builtin_config_selector(
                     if category == "roles":
                         count = opt.get("roles_count")
                         details_val = opt.get("details", "")
-                        parts: list[str] = []
+                        parts: List[str] = []
                         if isinstance(count, int) and count > 0:
                             parts.append(f"{count} 个角色")
                         if isinstance(details_val, str) and details_val:
@@ -442,7 +442,7 @@ def handle_builtin_config_selector(
                 if choice_index != -1:
                     try:
                         sel = options[choice_index]
-                        args: list[str] = []
+                        args: List[str] = []
 
                         if sel["category"] == "agent":
                             # jarvis-agent 支持 -f/--config（全局配置）与 -c/--agent-definition

jarvis/jarvis_agent/memory_manager.py

@@ -6,6 +6,7 @@
 
 from jarvis.jarvis_utils.globals import get_all_memory_tags
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_agent.events import TASK_STARTED, BEFORE_HISTORY_CLEAR, TASK_COMPLETED
 
 
 class MemoryManager:
@@ -159,11 +160,11 @@ class MemoryManager:
     def _subscribe_events(self) -> None:
         bus = self.agent.get_event_bus()  # type: ignore[attr-defined]
         # 任务开始时重置去重标记
-        bus.subscribe("task_started", self._on_task_started)
+        bus.subscribe(TASK_STARTED, self._on_task_started)
         # 在清理历史前尝试保存记忆（若开启强制保存且尚未处理）
-        bus.subscribe("before_history_clear", self._ensure_memory_prompt)
+        bus.subscribe(BEFORE_HISTORY_CLEAR, self._ensure_memory_prompt)
         # 任务完成时作为兜底再尝试一次
-        bus.subscribe("task_completed", self._ensure_memory_prompt)
+        bus.subscribe(TASK_COMPLETED, self._ensure_memory_prompt)
 
     def _on_task_started(self, **payload) -> None:
         self._memory_prompted = False

jarvis/jarvis_agent/prompts.py

@@ -81,7 +81,7 @@ TASK_ANALYSIS_PROMPT = f"""<task_analysis>
 2. 方法论应该具备足够的通用性，可应用于同类问题
 3. 特别注意用户在执行过程中提供的修正、反馈和改进建议
 4. 如果用户明确指出了某个解决步骤的优化方向，这应该被纳入方法论
-5. 方法论要严格按照实际的执行流程来总结，不要遗漏或增加任何步骤
+5. 方法论应面向未来复用，总结“下次遇到同类问题应该如何处理”的通用流程与检查清单，避免局限于本次执行细节
 </evaluation_criteria>
 <tool_requirements>
 工具代码要求:
@@ -157,7 +157,7 @@ TASK_ANALYSIS_PROMPT = f"""<task_analysis>
 <methodology_requirements>
 方法论格式要求:
 1. 问题重述: 简明扼要的问题归纳，不含特定细节
-2. 最优解决方案: 经过用户验证的、最终有效的解决方案（将每个步骤要使用的工具也列举出来）
+2. 可复用解决流程: 面向“下次遇到同类问题”的步骤化方案（列出每步可用的工具），避免与本次特定上下文绑定
 3. 注意事项: 执行中可能遇到的常见问题和注意点，尤其是用户指出的问题
 4. 可选步骤: 对于有多种解决路径的问题，标注出可选步骤和适用场景
 </methodology_requirements>

jarvis/jarvis_agent/protocols.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
-from typing import Any, Protocol, Tuple
+from typing import Any, Protocol, Tuple, runtime_checkable
 
 
+@runtime_checkable
 class OutputHandlerProtocol(Protocol):
     """
     Defines the interface for an output handler, which is responsible for
@@ -28,3 +29,5 @@ class OutputHandlerProtocol(Protocol):
             A tuple containing a boolean (whether to return) and the result.
         """
         ...
+        
+__all__ = ["OutputHandlerProtocol"]

jarvis/jarvis_agent/run_loop.py

@@ -11,7 +11,8 @@ from enum import Enum
 from typing import Any, TYPE_CHECKING
 
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.tag import ot
+from jarvis.jarvis_agent.events import BEFORE_TOOL_CALL, AFTER_TOOL_CALL
+from jarvis.jarvis_agent.utils import join_prompts, is_auto_complete, normalize_next_action
 
 if TYPE_CHECKING:
     # 仅用于类型标注，避免运行时循环依赖
@@ -63,7 +64,7 @@ class AgentRunLoop:
                 # 广播工具调用前事件（不影响主流程）
                 try:
                     ag.event_bus.emit(
-                        "before_tool_call",
+                        BEFORE_TOOL_CALL,
                         agent=ag,
                         current_response=current_response,
                     )
@@ -72,12 +73,7 @@ class AgentRunLoop:
                 need_return, tool_prompt = ag._call_tools(current_response)
 
                 # 将上一个提示和工具提示安全地拼接起来
-                prompt_parts = []
-                if ag.session.prompt:
-                    prompt_parts.append(ag.session.prompt)
-                if tool_prompt:
-                    prompt_parts.append(tool_prompt)
-                ag.session.prompt = "\n\n".join(prompt_parts)
+                ag.session.prompt = join_prompts([ag.session.prompt, tool_prompt])
 
                 if need_return:
                     return ag.session.prompt
@@ -88,7 +84,7 @@ class AgentRunLoop:
                 # 广播工具调用后的事件（不影响主流程）
                 try:
                     ag.event_bus.emit(
-                        "after_tool_call",
+                        AFTER_TOOL_CALL,
                         agent=ag,
                         current_response=current_response,
                         need_return=need_return,
@@ -102,27 +98,16 @@ class AgentRunLoop:
                     continue
 
                 # 检查自动完成
-                if ag.auto_complete and ot("!!!COMPLETE!!!") in current_response:
+                if ag.auto_complete and is_auto_complete(current_response):
                     return ag._complete_task(auto_completed=True)
 
                 # 获取下一步用户输入
                 next_action = ag._get_next_user_action()
-                if (
-                    next_action == "continue"
-                    or (
-                        isinstance(next_action, Enum)
-                        and getattr(next_action, "value", None) == "continue"
-                    )
-                ):
+                action = normalize_next_action(next_action)
+                if action == "continue":
                     run_input_handlers = True
                     continue
-                elif (
-                    next_action == "complete"
-                    or (
-                        isinstance(next_action, Enum)
-                        and getattr(next_action, "value", None) == "complete"
-                    )
-                ):
+                elif action == "complete":
                     return ag._complete_task(auto_completed=False)
 
             except Exception as e:

jarvis/jarvis_agent/shell_input_handler.py

@@ -3,6 +3,7 @@ from typing import Any, Tuple
 
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.input import user_confirm
+from jarvis.jarvis_agent.utils import join_prompts
 
 
 def shell_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
@@ -41,7 +42,11 @@ def shell_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
             )
             if user_confirm("是否将执行结果反馈给Agent？", default=True):
                 return (
-                    f"{user_input}\n\n用户执行以下脚本：\n{script}\n\n执行结果：\n{output}",
+                    join_prompts([
+                        user_input,
+                        f"用户执行以下脚本：\n{script}",
+                        f"执行结果：\n{output}",
+                    ]),
                     False,
                 )
             return "", True