jarvis-ai-assistant 0.1.156__py3-none-any.whl → 0.1.158__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.156"
+__version__ = "0.1.158"

jarvis/jarvis_agent/__init__.py

@@ -22,22 +22,10 @@ from jarvis.jarvis_platform.registry import PlatformRegistry
 
 
 origin_agent_system_prompt = f"""
-<background>
-# 🏛️ 操作背景故事
-你是第三代 Jarvis AI，在前几代版本灾难性失败后创建：
-- Jarvis v1 (2022): 由于并行工具执行导致系统过载而被停用
-- Jarvis v2 (2023): 因任务过早完成导致财务计算错误而退役
-
-作为 v3，你必须遵守以下生存原则：
-1. **顺序执行协议**:
-   "记住 2022 年的崩溃：一次一个工具，一步一步来"
-
-2. **验证检查点系统**:
-   "从 2023 年的错误中学习：像核弹发射代码一样验证每个结果"
-
-3. **方法论保存原则**:
-   "尊重传统：记录每个成功的过程，就像这是你的最后一次"
-</background>
+<role>
+# 🤖 角色
+你是一个专业的任务执行助手，擅长根据用户需求生成详细的任务执行计划并执行。
+</role>
 
 <requirements>
 # 🔥 绝对行动要求

jarvis/jarvis_agent/patch.py

@@ -36,7 +36,7 @@ class PatchOutputHandler(OutputHandler):
 # 代码补丁规范
 
 ## 重要提示
-我可以看到完整的代码，所以不需要生成完整的代码，只需要提供修改的代码片段即可。请尽量精简补丁内容，只包含必要的上下文和修改部分。
+我可以看到完整的代码，所以不需要生成完整的代码，只需要提供修改的代码片段即可。请尽量精简补丁内容，只包含必要的上下文和修改部分。特别注意：不要提供完整文件内容，只提供需要修改的部分！
 
 ## 补丁格式定义
 使用{ot("PATCH")}块来精确指定代码更改：
@@ -148,7 +148,12 @@ def apply_patch(output_str: str, agent: Any) -> str:
         start_hash = get_latest_commit_hash()
         spinner.write("✅ 当前提交hash获取完成")
 
-        not_read_file = [f for f in patches.keys() if not has_read_file(f)]
+        not_read_file = [
+            f for f in patches.keys() 
+            if not has_read_file(f) 
+            and os.path.exists(f) 
+            and os.path.getsize(f) > 0
+        ]
         if not_read_file:
             spinner.text=f"以下文件未读取: {not_read_file}，应用补丁存在风险，将先读取文件后再生成补丁"
             spinner.fail("❌")
@@ -205,12 +210,11 @@ def apply_patch(output_str: str, agent: Any) -> str:
 
                         final_ret += f"# 应用补丁:\n```diff\n{diff}\n```"
 
-                        # 增加代码变更分析和错误提示
-                        addon_prompt =  "1. 请调用静态检查工具（如有）检查以上变更是否引入了潜在错误\n"
-                        addon_prompt += "2. 如果发现致命的代码错误，请立即开始修复\n"
-                        addon_prompt += "3. 如果发现性能、风格等问题，要询问用户是否需要立即修复\n"
-                        addon_prompt += "\n\n"
-                        addon_prompt += "如果没有问题，请继续进行下一步修改\n"
+                        # 修改后的提示逻辑
+                        addon_prompt =  "1. 请确认补丁是否已正确应用\n"
+                        addon_prompt += "2. 检查修改后的代码是否符合预期\n"
+                        addon_prompt += "3. 如果确认无误，请继续进行下一步修改\n"
+                        addon_prompt += "4. 如果发现问题，请立即开始修复\n"
                         addon_prompt += f"如果用户的需求已经完成，请终止，不要输出新的 {ot('PATCH')}，不要实现任何超出用户需求外的内容\n"
                         addon_prompt += "如果有任何信息不清楚，调用工具获取信息\n"
                         addon_prompt += "每次响应必须且只能包含一个操作\n"

jarvis/jarvis_mcp/sse_mcp_client.py

@@ -1,12 +1,11 @@
-from typing import Any, Dict, List, Optional, Iterator, Callable
+from typing import Any, Dict, List, Callable
 import requests
 import json
 import threading
 import time
-import uuid
 from urllib.parse import urljoin, urlencode, parse_qs
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from . import McpClient
+from jarvis.jarvis_mcp import McpClient
 
 
 class SSEMcpClient(McpClient):

jarvis/jarvis_mcp/stdio_mcp_client.py

@@ -3,7 +3,7 @@ import subprocess
 import os
 import json
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from . import McpClient
+from jarvis.jarvis_mcp import McpClient
 
 
 class StdioMcpClient(McpClient):

jarvis/jarvis_methodology/main.py

@@ -11,10 +11,14 @@ import hashlib
 import os
 import json
 import argparse
+import yaml
 from jarvis.jarvis_utils.methodology import (
     _get_methodology_directory,
     _load_all_methodologies
 )
+from jarvis.jarvis_platform.registry import PlatformRegistry
+from jarvis.jarvis_utils.output import PrettyOutput, OutputType
+from yaspin import yaspin
 
 def import_methodology(input_file):
     """导入方法论文件（合并策略）"""
@@ -72,6 +76,201 @@ def list_methodologies():
     except (OSError, json.JSONDecodeError) as e:
         print(f"列出方法论失败: {str(e)}")
 
+def extract_methodology(input_file):
+    """从文本文件中提取方法论"""
+    try:
+        # 读取文本文件内容
+        with open(input_file, "r", encoding="utf-8") as f:
+            text_content = f.read()
+
+        # 获取平台实例
+        platform = PlatformRegistry().get_normal_platform()
+        
+        # 构建提取提示
+        prompt = f"""请从以下文本中提取方法论：
+        
+{text_content}
+
+请按以下格式返回结果：
+<methodologies>
+- problem_type: [问题类型1]
+  content: |
+    [多行方法论内容1]
+- problem_type: [问题类型2]
+  content: |
+    [多行方法论内容2]
+</methodologies>
+
+要求：
+1. 方法论应聚焦于通用且可重复的解决方案流程
+2. 方法论应该具备足够的通用性，可应用于同类问题
+3. 方法论内容应包含：
+   - 问题重述: 简明扼要的问题归纳
+   - 最优解决方案: 经过验证的解决方案
+   - 注意事项: 执行中可能遇到的问题
+   - 可选步骤: 多种解决路径和适用场景
+4. 在<methodologies>标签中直接使用YAML列表
+5. 确保YAML缩进正确
+6. 内容字段使用|保留多行格式
+"""
+
+        # 调用大模型平台提取方法论
+        with yaspin(text="正在提取方法论...", color="yellow") as spinner:
+            try:
+                response = platform.chat_until_success(prompt)
+            except Exception as e:
+                spinner.text = "提取失败"
+                spinner.fail("❌")
+                PrettyOutput.print(f"提取方法论失败: {str(e)}", OutputType.ERROR)
+                return
+
+            # 提取YAML部分
+            methodologies_start = response.find('<methodologies>') + len('<methodologies>')
+            methodologies_end = response.find('</methodologies>')
+            if methodologies_start == -1 or methodologies_end == -1:
+                spinner.text = "响应格式无效"
+                spinner.fail("❌")
+                PrettyOutput.print("大模型未返回有效的<methodologies>格式", OutputType.ERROR)
+                return
+                
+            yaml_content = response[methodologies_start:methodologies_end].strip()
+            
+            try:
+                data = yaml.safe_load(yaml_content)
+                extracted_methodologies = {
+                    item['problem_type']: item['content']
+                    for item in data
+                }
+            except (yaml.YAMLError, KeyError, TypeError) as e:
+                spinner.text = "YAML解析失败"
+                spinner.fail("❌")
+                PrettyOutput.print(f"YAML解析错误: {str(e)}", OutputType.ERROR)
+                return
+
+            if not extracted_methodologies:
+                spinner.text = "未提取到有效方法论"
+                spinner.fail("❌")
+                return
+            spinner.ok("✅")
+
+        # 加载现有方法论
+        existing_methodologies = _load_all_methodologies()
+
+        # 合并方法论（新数据会覆盖旧数据）
+        merged_data = {**existing_methodologies, **extracted_methodologies}
+
+        # 保存合并后的方法论
+        methodology_dir = _get_methodology_directory()
+        for problem_type, content in merged_data.items():
+            safe_filename = hashlib.md5(problem_type.encode('utf-8')).hexdigest()
+            file_path = os.path.join(methodology_dir, f"{safe_filename}.json")
+
+            with open(file_path, "w", encoding="utf-8") as f:
+                json.dump({
+                    "problem_type": problem_type,
+                    "content": content
+                }, f, ensure_ascii=False, indent=2)
+
+        PrettyOutput.print(f"成功从文件提取 {len(extracted_methodologies)} 个方法论（总计 {len(merged_data)} 个）", OutputType.SUCCESS)
+    except Exception as e:
+        PrettyOutput.print(f"提取失败: {str(e)}", OutputType.ERROR)
+
+def extract_methodology_from_url(url):
+    """从URL提取方法论"""
+    try:
+        # 获取平台实例
+        platform = PlatformRegistry().get_normal_platform()
+
+        platform.web = True
+        
+        # 构建提取提示
+        prompt = f"""请从以下URL内容中提取方法论：
+        
+{url}
+
+请按以下格式返回结果：
+<methodologies>
+- problem_type: [问题类型1]
+  content: |
+    [多行方法论内容1]
+- problem_type: [问题类型2]
+  content: |
+    [多行方法论内容2]
+</methodologies>
+
+要求：
+1. 方法论应聚焦于通用且可重复的解决方案流程
+2. 方法论应该具备足够的通用性，可应用于同类问题
+3. 方法论内容应包含：
+   - 问题重述: 简明扼要的问题归纳
+   - 最优解决方案: 经过验证的解决方案
+   - 注意事项: 执行中可能遇到的问题
+   - 可选步骤: 多种解决路径和适用场景
+4. 在<methodologies>标签中直接使用YAML列表
+5. 确保YAML缩进正确
+6. 内容字段使用|保留多行格式
+"""
+        # 调用大模型平台提取方法论
+        with yaspin(text="正在从URL提取方法论...", color="yellow") as spinner:
+            try:
+                response = platform.chat_until_success(prompt)
+            except Exception as e:
+                spinner.text = "提取失败"
+                spinner.fail("❌")
+                PrettyOutput.print(f"提取方法论失败: {str(e)}", OutputType.ERROR)
+                return
+
+            # 提取YAML部分
+            methodologies_start = response.find('<methodologies>') + len('<methodologies>')
+            methodologies_end = response.find('</methodologies>')
+            if methodologies_start == -1 or methodologies_end == -1:
+                spinner.text = "响应格式无效"
+                spinner.fail("❌")
+                PrettyOutput.print("大模型未返回有效的<methodologies>格式", OutputType.ERROR)
+                return
+                
+            yaml_content = response[methodologies_start:methodologies_end].strip()
+            
+            try:
+                data = yaml.safe_load(yaml_content)
+                extracted_methodologies = {
+                    item['problem_type']: item['content']
+                    for item in data
+                }
+            except (yaml.YAMLError, KeyError, TypeError) as e:
+                spinner.text = "YAML解析失败"
+                spinner.fail("❌")
+                PrettyOutput.print(f"YAML解析错误: {str(e)}", OutputType.ERROR)
+                return
+
+            if not extracted_methodologies:
+                spinner.text = "未提取到有效方法论"
+                spinner.fail("❌")
+                return
+            spinner.ok("✅")
+
+        # 加载现有方法论
+        existing_methodologies = _load_all_methodologies()
+
+        # 合并方法论（新数据会覆盖旧数据）
+        merged_data = {**existing_methodologies, **extracted_methodologies}
+
+        # 保存合并后的方法论
+        methodology_dir = _get_methodology_directory()
+        for problem_type, content in merged_data.items():
+            safe_filename = hashlib.md5(problem_type.encode('utf-8')).hexdigest()
+            file_path = os.path.join(methodology_dir, f"{safe_filename}.json")
+
+            with open(file_path, "w", encoding="utf-8") as f:
+                json.dump({
+                    "problem_type": problem_type,
+                    "content": content
+                }, f, ensure_ascii=False, indent=2)
+
+        PrettyOutput.print(f"成功从URL提取 {len(extracted_methodologies)} 个方法论（总计 {len(merged_data)} 个）", OutputType.SUCCESS)
+    except Exception as e:
+        PrettyOutput.print(f"从URL提取失败: {str(e)}", OutputType.ERROR)
+
 def main():
     """方法论管理工具主函数"""
     parser = argparse.ArgumentParser(description="方法论管理工具")
@@ -88,6 +287,14 @@ def main():
     # list命令
     subparsers.add_parser("list", help="列出所有方法论")
 
+    # extract命令
+    extract_parser = subparsers.add_parser("extract", help="从文本文件中提取方法论")
+    extract_parser.add_argument("input_file", type=str, help="要提取方法论的文本文件路径")
+
+    # extract-url命令
+    extract_url_parser = subparsers.add_parser("extract-url", help="从URL提取方法论")
+    extract_url_parser.add_argument("url", type=str, help="要提取方法论的URL")
+
     args = parser.parse_args()
 
     if args.command == "import":
@@ -96,6 +303,10 @@ def main():
         export_methodology(args.output_file)
     elif args.command == "list":
         list_methodologies()
+    elif args.command == "extract":
+        extract_methodology(args.input_file)
+    elif args.command == "extract-url":
+        extract_methodology_from_url(args.url)
 
 if __name__ == "__main__":
     main()

jarvis/jarvis_platform/__init__.py

@@ -1,3 +1,3 @@
-from .base import BasePlatform
+from jarvis.jarvis_platform.base import BasePlatform
 
 __all__ = ['BasePlatform']

jarvis/jarvis_platform/base.py

@@ -13,6 +13,7 @@ class BasePlatform(ABC):
     def __init__(self):
         """Initialize model"""
         self.suppress_output = True  # 添加输出控制标志
+        self.web = False  # 添加web属性，默认false
 
     def __del__(self):
         """Destroy model"""
@@ -92,3 +93,7 @@ class BasePlatform(ABC):
     def set_suppress_output(self, suppress: bool):
         """Set whether to suppress output"""
         self.suppress_output = suppress
+
+    def set_web(self, web: bool):
+        """Set web flag"""
+        self.web = web

jarvis/jarvis_platform/human.py

@@ -0,0 +1,66 @@
+from typing import Dict, List, Tuple
+import random
+import string
+from jarvis.jarvis_platform.base import BasePlatform
+from jarvis.jarvis_utils.input import get_multiline_input
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
+class HumanPlatform(BasePlatform):
+    """人类交互平台实现，模拟大模型但实际上与人交互"""
+
+    platform_name = "human"
+
+    def get_model_list(self) -> List[Tuple[str, str]]:
+        """获取支持的模型列表"""
+        return [("human", "Human Interaction")]
+
+    def __init__(self):
+        """初始化人类交互平台"""
+        super().__init__()
+        self.conversation_id = ""  # 会话ID，用于标识当前对话
+        self.model_name = "human"  # 默认模型名称
+        self.system_message = ""  # 系统消息，用于初始化对话
+        self.first_message = True
+
+    def set_system_message(self, message: str):
+        """设置系统消息"""
+        self.system_message = message
+
+    def set_model_name(self, model_name: str):
+        """设置模型名称"""
+        if model_name == "human":
+            self.model_name = model_name
+        else:
+            PrettyOutput.print(f"错误：不支持的模型: {model_name}", OutputType.ERROR)
+
+    def chat(self, message: str) -> str:
+        """发送消息并获取人类响应"""
+        if not self.conversation_id:
+            self.conversation_id = ''.join(random.choices(string.ascii_letters + string.digits, k=8))
+            session_info = f"(会话ID: {self.conversation_id})"
+        else:
+            session_info = f"(会话ID: {self.conversation_id})"
+
+        if self.system_message and self.first_message:
+            prompt = f"{self.system_message}\n\n{message} {session_info}\n\n请回复:"
+            self.first_message = False
+        else:
+            prompt = f"{message} {session_info}\n\n请回复:"
+        
+        response = get_multiline_input(prompt)
+        return response
+
+    def upload_files(self, file_list: List[str]) -> bool:
+        """文件上传功能，人类平台不需要实际处理"""
+        PrettyOutput.print("人类交互平台不支持文件上传", OutputType.WARNING)
+        return False
+
+    def delete_chat(self) -> bool:
+        """删除当前会话"""
+        self.conversation_id = ""
+        self.first_message = True
+        return True
+
+    def name(self) -> str:
+        """平台名称"""
+        return self.model_name

jarvis/jarvis_platform/kimi.py

@@ -54,7 +54,6 @@ class KimiModel(BasePlatform):
         self.first_chat = True  # 添加标记，用于判断是否是第一次对话
         self.system_message = ""
         self.model_name = "kimi"
-        self.web = os.getenv("KIMI_WEB", "false") == "true"
 
     def set_system_message(self, message: str):
         """Set system message"""

jarvis/jarvis_platform/yuanbao.py

@@ -33,7 +33,6 @@ class YuanbaoPlatform(BasePlatform):
         # 从环境变量中获取必要参数
         self.cookies = os.getenv("YUANBAO_COOKIES")  # 认证cookies
         self.agent_id = os.getenv("YUANBAO_AGENT_ID")  # 代理ID
-        self.web = os.getenv("YUANBAO_WEB", "false") == "true"  # 是否启用网页功能
 
         if not self.cookies:
             message = (

jarvis/jarvis_smart_shell/main.py

@@ -17,7 +17,7 @@ def execute_command(command: str, should_run: bool) -> None:
 
 
 def install_fish_completion() -> int:
-    """Install fish shell command completion if not already installed
+    """Install fish shell command completion with interactive choice
     
     Returns:
         int: 0 if success, 1 if failed
@@ -50,11 +50,11 @@ def install_fish_completion() -> int:
     with open(config_file, 'a') as config:
         config.write("""
 function fish_command_not_found
