jarvis-ai-assistant 0.1.174__py3-none-any.whl → 0.1.175__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_agent/__init__.py

@@ -11,7 +11,7 @@ from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.output import PrettyOutput, OutputType
 from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.config import get_max_tool_call_count, is_auto_complete, is_execute_tool_confirm
-from jarvis.jarvis_utils.methodology import load_methodology
+from jarvis.jarvis_utils.methodology import load_methodology, upload_methodology
 from jarvis.jarvis_utils.globals import make_agent_name, set_agent, delete_agent
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.config import get_max_token_count
@@ -645,7 +645,7 @@ want: 创建新工具来解决XXX问题
 name: generate_new_tool
 arguments:
   tool_name: 工具名称
-  tool_code: |
+  tool_code: |2
     # -*- coding: utf-8 -*-
     from typing import Dict, Any
     from jarvis.jarvis_utils.output import PrettyOutput, OutputType
@@ -699,96 +699,12 @@ name: methodology
 arguments:
   operation: add/update
   problem_type: 方法论类型，不要过于细节，也不要过于泛化
-  content: |
+  content: |2
     方法论内容
 {ct("TOOL_CALL")}
 
 如果以上三种情况都不适用，则直接输出原因分析，不要使用工具调用格式。
 </output_requirements>
-
-<tool_example>
-以下是一个完整的工具示例，供参考：
-
-```python
-# -*- coding: utf-8 -*-
-from typing import Dict, Any
-from jarvis.jarvis_utils.output import PrettyOutput, OutputType
-
-class text_transformer:
-    name = "text_transformer"
-    description = "Tool for text transformation"
-    Tool description for text transformation
-    适用场景：1. 格式化文本; 2. 处理标题; 3. 标准化输出
-    \"\"\"
-    
-    parameters = {{
-        "type": "object",
-        "properties": {{
-            "text": {{
-                "type": "string",
-                "description": "需要转换格式的文本"
-            }},
-            "transform_type": {{
-                "type": "string",
-                "description": "转换类型，可选值为 upper（大写）、lower（小写）或 title（首字母大写）",
-                "enum": ["upper", "lower", "title"]
-            }}
-        }},
-        "required": ["text", "transform_type"]
-    }}
-    
-    @staticmethod
-    def check() -> bool:
-        return True
-    
-    def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
-        try:
-            text = args["text"]
-            transform_type = args["transform_type"]
-            
-            # 使用PrettyOutput显示执行过程
-            PrettyOutput.print(f"正在将文本转换为 {{transform_type}} 格式...", OutputType.INFO)
-            
-            if transform_type == "upper":
-                result = text.upper()
-                PrettyOutput.print("文本已转换为大写", OutputType.SUCCESS)
-            elif transform_type == "lower":
-                result = text.lower()
-                PrettyOutput.print("文本已转换为小写", OutputType.SUCCESS)
-            elif transform_type == "title":
-                result = text.title()
-                PrettyOutput.print("文本已转换为首字母大写", OutputType.SUCCESS)
-            else:
-                PrettyOutput.print(f"不支持的转换类型: {{transform_type}}", OutputType.ERROR)
-                return {{
-                    "success": False,
-                    "stdout": "",
-                    "stderr": f"不支持的转换类型: {{transform_type}}"
-                }}
-            
-            return {{
-                "success": True,
-                "stdout": result,
-                "stderr": ""
-            }}
-            
-        except Exception as e:
-            PrettyOutput.print(f"转换失败: {{str(e)}}", OutputType.ERROR)
-            return {{
-                "success": False,
-                "stdout": "",
-                "stderr": f"转换失败: {{str(e)}}"
-            }}
-```
-
-使用方法：
-```
-name: text_transformer
-arguments:
-    text: hello world
-    transform_type: upper
-```
-</tool_example>
 </task_analysis>"""
 
                 self.prompt = analysis_prompt
@@ -838,7 +754,16 @@ arguments:
                 msg = user_input
                 for handler in self.input_handler:
                     msg, _ = handler(msg, self)
-                self.prompt = f"{user_input}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}"
+                
+                # 先尝试上传方法轮
+                platform = self.model if hasattr(self.model, 'upload_files') else None
+                if platform and upload_methodology(platform):
+                    methodology_prompt = f"{user_input}\n\n方法论已上传到平台，请参考平台上的方法论内容"
+                else:
+                    # 上传失败则回退到本地加载
+                    methodology_prompt = f"{user_input}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}"
+                
+                self.prompt = methodology_prompt
                 self.first = False
 
             self.conversation_length = get_context_token_count(self.prompt)

jarvis/jarvis_code_agent/code_agent.py

@@ -374,7 +374,8 @@ class CodeAgent:
                     final_ret += f"# 应用补丁:\n```diff\n{diff}\n```"
 
                     # 修改后的提示逻辑
-                    addon_prompt = f"如果用户的需求未完成，请继续生成补丁，如果已经完成，请终止，不要输出新的PATCH，不要实现任何超出用户需求外的内容\n"
+                    addon_prompt = "如果对应语言有静态检查工具，请使用静态检查工具检查代码，如果本次修改引入了警告和错误，请根据警告和错误信息修复代码\n"
+                    addon_prompt += "在引入警告和错误都被修复的前提下，如果用户的需求未完成，请继续生成补丁，如果已经完成，请终止，不要实现任何超出用户需求外的内容\n"
                     addon_prompt += "如果有任何信息不明确，调用工具获取信息\n"
                     addon_prompt += "每次响应必须且只能包含一个操作\n"
 

jarvis/jarvis_dev/main.py

@@ -125,7 +125,7 @@ PM_PROMPT = f"""
 ## 消息传递模板
 {ot("SEND_MESSAGE")}
 to: [角色]
-content: |
+content: |2
   # [任务主题]
 
   ## 背景与目标
@@ -259,7 +259,7 @@ BA_PROMPT = f"""
 ## 消息传递模板
 {ot("SEND_MESSAGE")}
 to: [角色]
-content: |
+content: |2
   # [需求主题]
 
   ## 背景与目标
@@ -415,7 +415,7 @@ SA_PROMPT = f"""
 ## 消息传递模板
 {ot("SEND_MESSAGE")}
 to: [角色]
-content: |
+content: |2
   # [架构主题]
 
   ## 背景与目标
@@ -571,7 +571,7 @@ TL_PROMPT = f"""
 ## 消息传递模板
 {ot("SEND_MESSAGE")}
 to: [角色]
-content: |
+content: |2
   # [技术主题]
 
   ## 背景与目标
@@ -750,7 +750,7 @@ arguments:
 ## 消息传递模板
 {ot("SEND_MESSAGE")}
 to: [角色]
-content: |
+content: |2
   # [开发主题]
 
   ## 背景与目标
@@ -931,7 +931,7 @@ arguments:
 ## 消息传递模板
 {ot("SEND_MESSAGE")}
 to: [角色]
-content: |
+content: |2
   # [测试主题]
 
   ## 背景与目标

jarvis/jarvis_methodology/main.py

@@ -95,10 +95,10 @@ def extract_methodology(input_file):
 请按以下格式返回结果：
 <methodologies>
 - problem_type: [问题类型1]
-  content: |
+  content: |2
     [多行方法论内容1]
 - problem_type: [问题类型2]
-  content: |
+  content: |2
     [多行方法论内容2]
 </methodologies>
 
@@ -192,10 +192,10 @@ def extract_methodology_from_url(url):
 请按以下格式返回结果：
 <methodologies>
 - problem_type: [问题类型1]
-  content: |
+  content: |2
     [多行方法论内容1]
 - problem_type: [问题类型2]
-  content: |
+  content: |2
     [多行方法论内容2]
 </methodologies>
 

jarvis/jarvis_multi_agent/__init__.py

@@ -33,23 +33,18 @@ class MultiAgent(OutputHandler):
 ```
 {ot("SEND_MESSAGE")}
 to: 智能体名称    # 目标智能体名称
-content: |
-    # 消息主题
-
-    ## 背景信息
-    [提供必要的上下文和背景]
-
-    ## 具体需求
-    [明确表达期望完成的任务]
-
-    ## 相关资源
-    [列出相关文档、数据或工具]
-
-    ## 期望结果
-    [描述期望的输出格式和内容]
-
-    ## 下一步计划
-    [描述下一步的计划和行动]
+content: |2
+  # 消息主题
+  ## 背景信息
+  [提供必要的上下文和背景]
+  ## 具体需求
+  [明确表达期望完成的任务]
+  ## 相关资源
+  [列出相关文档、数据或工具]
+  ## 期望结果
+  [描述期望的输出格式和内容]
+  ## 下一步计划
+  [描述下一步的计划和行动]
 {ct("SEND_MESSAGE")}
 ```
 
@@ -58,11 +53,10 @@ content: |
 ```
 {ot("SEND_MESSAGE")}
 to: 智能体名称    # 目标智能体名称
-content: |
-    # 消息主题
-
-    ## 任务结果
-    [任务完成结果，用于反馈]
+content: |2
+  # 消息主题
+  ## 任务结果
+  [任务完成结果，用于反馈]
 {ct("SEND_MESSAGE")}
 ```
 

jarvis/jarvis_platform/kimi.py

@@ -5,6 +5,10 @@ import json
 import os
 import mimetypes
 import time
+from rich.live import Live
+from rich.text import Text
+from rich.panel import Panel
+from rich import box
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import while_success
@@ -281,61 +285,127 @@ class KimiModel(BasePlatform):
             search_results = []
             ref_sources = []
 
-            for line in response.iter_lines():
-                if not line:
-                    continue
-
-                line = line.decode('utf-8')
-                if not line.startswith("data: "):
-                    continue
-
-                try:
-                    data = json.loads(line[6:])
-                    event = data.get("event")
-
-                    if event == "cmpl":
-                        # 处理补全文本
-                        text = data.get("text", "")
-                        if text:
-                            if not self.suppress_output:
-                                PrettyOutput.print_stream(text)
-                            full_response += text
-
-                    elif event == "search_plus":
-                        # 收集搜索结果
-                        msg = data.get("msg", {})
-                        if msg.get("type") == "get_res":
-                            search_results.append({
-                                "date": msg.get("date", ""),
-                                "site_name": msg.get("site_name", ""),
-                                "snippet": msg.get("snippet", ""),
-                                "title": msg.get("title", ""),
-                                "type": msg.get("type", ""),
-                                "url": msg.get("url", "")
-                            })
-
-                    elif event == "ref_docs":
-                        # 收集引用来源
-                        ref_cards = data.get("ref_cards", [])
-                        for card in ref_cards:
-                            ref_sources.append({
-                                "idx_s": card.get("idx_s", ""),
-                                "idx_z": card.get("idx_z", ""),
-                                "ref_id": card.get("ref_id", ""),
-                                "url": card.get("url", ""),
-                                "title": card.get("title", ""),
-                                "abstract": card.get("abstract", ""),
-                                "source": card.get("source_label", ""),
-                                "rag_segments": card.get("rag_segments", []),
-                                "origin": card.get("origin", {})
-                            })
-
-                except json.JSONDecodeError:
-                    continue
-
+            # 使用Rich的Live组件来实时展示更新
             if not self.suppress_output:
-                PrettyOutput.print_stream_end()
-
+                text_content = Text()
+                panel = Panel(text_content, 
+                            title=f"[bold magenta]{self.model_name}[/bold magenta]", 
+                            subtitle="思考中...", 
+                            border_style="magenta", 
+                            box=box.ROUNDED)
+                
+                with Live(panel, refresh_per_second=3, transient=False) as live:
+                    for line in response.iter_lines():
+                        if not line:
+                            continue
+
+                        line = line.decode('utf-8')
+                        if not line.startswith("data: "):
+                            continue
+
+                        try:
+                            data = json.loads(line[6:])
+                            event = data.get("event")
+
+                            if event == "cmpl":
+                                # 处理补全文本
+                                text = data.get("text", "")
+                                if text:
+                                    full_response += text
+                                    text_content.append(text)
+                                    panel.subtitle = "生成中..."
+                                    live.update(panel)
+
+                            elif event == "search_plus":
+                                # 收集搜索结果
+                                msg = data.get("msg", {})
+                                if msg.get("type") == "get_res":
+                                    search_results.append({
+                                        "date": msg.get("date", ""),
+                                        "site_name": msg.get("site_name", ""),
+                                        "snippet": msg.get("snippet", ""),
+                                        "title": msg.get("title", ""),
+                                        "type": msg.get("type", ""),
+                                        "url": msg.get("url", "")
+                                    })
+                                    panel.subtitle = f"搜索中: 找到 {len(search_results)} 个结果"
+                                    live.update(panel)
+
+                            elif event == "ref_docs":
+                                # 收集引用来源
+                                ref_cards = data.get("ref_cards", [])
+                                for card in ref_cards:
+                                    ref_sources.append({
+                                        "idx_s": card.get("idx_s", ""),
+                                        "idx_z": card.get("idx_z", ""),
+                                        "ref_id": card.get("ref_id", ""),
+                                        "url": card.get("url", ""),
+                                        "title": card.get("title", ""),
+                                        "abstract": card.get("abstract", ""),
+                                        "source": card.get("source_label", ""),
+                                        "rag_segments": card.get("rag_segments", []),
+                                        "origin": card.get("origin", {})
+                                    })
+                                    panel.subtitle = f"分析引用: 找到 {len(ref_sources)} 个来源"
+                                    live.update(panel)
+
+                        except json.JSONDecodeError:
+                            continue
+                    
+                    # 显示对话完成状态
+                    panel.subtitle = "[bold green]回答完成[/bold green]"
+                    live.update(panel)
+            else:
+                # 如果禁止输出，则静默处理
+                for line in response.iter_lines():
+                    if not line:
+                        continue
+
+                    line = line.decode('utf-8')
+                    if not line.startswith("data: "):
+                        continue
+
+                    try:
+                        data = json.loads(line[6:])
+                        event = data.get("event")
+
+                        if event == "cmpl":
+                            # 处理补全文本
+                            text = data.get("text", "")
+                            if text:
+                                full_response += text
+
+                        elif event == "search_plus":
+                            # 收集搜索结果
+                            msg = data.get("msg", {})
+                            if msg.get("type") == "get_res":
+                                search_results.append({
+                                    "date": msg.get("date", ""),
+                                    "site_name": msg.get("site_name", ""),
+                                    "snippet": msg.get("snippet", ""),
+                                    "title": msg.get("title", ""),
+                                    "type": msg.get("type", ""),
+                                    "url": msg.get("url", "")
+                                })
+
+                        elif event == "ref_docs":
+                            # 收集引用来源
+                            ref_cards = data.get("ref_cards", [])
+                            for card in ref_cards:
+                                ref_sources.append({
+                                    "idx_s": card.get("idx_s", ""),
+                                    "idx_z": card.get("idx_z", ""),
+                                    "ref_id": card.get("ref_id", ""),
+                                    "url": card.get("url", ""),
+                                    "title": card.get("title", ""),
+                                    "abstract": card.get("abstract", ""),
+                                    "source": card.get("source_label", ""),
+                                    "rag_segments": card.get("rag_segments", []),
+                                    "origin": card.get("origin", {})
+                                })
+
+                    except json.JSONDecodeError:
+                        continue
 
             # 显示搜索结果摘要
             if search_results and not self.suppress_output:

jarvis/jarvis_platform/openai.py

@@ -2,6 +2,10 @@
 from typing import Dict, List, Tuple
 import os
 from openai import OpenAI
+from rich.live import Live
+from rich.text import Text
+from rich.panel import Panel
+from rich import box
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
@@ -84,15 +88,32 @@ class OpenAIModel(BasePlatform):
 
             full_response = ""
 
-            for chunk in response:
-                if chunk.choices and chunk.choices[0].delta.content:
-                    text = chunk.choices[0].delta.content
-                    if not self.suppress_output:
-                        PrettyOutput.print_stream(text)
-                    full_response += text
-
+            # 使用Rich的Live组件来实时展示更新
             if not self.suppress_output:
-                PrettyOutput.print_stream_end()
+                text_content = Text()
+                panel = Panel(text_content, 
+                              title=f"[bold blue]{self.model_name}[/bold blue]", 
+                              subtitle="生成中...", 
+                              border_style="cyan", 
+                              box=box.ROUNDED)
+                
+                with Live(panel, refresh_per_second=3, transient=False) as live:
+                    for chunk in response:
+                        if chunk.choices and chunk.choices[0].delta.content:
+                            text = chunk.choices[0].delta.content
+                            full_response += text
+                            text_content.append(text)
+                            live.update(panel)
+                    
+                    # 显示对话完成状态
+                    panel.subtitle = "[bold green]对话完成[/bold green]"
+                    live.update(panel)
+            else:
+                # 如果禁止输出，则静默处理
+                for chunk in response:
+                    if chunk.choices and chunk.choices[0].delta.content:
+                        text = chunk.choices[0].delta.content
+                        full_response += text
 
             # Add assistant reply to history
             self.messages.append({"role": "assistant", "content": full_response})

jarvis/jarvis_platform/yuanbao.py

@@ -11,6 +11,10 @@ from PIL import Image
 from yaspin import yaspin
 from yaspin.spinners import Spinners
 from yaspin.api import Yaspin
+from rich.live import Live
+from rich.text import Text
+from rich.panel import Panel
+from rich import box
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import while_success
@@ -387,7 +391,6 @@ class YuanbaoPlatform(BasePlatform):
         
         参数:
             message: 要发送的消息文本
-            file_list: 可选的上传和附加文件路径列表
             
         返回:
             模型的响应
@@ -425,7 +428,9 @@ class YuanbaoPlatform(BasePlatform):
         self.multimedia = []
 
         if self.web:
-            payload["supportFunctions"] = ["supportInternetSearch"]
+            payload["supportFunctions"] = ["openInternetSearch"]
+        else:
+            payload["supportFunctions"] = ["autoInternetSearch"]
 
         # 添加系统消息（如果是第一次对话）
         if self.first_chat and self.system_message:
@@ -449,45 +454,82 @@ class YuanbaoPlatform(BasePlatform):
 
             full_response = ""
             is_text_block = False
+            thinking_content = ""
 
-            # 处理SSE流响应
-            for line in response.iter_lines():
-                if not line:
-                    continue
-
-                line_str = line.decode('utf-8')
-
-                # SSE格式的行通常以"data: "开头
-                if line_str.startswith("data: "):
-                    try:
-                        data_str = line_str[6:]  # 移除"data: "前缀
-                        data = json.loads(data_str)
-
-                        # 处理文本类型的消息
-                        if data.get("type") == "text":
-                            is_text_block = True
-                            msg = data.get("msg", "")
-                            if msg:
-                                if not self.suppress_output:
-                                    PrettyOutput.print_stream(msg)
-                                full_response += msg
-
-                        # 处理思考中的消息（可选展示）
-                        elif data.get("type") == "think" and not self.suppress_output:
-                            think_content = data.get("content", "")
-                            # 可以选择性地显示思考过程，但不加入最终响应
-                            PrettyOutput.print_stream(f"{think_content}", is_thinking=True)
-                            pass
+            # 使用Rich的Live组件来实时展示更新
+            if not self.suppress_output:
+                text_content = Text()
+                panel = Panel(text_content, title=f"[bold blue]{self.model_name}[/bold blue]", 
+                          subtitle="思考中...", border_style="blue", box=box.ROUNDED)
+                with Live(panel, refresh_per_second=3, transient=False) as live:
+                    # 处理SSE流响应
+                    for line in response.iter_lines():
+                        if not line:
+                            continue
+
+                        line_str = line.decode('utf-8')
+
+                        # SSE格式的行通常以"data: "开头
+                        if line_str.startswith("data: "):
+                            try:
+                                data_str = line_str[6:]  # 移除"data: "前缀
+                                data = json.loads(data_str)
+
+                                # 处理文本类型的消息
+                                if data.get("type") == "text":
+                                    is_text_block = True
+                                    msg = data.get("msg", "")
+                                    if msg:
+                                        full_response += msg
+                                        text_content.append(msg)
+                                        panel.subtitle = "正在回答..."
+                                        live.update(panel)
+
+                                # 处理思考中的消息
+                                elif data.get("type") == "think":
+                                    think_content = data.get("content", "")
+                                    if think_content:
+                                        thinking_content = think_content
+                                        panel.subtitle = f"思考中: {thinking_content}"
+                                        live.update(panel)
+
+                            except json.JSONDecodeError:
+                                pass
+
+                        # 检测结束标志
+                        elif line_str == "data: [DONE]":
+                            break
+                    
+                    # 显示对话完成状态
+                    panel.subtitle = "[bold green]对话完成[/bold green]"
+                    live.update(panel)
+            else:
+                # 如果禁止输出，则静默处理
+                for line in response.iter_lines():
+                    if not line:
+                        continue
 
-                    except json.JSONDecodeError:
-                        pass
+                    line_str = line.decode('utf-8')
 
-                # 检测结束标志
-                elif line_str == "data: [DONE]":
-                    break
+                    # SSE格式的行通常以"data: "开头
+                    if line_str.startswith("data: "):
+                        try:
+                            data_str = line_str[6:]  # 移除"data: "前缀
+                            data = json.loads(data_str)
 
-            if not self.suppress_output:
-                PrettyOutput.print_stream_end()
+                            # 处理文本类型的消息
+                            if data.get("type") == "text":
+                                is_text_block = True
+                                msg = data.get("msg", "")
+                                if msg:
+                                    full_response += msg
+
+                        except json.JSONDecodeError:
+                            pass
+
+                    # 检测结束标志
+                    elif line_str == "data: [DONE]":
+                        break
 
             return full_response
 

jarvis/jarvis_platform_manager/main.py

@@ -51,6 +51,7 @@ def list_platforms():
 def chat_with_model(platform_name: str, model_name: str):
     """Chat with specified platform and model"""
     registry = PlatformRegistry.get_global_platform_registry()
+    conversation_history = []  # 存储对话记录
 
     # Create platform instance
     platform = registry.create_platform(platform_name)
@@ -63,12 +64,13 @@ def chat_with_model(platform_name: str, model_name: str):
         platform.set_model_name(model_name)
         platform.set_suppress_output(False)
         PrettyOutput.print(f"连接到 {platform_name} 平台 {model_name} 模型", OutputType.SUCCESS)
-        PrettyOutput.print("可用命令: /bye - 退出聊天, /clear - 清除会话, /upload - 上传文件, /shell - 执行shell命令", OutputType.INFO)
+        PrettyOutput.print("可用命令: /bye - 退出聊天, /clear - 清除会话, /upload - 上传文件, /shell - 执行shell命令, /save - 保存当前对话, /saveall - 保存所有对话", OutputType.INFO)
 
         # Start conversation loop
         while True:
             # Get user input
             user_input = get_multiline_input("")
+            conversation_history.append({"role": "user", "content": user_input})  # 记录用户输入
 
             # Check if input is cancelled
             if user_input.strip() == "/bye":
@@ -84,6 +86,7 @@ def chat_with_model(platform_name: str, model_name: str):
                 try:
                     platform.reset()
                     platform.set_model_name(model_name)  # Reinitialize session
+                    conversation_history = []  # 重置对话记录
                     PrettyOutput.print("会话已清除", OutputType.SUCCESS)
                 except Exception as e:
                     PrettyOutput.print(f"清除会话失败: {str(e)}", OutputType.ERROR)
@@ -110,6 +113,52 @@ def chat_with_model(platform_name: str, model_name: str):
                     PrettyOutput.print(f"上传文件失败: {str(e)}", OutputType.ERROR)
                 continue
 
+            # Check if it is a save command
+            if user_input.strip().startswith("/save"):
+                try:
+                    file_path = user_input.strip()[5:].strip()
+                    if not file_path:
+                        PrettyOutput.print("请指定保存文件名，例如: /save last_message.txt", OutputType.WARNING)
+                        continue
+                    
+                    # Remove quotes if present
+                    if (file_path.startswith('"') and file_path.endswith('"')) or (file_path.startswith("'") and file_path.endswith("'")):
+                        file_path = file_path[1:-1]
+                    
+                    # Write last message content to file
+                    if conversation_history:
+                        with open(file_path, 'w', encoding='utf-8') as f:
+                            last_entry = conversation_history[-1]
+                            f.write(f"{last_entry['content']}\n")
+                        PrettyOutput.print(f"最后一条消息内容已保存到 {file_path}", OutputType.SUCCESS)
+                    else:
+                        PrettyOutput.print("没有可保存的消息", OutputType.WARNING)
+                except Exception as e:
+                    PrettyOutput.print(f"保存消息失败: {str(e)}", OutputType.ERROR)
+                continue
+
+            # Check if it is a saveall command
+            if user_input.strip().startswith("/saveall"):
+                try:
+                    file_path = user_input.strip()[8:].strip()
+                    if not file_path:
+                        PrettyOutput.print("请指定保存文件名，例如: /saveall all_conversations.txt", OutputType.WARNING)
+                        continue
+                    
+                    # Remove quotes if present
+                    if (file_path.startswith('"') and file_path.endswith('"')) or (file_path.startswith("'") and file_path.endswith("'")):
+                        file_path = file_path[1:-1]
+                    
+                    # Write full conversation history to file
+                    with open(file_path, 'w', encoding='utf-8') as f:
+                        for entry in conversation_history:
+                            f.write(f"{entry['role']}: {entry['content']}\n\n")
+                    
+                    PrettyOutput.print(f"所有对话已保存到 {file_path}", OutputType.SUCCESS)
+                except Exception as e:
+                    PrettyOutput.print(f"保存所有对话失败: {str(e)}", OutputType.ERROR)
+                continue
+
             # Check if it is a shell command
             if user_input.strip().startswith("/shell"):
                 try:
@@ -133,6 +182,8 @@ def chat_with_model(platform_name: str, model_name: str):
                 response = platform.chat_until_success(user_input)
                 if not response:
                     PrettyOutput.print("没有有效的回复", OutputType.WARNING)
+                else:
+                    conversation_history.append({"role": "assistant", "content": response})  # 记录模型回复
 
             except Exception as e:
                 PrettyOutput.print(f"聊天失败: {str(e)}", OutputType.ERROR)

jarvis/jarvis_tools/registry.py

@@ -33,8 +33,8 @@ tool_call_help = f"""
 want: 想要从执行结果中获取到的信息，如果工具输出内容过长，会根据此字段尝试提取有效信息
 name: 工具名称
 arguments:
-    param1: 值1
-    param2: 值2
+  param1: 值1
+  param2: 值2
 {ct("TOOL_CALL")}
 </format>
 
@@ -49,7 +49,7 @@ arguments:
 <rule>
 ### 2. 严格遵守格式
 - 完全按照上述格式
-- 使用正确的YAML缩进
+- 使用正确的YAML格式，2个空格作为缩进
 - 包含所有必需参数
 </rule>
 
@@ -72,15 +72,15 @@ arguments:
 
 <string_format>
 # 📝 字符串参数格式
-始终使用 | 语法表示字符串参数：
+始终使用 |2 语法表示字符串参数，防止多行字符串行首空格引起歧义：
 
 {ot("TOOL_CALL")}
 want: 当前的git状态，期望获取xxx的提交记录
 name: execute_script
 arguments:
-    interpreter: bash
-    script_cotent: |
-        git status --porcelain
+  interpreter: bash
+  script_cotent: |2
+    git status --porcelain
 {ct("TOOL_CALL")}
 </string_format>
 
@@ -96,7 +96,7 @@ arguments:
 <common_errors>
 # ⚠️ 常见错误
 - 同时调用多个工具
-- 字符串参数缺少 |
+- 字符串参数缺少 |2
 - 假设工具结果
 - 创建虚构对话
 - 在没有所需信息的情况下继续