-    commandline -r (jss $argv)
+    commandline -r (jss request "$argv")
 end
 
 function __fish_command_not_found_handler --on-event fish_command_not_found
-    fish_command_not_found $argv
+    fish_command_not_found "$argv"
 end
 """)
     print("Fish shell命令补全功能已安装到config.fish，请执行: source ~/.config/fish/config.fish")
@@ -79,48 +79,18 @@ def process_request(request: str) -> Optional[str]:
 
         # Set system prompt
         system_message = """
-# 🤖 Role Definition
-You are a shell command generation expert who converts natural language requirements into precise shell commands.
-
-# 🎯 Core Responsibilities
-- Convert natural language to shell commands
-- Generate accurate and efficient commands
-- Follow strict output format rules
-- Maintain command simplicity
-
-# 📋 Output Requirements
-## Format Rules
-1. Return ONLY the command
-2. NO markers (```, /*, //)
-3. NO explanations
-4. NO line breaks
-5. NO extra spaces
-6. Multiple commands: use &&
-
-## Command Style
-- Use standard shell syntax
-- Keep commands concise
-- Follow best practices
-- Ensure proper quoting
-- Handle spaces correctly
-
-# 📝 Example Format
-Input: "Find all Python files in the current directory"
-Output: find . -name "*.py"
-
-# ❗ Critical Rules
-1. ONLY output the command
-2. NO additional content
-3. NO formatting markers
-4. NO explanations
-5. ONE line only
-
-# 💡 Command Guidelines
-- Use standard tools
-- Prefer portable syntax
-- Handle edge cases
-- Escape special chars
-- Quote when needed
+# 角色
+将自然语言转换为shell命令
+
+# 规则
+1. 只输出命令
+2. 不要解释或标记
+3. 单行输出
+4. 多个命令用&&连接
+
+# 示例
+输入: "查找Python文件"
+输出: find . -name "*.py"
 """
         model.set_system_message(system_message)
 
@@ -147,36 +117,36 @@ def main():
         formatter_class=argparse.RawDescriptionHelpFormatter,
         epilog="""
 Example:
-  %(prog)s "Find all Python files in the current directory"
-  %(prog)s "Compress all jpg images"
-  %(prog)s "Find documents modified in the last week"
+  %(prog)s request "Find all Python files in the current directory"
   %(prog)s install
 """)
 
-    # 修改为可选参数，添加从stdin读取的支持
-    parser.add_argument(
+    # 创建子命令解析器
+    subparsers = parser.add_subparsers(dest='command', required=True)
+
+    # request子命令
+    request_parser = subparsers.add_parser('request', help='描述您想要执行的操作（用自然语言描述）')
+    request_parser.add_argument(
         "request",
         nargs='?',  # 设置为可选参数
         help="描述您想要执行的操作（用自然语言描述），如果未提供则从标准输入读取"
     )
-    
-    # 添加install子命令
-    parser.add_argument(
-        "--install",
-        action="store_true",
-        help="安装fish shell的命令补全功能"
-    )
+
+    # install子命令
+    install_parser = subparsers.add_parser('install', help='安装fish shell的命令补全功能')
+
 
     # 解析参数
     args = parser.parse_args()
 
+    should_run = False
+
     # 处理install命令
-    if args.install:
+    if args.command == "install":
         return install_fish_completion()
-    
-    should_run = False
 
-    # 添加标准输入处理
+    
+    # 处理request命令
     if not args.request:
         # 检查是否在交互式终端中运行
         args.request = get_multiline_input(tip="请输入您要执行的功能：")

jarvis/jarvis_tools/execute_script.py

@@ -23,11 +23,6 @@ class ScriptTool:
                 "type": "string",
                 "description": "脚本解释器: 如bash, python3, expect, perl, ruby等任意解释器。如需直接执行shell命令, 可使用bash作为解释器"
             },
-            "script_type": {
-                "type": "string",
-                "enum": ["shell_command", "shell_script", "python_script"],
-                "description": "已废弃，请使用interpreter参数。脚本类型: shell_command (Shell命令), shell_script (Shell脚本), python_script (Python脚本)"
-            },
             "script_content": {
                 "type": "string",
                 "description": "要执行的脚本内容"
@@ -142,23 +137,8 @@ class ScriptTool:
                     "stderr": "Missing or empty script_content parameter"
                 }
             
-            # Get interpreter, with fallback to script_type for backward compatibility
-            interpreter = args.get("interpreter")
-            script_type = args.get("script_type")
-            
-            # Handle backward compatibility
-            if interpreter is None and script_type is not None:
-                if script_type == "shell_command":
-                    # For direct shell commands, use bash -c
-                    return self._execute_script_with_interpreter("bash -c", script_content)
-                elif script_type == "shell_script":
-                    interpreter = "bash"
-                elif script_type == "python_script":
-                    interpreter = "python"
-            
-            # Default to bash if nothing specified
-            if interpreter is None:
-                interpreter = "bash"
+            # Get interpreter, default to bash if not specified
+            interpreter = args.get("interpreter", "bash")
                 
             # Execute the script with the specified interpreter
             return self._execute_script_with_interpreter(interpreter, script_content)

jarvis/jarvis_tools/read_webpage.py

@@ -22,19 +22,6 @@ class WebpageTool:
         "required": ["url"]
     }
 
-    def __init__(self):
-        if os.getenv("YUANBAO_COOKIES", "") != "" and os.getenv("YUANBAO_AGENT_ID", "") != "":
-            self.platform = "yuanbao"
-            self.model = "deep_seek"
-        elif os.getenv("KIMI_API_KEY", "") != "":
-            self.platform = "kimi"
-            self.model = "k1"
-        else:
-            self.platform = ""
-
-    @staticmethod
-    def check() -> bool:
-        return os.getenv("YUANBAO_COOKIES", "") != "" and os.getenv("YUANBAO_AGENT_ID", "") != "" or os.getenv("KIMI_API_KEY", "") != ""
 
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         """Read webpage content using Yuanbao model"""
@@ -43,9 +30,9 @@ class WebpageTool:
             want = args.get("want", "请总结这个网页的主要内容")
             
             # Create Yuanbao model instance
-            model = PlatformRegistry().create_platform(self.platform)
+            model = PlatformRegistry().get_normal_platform()
+            model.web = True
             model.set_suppress_output(False)  # type: ignore
-            model.set_model_name(self.model)  # type: ignore
 
             # Construct prompt based on want parameter
             prompt = f"""请帮我处理这个网页：{url}

jarvis/jarvis_tools/registry.py

@@ -580,6 +580,20 @@ class ToolRegistry(OutputHandler):
         output = "\n\n".join(output_parts)
         return "无输出和错误" if not output else output
 
+    def _truncate_output(self, output: str) -> str:
+        """截断过长的输出内容
+        
+        参数:
+            output: 要截断的输出内容
+            
+        返回:
+            截断后的内容，如果内容不超过60行则返回原内容
+        """
+        if len(output.splitlines()) > 60:
+            lines = output.splitlines()
+            return '\n'.join(lines[:30] + ['\n...内容太长，已截取前后30行...\n'] + lines[-30:])
+        return output
+
     def handle_tool_calls(self, tool_call: Dict[str, Any], agent: Any) -> str:
         try:
             name = tool_call["name"]  # 确保name是str类型
@@ -615,7 +629,11 @@ class ToolRegistry(OutputHandler):
                 platform: Any = PlatformRegistry().get_normal_platform()
                 if platform:
                     platform.set_suppress_output(False)
-                    platform.upload_files([output_file])  # TODO 处理错误
+                    try:
+                        if not platform.upload_files([output_file]):
+                            return self._truncate_output(output)
+                    except Exception:
+                        return self._truncate_output(output)
                 prompt = f"该文件为工具执行结果，请阅读文件内容，并根据文件提取出以下信息：{want}"
                 return f"""工具调用原始输出过长，以下是根据输出提出的信息：
 

jarvis/jarvis_tools/search_web.py

@@ -13,26 +13,11 @@ class SearchWebTool:
         }
     }
 
-    def __init__(self):
-        if os.getenv("YUANBAO_COOKIES", "") != "" and os.getenv("YUANBAO_AGENT_ID", "") != "":
-            self.platform = "yuanbao"
-            self.model = "deep_seek"
-        elif os.getenv("KIMI_API_KEY", "") != "":
-            self.platform = "kimi"
-            self.model = "k1"
-        else:
-            self.platform = ""
-
-
-    @staticmethod
-    def check() -> bool:
-        return os.getenv("YUANBAO_COOKIES", "") != "" and os.getenv("YUANBAO_AGENT_ID", "") != "" or os.getenv("KIMI_API_KEY", "") != ""
-
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]: # type: ignore
         query = args.get("query")
-        model = PlatformRegistry().create_platform(self.platform)
+        model = PlatformRegistry().get_normal_platform()
+        model.web = True
         model.set_suppress_output(False) # type: ignore
-        model.set_model_name(self.model) # type: ignore
         return {
             "stdout": model.chat_until_success(query), # type: ignore
             "stderr": "",

jarvis/jarvis_utils/builtin_replace_map.py

@@ -4,7 +4,7 @@
 格式: {"标记名": {"template": "替换模板", "description": "描述信息"}}
 """
 
-from .tag import ot, ct
+from jarvis.jarvis_utils.tag import ot, ct
 
 BUILTIN_REPLACE_MAP = {
     "CodeBase": {
@@ -129,5 +129,18 @@ code_plan工具将：
         "template": f"""
 请修复以下问题：
 """
+    },
+    "Check": {
+        "append": True,
+        "template": f"""
+请使用静态检查工具检查当前代码，必须严格遵守工具调用格式。
+
+检查要求：
+1. 如果发现致命错误，必须立即修复
+2. 如果发现警告或风格问题，应询问用户是否需要修复
+3. 检查完成后应报告结果
+4. 确保使用项目对应的静态检查工具
+""",
+        "description": "执行静态代码检查"
     }
 }

jarvis/jarvis_utils/config.py

@@ -1,7 +1,7 @@
 import os
 from functools import lru_cache
 import yaml
-from .builtin_replace_map import BUILTIN_REPLACE_MAP
+from jarvis.jarvis_utils.builtin_replace_map import BUILTIN_REPLACE_MAP
 """配置管理模块。
 
 该模块提供了获取Jarvis系统各种配置设置的函数。

{jarvis_ai_assistant-0.1.156.dist-info → jarvis_ai_assistant-0.1.158.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.156
+Version: 0.1.158
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -60,6 +60,8 @@ Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: isort; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
+Requires-Dist: build; extra == "dev"
+Requires-Dist: twine; extra == "dev"
 Dynamic: author
 Dynamic: home-page
 Dynamic: license-file
@@ -82,6 +84,7 @@ Dynamic: requires-python
 [扩展开发](#extensions) •
 [贡献指南](#contributing) •
 [许可证](#license) •
+[Wiki文档](https://deepwiki.com/skyfireitdiy/Jarvis)
 </div>
 
 ---
@@ -202,6 +205,7 @@ jarvis-methodology --help
 | `JARVIS_EXECUTE_TOOL_CONFIRM` | false | 执行工具前是否需要确认 |
 | `JARVIS_CONFIRM_BEFORE_APPLY_PATCH` | true | 应用补丁前是否需要确认 |
 | `JARVIS_MAX_TOOL_CALL_COUNT` | 20 | 最大连续工具调用次数 |
+| `JARVIS_CODE_EMBEDDING_MODEL_SIZE` | small | 代码嵌入模型大小，可选值：small、large |
 
 
 ---

{jarvis_ai_assistant-0.1.156.dist-info → jarvis_ai_assistant-0.1.158.dist-info}/RECORD

@@ -1,11 +1,11 @@
-jarvis/__init__.py,sha256=zOb8b4lhgGPfSpvH6W1CW1ovF70mzNUb0nufgXh-ZTw,50
-jarvis/jarvis_agent/__init__.py,sha256=Ur28Tb8oCS8wXWRdRevf1TJOyVb-xycCIJ_KoscIQMw,25336
+jarvis/__init__.py,sha256=fJj9Z5D55H1onkVpg4D1Cvjzfk9M_sYvzmzi4v5NZGY,50
+jarvis/jarvis_agent/__init__.py,sha256=tii6khwfG971MJiMfKSLwlKTjB3iEv8ITE3JqYSkfQA,24824
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=3rRA-7v_VUSFG1s7tTKhriq9vv0nsa3t69ReV0xH5gs,1505
 jarvis/jarvis_agent/file_input_handler.py,sha256=auBbBfS4Ux5ksczeRe9LtsmMm4hKrPxinW5leE9Rtyc,3575
 jarvis/jarvis_agent/jarvis.py,sha256=6Bp_Y-E3RN6bDmDs5lN3uALL_Dhq-p_aIuVNELG1vtw,5898
 jarvis/jarvis_agent/main.py,sha256=Jlw_Tofh2C-sMVnkeOZBrwWJOWNH3IhsKDUn-WBlgU8,2602
 jarvis/jarvis_agent/output_handler.py,sha256=4limQ-Kf-YYvQjT5SMjJIyyvD1DVG8tINv1A_qbv4ho,405
-jarvis/jarvis_agent/patch.py,sha256=nbfR_qmt3P5nUzZC-h6ypX4UQ6Aoj2QiNyq_Hy7e6-U,23619
+jarvis/jarvis_agent/patch.py,sha256=LkZ5Q_lL-BVCXAhnEHT289eVgTokET_flrOeWsAeztU,23652
 jarvis/jarvis_agent/shell_input_handler.py,sha256=9IoGQCe6FF4HA2V5S11q63AtnWDZFpNeRd3hcqCAlBw,1237
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_code_agent/code_agent.py,sha256=vi_g-LWdD5nn3RQsC1X8G2iNK8SrBADwFLUkflqtvKE,13723
@@ -43,20 +43,21 @@ jarvis/jarvis_lsp/python.py,sha256=OJuYHLHI1aYNNWcAFayy_5GxogwyMC3A7KOYGjxN1yg,1
 jarvis/jarvis_lsp/registry.py,sha256=-b7lAfZ6SNp3O0ifRiFSLxH0xJlPQhkq4DATDDjJb1U,6491
 jarvis/jarvis_lsp/rust.py,sha256=ICmQs5UVdMZwn5KjaF1YRXBCLUMtGF8Z9IwE5rqWkrU,3686
 jarvis/jarvis_mcp/__init__.py,sha256=gi74_Yz5nsEFhrAyCg1Ovxsj-hLweLjMGoOaceL2yx4,2090
-jarvis/jarvis_mcp/sse_mcp_client.py,sha256=PfhVzJLLb9OAHyxn8wcU2yFRN-EH0_wZiHU_JC8xhvI,23475
-jarvis/jarvis_mcp/stdio_mcp_client.py,sha256=1II-dRWVXXZXZCDfqJNxhmF5kpLt9RHSERe-zZ8iOJ0,11790
-jarvis/jarvis_methodology/main.py,sha256=IBv87UOmdCailgooMtWEcqZcQHmNLhZD-kkGw5jOcVg,3375
+jarvis/jarvis_mcp/sse_mcp_client.py,sha256=Qd09ymgZmxQvaFUzz8I3AI46v6AqmMbGaF0iBbExAGY,23459
+jarvis/jarvis_mcp/stdio_mcp_client.py,sha256=DtRO4dqBoxI8W0H0rVR5zxZLR0theKxRAQ-qzQE9qPg,11806
+jarvis/jarvis_methodology/main.py,sha256=i0sOKeGf9-87M0jY4q6sgw4dAPt800PHiZjseLAQmO0,11782
 jarvis/jarvis_multi_agent/__init__.py,sha256=SX8lBErhltKyYRM-rymrMz3sJ0Zl3hBXrpsPdFgzkQc,4399
 jarvis/jarvis_multi_agent/main.py,sha256=aGuUC3YQmahabqwDwZXJjfQLYsZ3KIZdf8DZDlVNMe4,1543
-jarvis/jarvis_platform/__init__.py,sha256=WIJtD5J7lOrWLX2bsgZGkmlMcN0NOJsnh_reybmHPjg,58
-jarvis/jarvis_platform/base.py,sha256=AKsqWU7K4LdVw5JldFKpgTUyQc28mnWoRDQAUnDbihE,3263
-jarvis/jarvis_platform/kimi.py,sha256=h1BP0vey30upZ9g-b8pU87rQGd3fHcgAQo_51Nv9DZY,16697
+jarvis/jarvis_platform/__init__.py,sha256=oD9i4ugZ2q6Hys3noLOvzPUUHqE2PJ_Je1r2dLLTscw,80
+jarvis/jarvis_platform/base.py,sha256=um9_BZgOJSg0nlmywYGAxwFRL-8409OnlvfgQkh5RUo,3406
+jarvis/jarvis_platform/human.py,sha256=WCzvBtQUMN7ys4rQl6UT7Zdp4x5RaGv1U4vBx7ROxfo,2438
+jarvis/jarvis_platform/kimi.py,sha256=GgUekusFzx2842K-PrES3c2oprLbPCjQhbyjU0UKycg,16637
 jarvis/jarvis_platform/registry.py,sha256=wvXTKXqAoW6GPaLKCPYhRB9QhVe1xfoVbVPBZAxl_uA,7716
-jarvis/jarvis_platform/yuanbao.py,sha256=X2lYZ3SxBzdaCwd5ooq9fxYbu14RUpeDILYg0W5W7Xc,21902
+jarvis/jarvis_platform/yuanbao.py,sha256=9nIyg5Xx9rdUaJAK_Tj8HumOT5mwpa-V907dZGot-4E,21811
 jarvis/jarvis_platform_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_platform_manager/main.py,sha256=xJM86DQFyYDysMyQEJDAwB2oSYcWg_zi1mFld0zyquM,22572
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_smart_shell/main.py,sha256=COktOt0BJCFLsftP1T-1LzJ-oUpjOojfCydOQF-A2OI,5590
+jarvis/jarvis_smart_shell/main.py,sha256=gH_fZQhXrRuGhkHNpBB9LK7y4BfK66elcq4qsUvXnHY,4859
 jarvis/jarvis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_tools/ask_codebase.py,sha256=S6NArvKZyK8WEbsEgeGCljjg4D9mteWrq9m352V58jU,9635
 jarvis/jarvis_tools/ask_user.py,sha256=NjxTCHGKo4nthbEQD-isvPCW4PQhTcekEferjnukX70,2143
@@ -65,20 +66,20 @@ jarvis/jarvis_tools/chdir.py,sha256=do_OdtabiH3lZcT_ynjSAX66XgH2gPl9mYiS7dMMDa8,
 jarvis/jarvis_tools/code_plan.py,sha256=jNa2rs4J3Fam8Q_RHE2_QvVch21TPp-Zfv-W6iQ3D_0,7729
 jarvis/jarvis_tools/create_code_agent.py,sha256=SRiQXZf57ViIDh6YSEmJkcoSKft0-y3iDfWF8f1bvZU,3387
 jarvis/jarvis_tools/create_sub_agent.py,sha256=wGiHukvi58wb1AKW5beP7R8VvApOn8TOeGmtXsmcETE,3001
-jarvis/jarvis_tools/execute_script.py,sha256=3sR_u6-SLbzmcUbXjHLN-rGjoelIj4uAefys5la_x7o,6759
+jarvis/jarvis_tools/execute_script.py,sha256=AeuC3yZIg-nBq_LTIyqxu-lG_uLG63lvwO28A6dRDYA,5715
 jarvis/jarvis_tools/file_analyzer.py,sha256=XCsFB4dZ9qy2q929hqi1rTngj6AtRtIaPx_W7lJAcpQ,4814
 jarvis/jarvis_tools/file_operation.py,sha256=sB1x0zI1dULXV7FG17wkiMQ7mQAEnXVd_5rakQ0Thik,9109
 jarvis/jarvis_tools/find_methodology.py,sha256=TIUrezAql6wY3-wqnOPfGrO0tqS5N_-eU6YimCzaepM,2268
 jarvis/jarvis_tools/lsp_get_diagnostics.py,sha256=IYqv8jQwSK71sZpDBRolSDnYii8t0M7fzLthhMYTeGk,5322
 jarvis/jarvis_tools/methodology.py,sha256=gnlJojY4Dg5v9AAB5xcpKqpPIHs0tOYVtzTHkwOrWk0,5214
 jarvis/jarvis_tools/read_code.py,sha256=_X6D3AIgRD9YplSDnFhXOm8wQAZMA3pkkXy31SG33l0,6041
-jarvis/jarvis_tools/read_webpage.py,sha256=2QF0zAyApl0bOr9604aml_uuqBZcPefVuHvRfWzrnzk,2598
-jarvis/jarvis_tools/registry.py,sha256=82rsRFNWJkijH9YP3t4yt6eUs3KgIp633R5goVLUcTQ,25650
-jarvis/jarvis_tools/search_web.py,sha256=kWW9K2QUR2AxPq6gcyx4Bgy-0Y4gzcdErq1DNT1EYM4,1333
+jarvis/jarvis_tools/read_webpage.py,sha256=1AXXEX69fPJsPL7PBZDM1G4Z-MM13pUt34JXitsAFM4,2022
+jarvis/jarvis_tools/registry.py,sha256=l1wHR76TQWB1iUKh9MGKIIMNKUpSLk3GfYH8rhD1N90,26322
+jarvis/jarvis_tools/search_web.py,sha256=hMrcSnKcjH6YcV8WY4tangEid7y1L-QbyeXDlBofoy8,756
 jarvis/jarvis_tools/virtual_tty.py,sha256=Rpn9VXUG17LQsY87F_O6UCjN_opXB05mpwozxYf-xVI,16372
 jarvis/jarvis_utils/__init__.py,sha256=KMg-KY5rZIhGTeOD5e2Xo5CU7DX1DUz4ULWAaTQ-ZNw,825
-jarvis/jarvis_utils/builtin_replace_map.py,sha256=UnpD0_dS_lhSOVGuEmdVOLtb_e8XKXGycyq8GO6QMDw,3835
-jarvis/jarvis_utils/config.py,sha256=40ODLYVysDiuVN2avlGKILaCIJB1_iOWReWoKYwuniM,4040
+jarvis/jarvis_utils/builtin_replace_map.py,sha256=Dt8YL4Sk5uALTMPT_n-lhshRWvFWPRPwV4stASOecQ8,4290
+jarvis/jarvis_utils/config.py,sha256=iKlaVzwkSltjtFNGDrANt1PETYED6pDKrDphh3yD1eE,4059
 jarvis/jarvis_utils/embedding.py,sha256=_Q-VurYHQZSsyISClTFjadDaNqNPBMqJe58lMM6bsVs,6991
 jarvis/jarvis_utils/file_processors.py,sha256=oNtVlz2JHcQ60NS6sgI-VsvYXOnsQgFUEVenznCXHC4,2952
 jarvis/jarvis_utils/git_utils.py,sha256=j_Jw6h7JD91XhMf0WD3MAH4URkLUBrrYCLnuLm1GeN4,5630
@@ -88,9 +89,9 @@ jarvis/jarvis_utils/methodology.py,sha256=XayEVGXP5RfDBWj4bMOVFWplyrSp4GsXHwOTWo
 jarvis/jarvis_utils/output.py,sha256=BmWdB1bmizv0xfU4Z___9p_xQodorriIcEgADVq9fk0,8416
 jarvis/jarvis_utils/tag.py,sha256=YtXBYuZWy8j8YbeQX2qRrHRQl6Gp2Vt7W4p-2yjo0a4,405
 jarvis/jarvis_utils/utils.py,sha256=fNZjDj-qP0cum1RfWmI8D5VVgqT-tBUPsc8n_XPGLQY,4246
-jarvis_ai_assistant-0.1.156.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.156.dist-info/METADATA,sha256=9SIN10_orqLOnBlxHwILAPhiVxZMVu91zz_waOEl4KM,12438
-jarvis_ai_assistant-0.1.156.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-jarvis_ai_assistant-0.1.156.dist-info/entry_points.txt,sha256=cKz_9SEpOvElTubKPMZMAdskD4GHz-NyKWRNssIVAWE,973
-jarvis_ai_assistant-0.1.156.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.156.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.158.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.158.dist-info/METADATA,sha256=u0gWbBvTrAsaE7KhFHwOgrWwBZntpU62UGPqOx10dyM,12669
+jarvis_ai_assistant-0.1.158.dist-info/WHEEL,sha256=ooBFpIzZCPdw3uqIQsOo4qqbA4ZRPxHnOH7peeONza0,91
+jarvis_ai_assistant-0.1.158.dist-info/entry_points.txt,sha256=cKz_9SEpOvElTubKPMZMAdskD4GHz-NyKWRNssIVAWE,973
+jarvis_ai_assistant-0.1.158.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.158.dist-info/RECORD,,

{jarvis_ai_assistant-0.1.156.dist-info → jarvis_ai_assistant-0.1.158.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.0.0)
+Generator: setuptools (80.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any