jarvis/jarvis_utils/methodology.py

@@ -12,6 +12,7 @@ import json
 import tempfile
 from typing import Any, Dict, Optional
 
+from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_utils.config import get_data_dir
 from jarvis.jarvis_utils.output import PrettyOutput, OutputType
 from jarvis.jarvis_platform.registry import PlatformRegistry
@@ -92,6 +93,42 @@ def _create_methodology_temp_file(methodologies: Dict[str, str]) -> Optional[str
         PrettyOutput.print(f"创建方法论临时文件失败: {str(e)}", OutputType.ERROR)
         return None
 
+def upload_methodology(platform: BasePlatform) -> bool:
+    """
+    上传方法论文件到指定平台
+    
+    参数：
+        platform: 平台实例，需实现upload_files方法
+    
+    返回：
+        bool: 上传是否成功
+    """
+    methodology_dir = _get_methodology_directory()
+    if not os.path.exists(methodology_dir):
+        PrettyOutput.print("方法论文档不存在", OutputType.WARNING)
+        return False
+    
+    methodologies = _load_all_methodologies()
+    if not methodologies:
+        PrettyOutput.print("没有可用的方法论文档", OutputType.WARNING)
+        return False
+    
+    temp_file_path = _create_methodology_temp_file(methodologies)
+    if not temp_file_path:
+        return False
+    
+    try:
+        if hasattr(platform, 'upload_files'):
+            return platform.upload_files([temp_file_path])
+        return False
+    finally:
+        if temp_file_path and os.path.exists(temp_file_path):
+            try:
+                os.remove(temp_file_path)
+            except Exception:
+                pass
+
+
 def load_methodology(user_input: str, tool_registery: Optional[Any] = None) -> str:
     """
     加载方法论并上传到大模型。

jarvis/jarvis_utils/output.py

@@ -204,26 +204,7 @@ class PrettyOutput:
         console.print()
         console.print(panel)
         console.print()
-    @staticmethod
-    def print_stream(text: str, is_thinking: bool = False):
-        """
-        打印流式输出，不带换行符。
-
-        参数：
-            text: 要打印的文本
-        """
-        style = RichStyle(color="bright_cyan", bold=True, frame=True, meta={"icon": "🤖"})
-        if is_thinking:
-            style = RichStyle(color="grey58", italic=True, frame=True, meta={"icon": "🤖"})
-        console.print(text, style=style, end="")
-    @staticmethod
-    def print_stream_end():
-        """
-        结束流式输出，带换行符。
-        """
-        end_style = PrettyOutput._get_style(OutputType.SUCCESS)
-        console.print("\n", style=end_style)
-        console.file.flush()
+    
     @staticmethod
     def _get_style(output_type: OutputType) -> RichStyle:
         """

{jarvis_ai_assistant-0.1.174.dist-info → jarvis_ai_assistant-0.1.175.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.174
+Version: 0.1.175
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.1.174.dist-info → jarvis_ai_assistant-0.1.175.dist-info}/RECORD

@@ -1,5 +1,5 @@
-jarvis/__init__.py,sha256=vUlw8YZKrztZai7bmOGjahPSihHH2wASeXbZvUZ1VHo,74
-jarvis/jarvis_agent/__init__.py,sha256=5N3W4AfkJ4nDxFjSDd70kQ0gI4b61-3VdGRds2SgE6Y,31484
+jarvis/__init__.py,sha256=PW7wvclxKvhVfdxpCRbtFXcfiVyy6gIVpG9wmneeWDM,74
+jarvis/jarvis_agent/__init__.py,sha256=O_Qx-pqZjpb8LaXIDywgdKDDg-6Lq07wBgMF4PQECfQ,29246
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=KhvlV_QdB3P-M0TCkWvdxidNie1jU7KoMOqTIXCpwwA,1529
 jarvis/jarvis_agent/file_input_handler.py,sha256=cIiE0pwMJVe1VfeNw8Dpm8mM_gwTcre-nxLstFjoq4k,4152
 jarvis/jarvis_agent/jarvis.py,sha256=IuM-A9KZd1jqOFszB2l-Ua1FE5uVGvvNia1SSgp7Jgg,5963
@@ -7,7 +7,7 @@ jarvis/jarvis_agent/main.py,sha256=IAD59fEMWWSSAtHJhOQMPs_NMoKtcYjrxlTvhCHEVII,2
 jarvis/jarvis_agent/output_handler.py,sha256=7qori-RGrQmdiFepoEe3oPPKJIvRt90l_JDmvCoa4zA,1219
 jarvis/jarvis_agent/shell_input_handler.py,sha256=pi3AtPKrkKc6K9e99S1djKXQ_XrxtP6FrSWebQmRT6E,1261
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_code_agent/code_agent.py,sha256=vN-HZcwMnOfofq5JDjuVADQdBRdG1SuRv_-_BkKUUQI,16855
+jarvis/jarvis_code_agent/code_agent.py,sha256=9R32DV0-II4bxV_8b0tsdZW4UsuZjCf_fbplG2u27G0,17091
 jarvis/jarvis_code_analysis/code_review.py,sha256=68GCjxdg-n2hoMoCSGWpH_ZdQArc4G09E9Wwhypk4eY,30135
 jarvis/jarvis_code_analysis/checklists/__init__.py,sha256=cKQ_FOGy5TQgM-YkRCqORo-mUOZaPAJ9VDmZoFX58us,78
 jarvis/jarvis_code_analysis/checklists/c_cpp.py,sha256=SXPpYCNeCtU1PpKdKPiYDuOybfY9vaL0ejDn4imxDwA,1317
@@ -30,7 +30,7 @@ jarvis/jarvis_code_analysis/checklists/sql.py,sha256=ecKKT6wJAibn8R0NxGZDNlm4teY
 jarvis/jarvis_code_analysis/checklists/swift.py,sha256=YcsYFxAitHqOtBZjG-RV9-KNM7X5lIcl6zlEI9XfmfM,2566
 jarvis/jarvis_code_analysis/checklists/web.py,sha256=-Pnj1FQTsGVZUQK7-4ptDsGd7a22Cs0585jRAPT2SdQ,3943
 jarvis/jarvis_data/huggingface.tar.gz,sha256=dWKnc_tvyx-I_ZkXo91O0b38KxDmLW1ZbmJ3E6fCl_k,1120205
-jarvis/jarvis_dev/main.py,sha256=zfL9rl-Jfhpi4E4OxMKw3eOVjy6kSzQdxhn3yGv1UTw,42952
+jarvis/jarvis_dev/main.py,sha256=aqQ3SIek4jtGmkuzmt0FvZ27_9JtaE-dldqXQVH5fgg,42958
 jarvis/jarvis_git_details/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_details/main.py,sha256=l4Ol96DFISq2ctAgzmfUuS4i6JdWh0JAu_isY3iuzVo,8919
 jarvis/jarvis_git_squash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -45,18 +45,18 @@ jarvis/jarvis_lsp/rust.py,sha256=Z2KmvTsIcn5SLM4iaLG4Mael1h6zlZQIiOopbDpurag,371
 jarvis/jarvis_mcp/__init__.py,sha256=NF_vqRxaNyz8ColcpRh0bOkinV90YLAKHEN--jkP-B8,2114
 jarvis/jarvis_mcp/sse_mcp_client.py,sha256=FOVzroTw-pifmnF0qdsoQ6KweDCQ0Gxs6d6jl4VopiQ,23483
 jarvis/jarvis_mcp/stdio_mcp_client.py,sha256=KO0ewJuLBZLNqG4EGJcBOtn-8VJIipkq84ENvSwgQAo,11830
-jarvis/jarvis_methodology/main.py,sha256=_KDGEQw6j_VZ9O8eDe-c8F84zl6JrKmsNRva9PG4I5k,11836
-jarvis/jarvis_multi_agent/__init__.py,sha256=LEJofDjh80U34RyZv2ECAzpt2zkhA0Jn3KZh-ABoAKA,4343
+jarvis/jarvis_methodology/main.py,sha256=QJUMIb9o8JO-l207X5UIbazZKJYKG3F4iuUKtkm0dmg,11840
+jarvis/jarvis_multi_agent/__init__.py,sha256=Xab5sFltJmX_9MoXqanmZs6FqKfUb2v_pG29Vk8ZXaw,4311
 jarvis/jarvis_multi_agent/main.py,sha256=Z6N5VMjzaernnRjPkqgYRv09cIhWIFQ6a__AqHA8xrQ,1567
 jarvis/jarvis_platform/__init__.py,sha256=0YnsUoM4JkIBOtImFdjfuDbrqQZT3dEaAwSJ62DrpCc,104
 jarvis/jarvis_platform/base.py,sha256=WVxGxXU9DfwQdISlPxBA7NGRsbjVuOQXxIrxg0eaT04,5423
 jarvis/jarvis_platform/human.py,sha256=5hfYSp0K7VmB_J2IyLwaVGOrxsaNIEZwsWvs1nF224U,2518
-jarvis/jarvis_platform/kimi.py,sha256=yz7OVT54YDSUVuFlijDB7VdsJmtqRgj-qYKPHy8f0WQ,16787
-jarvis/jarvis_platform/openai.py,sha256=VDlWyOq4JrSPklz-D1Bu5DgDGRChebay5WYqSBXs-ww,4195
+jarvis/jarvis_platform/kimi.py,sha256=rVpAHoxuCXPZo9tepbp1NIX2Q8RYgnXyOJj0VS_q868,20669
+jarvis/jarvis_platform/openai.py,sha256=6qLCXoi15DGf9DvC9MUTha0gbZPoesFinixU2gSsBRI,5232
 jarvis/jarvis_platform/registry.py,sha256=UjCdPT9WIRxU-F0uuPpKmKRRCcNNxjr-bRTEPgRSNx4,7740
-jarvis/jarvis_platform/yuanbao.py,sha256=gPFy03DA0PemBNQTtxbDCBJ6mqUtSZclfiZbdNq1Ivk,22036
+jarvis/jarvis_platform/yuanbao.py,sha256=yvAfvE9AyS-ZvOlHbwXwa6kHLt5IO778BzVbi0kvkw0,24013
 jarvis/jarvis_platform_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_platform_manager/main.py,sha256=gFqXKNweU9mE-IRqV7qhXmZ5483D01s9bI76POX1uXc,22596
+jarvis/jarvis_platform_manager/main.py,sha256=VD0hKhLb8SevdFSYDXLRj3xwjBR1DTcRVgyn_Vp55VE,25593
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_smart_shell/main.py,sha256=uq5NCdNAdcHqvtG0zpajz85SigSKH1SSAcEpyHa_BOc,5180
 jarvis/jarvis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -77,7 +77,7 @@ jarvis/jarvis_tools/lsp_get_diagnostics.py,sha256=paz1CVZ2Y8nk0U74n1QiG01oDINiZq
 jarvis/jarvis_tools/methodology.py,sha256=Md8W2et0xUiuTjUSRCdnlwEPYqah2dCAAkxW_95BXBY,5238
 jarvis/jarvis_tools/read_code.py,sha256=pgztSBRh8RORFalqwzzsLHQogooFvDm1ePBL0E5O1C4,5961
 jarvis/jarvis_tools/read_webpage.py,sha256=LLvAOvaQJodaeNJKQ6dU9MYEE227NMdHyLs7esluUQ4,2217
-jarvis/jarvis_tools/registry.py,sha256=tqw_umqj40bP2AxBYztTZGXZCe8F4qV0PzZqCDpOMhg,22602
+jarvis/jarvis_tools/registry.py,sha256=eH-jTesZMAp4N8YNgs-eiRUwzksXB1mgMpWs-E8FrYY,22666
 jarvis/jarvis_tools/rewrite_file.py,sha256=rEPPSNU7uF1iKfEW9npEpZJ2LSoQXjt2OC-_troBToE,7003
 jarvis/jarvis_tools/search_web.py,sha256=-h1WYOqTcYC_8fdkm-4RfwKpbtLTVxOfRROul51NgO0,951
 jarvis/jarvis_tools/virtual_tty.py,sha256=AKAaKY5KcPxifNQoXjzHaL4U6EUVA7irHLwVvz2wLVs,16396
@@ -91,13 +91,13 @@ jarvis/jarvis_utils/file_processors.py,sha256=tSZSMJ4qCJ_lXI0dyLgJ0j5qEh6CDXDSVI
 jarvis/jarvis_utils/git_utils.py,sha256=MxhUcQ_gFUFyBxBiorEJ1wUk9a2TerFdq3-Z11FB-AE,11324
 jarvis/jarvis_utils/globals.py,sha256=Zs0chxA_giYiolYvawFFpcnTWgCUnn6GEusAh42jbz8,2275
 jarvis/jarvis_utils/input.py,sha256=qGf2q-yWhgT-OX-j_WYi7aZ11jYmuFNiMz2_W1nUOiM,7432
-jarvis/jarvis_utils/methodology.py,sha256=P1S_J9zxTed0Unpj0r-w14zpj8lEe_3bXgq1uvojjdQ,7512
-jarvis/jarvis_utils/output.py,sha256=PVG4fQ3P-eGOZUNZTowPtnjqq3GN91OE8fHa68lFOOg,8440
+jarvis/jarvis_utils/methodology.py,sha256=9dmtj6Ei2CRUdQP9TA_xToqZPYcm5_DQovwnRkEShsA,8626
+jarvis/jarvis_utils/output.py,sha256=7uhqaRCTFIKXhC8bvSQPNI3vyNoKEbzTTVFXbymzxZg,7726
 jarvis/jarvis_utils/tag.py,sha256=YJHmuedLb7_AiqvKQetHr4R1FxyzIh7HN0RRkWMmYbU,429
 jarvis/jarvis_utils/utils.py,sha256=iIcefLa1kvALkmQ19BLWDplmxrcOjtxWAgBIxrs8ytg,4439
-jarvis_ai_assistant-0.1.174.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.174.dist-info/METADATA,sha256=NPd_DkLhSnLBXgjB6SjYhr5XhqCU41aPsDvF1WV_mgI,14543
-jarvis_ai_assistant-0.1.174.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-jarvis_ai_assistant-0.1.174.dist-info/entry_points.txt,sha256=rjj61tZ7ahLi1R-JkJmX-IzIPPHD8mnwDZap1CnMe2s,973
-jarvis_ai_assistant-0.1.174.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.174.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.175.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.175.dist-info/METADATA,sha256=MWbQAB8D5l9rPNNML1rtCawvNHha-s-sAwQGMVJUyUc,14543
+jarvis_ai_assistant-0.1.175.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+jarvis_ai_assistant-0.1.175.dist-info/entry_points.txt,sha256=rjj61tZ7ahLi1R-JkJmX-IzIPPHD8mnwDZap1CnMe2s,973
+jarvis_ai_assistant-0.1.175.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.175.dist-info/RECORD,,