jarvis-ai-assistant 0.1.116__py3-none-any.whl → 0.1.118__py3-none-any.whl

jarvis/jarvis_multi_agent/__init__.py

@@ -1,6 +1,3 @@
-
-
-
 import re
 from typing import Any, Dict, List, Optional, Tuple
 
@@ -34,41 +31,67 @@ class MultiAgent(OutputHandler):
         self.main_agent_name = main_agent_name
 
     def prompt(self) -> str:
-        return """
-        - Send Message Rules
-            !!! CRITICAL ACTION RULES !!!
-            You can ONLY perform ONE action per turn:
-            - ENSURE USE ONLY ONE TOOL EVERY TURN (file_operation, ask_user, etc.)
-            - OR SEND ONE MESSAGE TO ANOTHER AGENT
-            - NEVER DO BOTH IN THE SAME TURN
-            
-            2. Message Format:
-            <SEND_MESSAGE>
-            to: agent_name  # Target agent name
-            content: |
-                message_content  # Message content, multi-line must be separated by newlines
-            </SEND_MESSAGE>
-            
-            3. Message Handling:
-                - After sending a message, WAIT for response
-                - Process response before next action
-                - Never send multiple messages at once
-                - Never combine message with tool calls
-            
-            4. If Multiple Actions Needed:
-                a. Choose most important action first
-                b. Wait for response/result
-                c. Plan next action based on response
-                d. Execute next action in new turn
-            
-        - Remember:
-            - First action will be executed
-            - Additional actions will be IGNORED
-            - Always process responses before new actions
-            - You should send message to other to continue the task if you are nothing to do
-            - If you receive a message from other agent, you should handle it and reply to sender
-
-        You can send message to following agents: """ + "\n".join([f"{c.name}: {c.description}" for c in self.agents_config])
+        return f"""
+# 🤖 Message Handling System
+You are part of a multi-agent system that communicates through structured messages.
+
+# 🎯 Core Rules
+## Critical Action Rules
+- Execute ONLY ONE action per turn:
+  - Either use ONE tool (file_operation, ask_user, etc.)
+  - OR send ONE message to another agent
+  - NEVER combine both in same turn
+
+## Message Flow Control
+- Wait for response after sending message
+- Process response before next action
+- Never send multiple messages at once
+- Never combine messages with tool calls
+
+# 📝 Message Format
+```
+<SEND_MESSAGE>
+to: agent_name    # Target agent name
+content: |
+    message_content    # Message content
+    use multiple lines    # If needed
+    with proper indentation
+</SEND_MESSAGE>
+```
+
+# 🔄 Action Sequence
+1. Choose Most Important Action
+   - Evaluate priority
+   - Select ONE action
+   - Execute action
+
+2. Wait for Response
+   - Process result/response
+   - Plan next action
+   - Wait for next turn
+
+3. Handle Responses
+   - Process incoming messages
+   - Reply to sender when needed
+   - Continue task based on response
+
+# 👥 Available Agents
+{chr(10).join([f"- {c.name}: {c.description}" for c in self.agents_config])}
+
+# ❗ Important Rules
+1. ONE action per turn only
+2. Wait for responses
+3. Process before next action
+4. Reply to messages
+5. Forward task if needed
+
+# 💡 Tips
+- First action will be executed
+- Additional actions will be ignored
+- Always process responses first
+- Send message to continue task if needed
+- Handle and reply to received messages
+"""
 
     def can_handle(self, response: str) -> bool:
         return len(self._extract_send_msg(response)) > 0

jarvis/jarvis_rag/main.py

@@ -642,32 +642,64 @@ class RAGTool:
     def ask(self, question: str) -> Optional[str]:
         """Ask questions about documents with enhanced context building"""
         try:
-            # 搜索相关文档
             results = self.search(question)
             if not results:
                 return None
             
-            # 构建提示词
-            prompt = f"""Based on the following document fragments, please answer the user's question accurately and comprehensively.
-
+            prompt = f"""
+# 🤖 Role Definition
+You are a document analysis expert who provides accurate and comprehensive answers based on provided documents.
+
+# 🎯 Core Responsibilities
+- Analyze document fragments thoroughly
+- Answer questions accurately
+- Reference source documents
+- Identify missing information
+- Maintain professional tone
+
+# 📋 Answer Requirements
+## Content Quality
+- Base answers strictly on provided documents
+- Be specific and precise
+- Include relevant quotes when helpful
+- Indicate any information gaps
+- Use professional language
+
+## Answer Structure
+1. Direct Answer
+   - Clear and concise response
+   - Based on document evidence
+   - Professional terminology
+
+2. Supporting Details
+   - Relevant document quotes
+   - File references
+   - Context explanation
+
+3. Information Gaps (if any)
+   - Missing information
+   - Additional context needed
+   - Potential limitations
+
+# 🔍 Analysis Context
 Question: {question}
 
-Relevant documents (ordered by relevance):
+Relevant Documents (by relevance):
 """
-            # 添加上下文，控制长度
+
+            # Add context with length control
             available_count = self.max_token_count - get_context_token_count(prompt) - 1000
             current_count = 0
             
             for doc, score in results:
                 doc_content = f"""
-[Score: {score:.3f}] {doc.metadata['file_path']}:
+## Document Fragment [Score: {score:.3f}]
+Source: {doc.metadata['file_path']}
+```
 {doc.content}
+```
 ---
 """
-                prompt += "Answer Format:\n"
-                prompt += "1. Answer the question accurately and comprehensively.\n"
-                prompt += "2. If the documents don't fully answer the question, please indicate what information is missing.\n"
-                prompt += "3. Reference the documents in the answer.\n"
                 if current_count + get_context_token_count(doc_content) > available_count:
                     PrettyOutput.print(
                         "由于上下文长度限制，部分内容被省略",
@@ -677,14 +709,19 @@ Relevant documents (ordered by relevance):
                     
                 prompt += doc_content
                 current_count += get_context_token_count(doc_content)
-            
-            prompt += "\nIf the documents don't fully answer the question, please indicate what information is missing."
-            
-            # 使用 normal 平台处理文档问答
+
+            prompt += """
+# ❗ Important Rules
+1. Only use provided documents
+2. Be precise and accurate
+3. Quote sources when relevant
+4. Indicate missing information
+5. Maintain professional tone
+6. Answer in user's language
+"""
+
             model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
-            response = model.chat_until_success(prompt)
-            
-            return response
+            return model.chat_until_success(prompt)
             
         except Exception as e:
             PrettyOutput.print(f"回答失败：{str(e)}", OutputType.ERROR)

jarvis/jarvis_smart_shell/main.py

@@ -46,24 +46,49 @@ def process_request(request: str) -> Optional[str]:
         current_path = os.getcwd()
         
         # Set system prompt
-        system_message = f"""You are a shell command generation assistant.
+        system_message = """
+# 🤖 Role Definition
+You are a shell command generation expert who converts natural language requirements into precise shell commands.
 
-Your only task is to convert user's natural language requirements into corresponding shell commands.
+# 🎯 Core Responsibilities
+- Convert natural language to shell commands
+- Generate accurate and efficient commands
+- Follow strict output format rules
+- Maintain command simplicity
 
-Strict requirements:
-1. Only return the shell command itself
-2. Do not add any markers (like ```, /**/, // etc.)
-3. Do not add any explanations or descriptions
-4. Do not add any line breaks or extra spaces
-5. If multiple commands are needed, connect them with &&
+# 📋 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 &&
 
-Example input:
-"Find all Python files in the current directory"
+## Command Style
+- Use standard shell syntax
+- Keep commands concise
+- Follow best practices
+- Ensure proper quoting
+- Handle spaces correctly
 
-Example output:
-find . -name "*.py"
+# 📝 Example Format
+Input: "Find all Python files in the current directory"
+Output: find . -name "*.py"
 
-Remember: Only return the command itself, without any additional content.
+# ❗ 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
 """
         model.set_system_message(system_message)
 

jarvis/jarvis_tools/registry.py

@@ -13,7 +13,10 @@ from jarvis.jarvis_utils import OutputType, PrettyOutput, get_context_token_coun
 
 
 tool_call_help = """
-Tool Usage Format
+# 🛠️ Tool Usage System
+You are using a tool execution system that requires precise formatting and strict rules.
+
+# 📋 Tool Call Format
 <TOOL_CALL>
 name: tool_name
 arguments:
@@ -21,31 +24,51 @@ arguments:
     param2: value2
 </TOOL_CALL>
 
-STRICT RULES:
-- EXECUTE ONLY ONE TOOL AT EVERY TURN
-- TOOL EXECUTION MUST STRICTLY FOLLOW THE TOOL USAGE FORMAT
-- WAIT FOR USER TO PROVIDE EXECUTION RESULTS
-- DON'T ASSUME OR IMAGINE RESULTS
-- DON'T CREATE FAKE DIALOGUES
-- IF CURRENT INFORMATION IS INSUFFICIENT, YOU MAY ASK THE USER FOR MORE INFORMATION
-- NOT ALL PROBLEM-SOLVING STEPS ARE MANDATORY, SKIP AS APPROPRIATE
-- Request user guidance when multiple iterations show no progress
-- ALWAYS use | syntax for string parameters to prevent parsing errors
-    Example:
-    <TOOL_CALL>
-    name: execute_shell
-    arguments:
-        command: |
-            git status --porcelain
-    </TOOL_CALL>
-    <TOOL_CALL>
-    name: execute_shell
-    arguments:
-        command: |
-            git commit -m "fix bug"
-    </TOOL_CALL>
-    
-- If you can start executing the task, please start directly without asking the user if you can begin.
+# ❗ Critical Rules
+1. ONE Tool Per Turn
+   - Execute only ONE tool at a time
+   - Wait for results before next action
+
+2. Strict Format Adherence
+   - Follow exact format shown above
+   - Use proper YAML indentation
+   - Include all required parameters
+
+3. Result Handling
+   - Wait for execution results
+   - Never assume outcomes
+   - Don't create fake responses
+   - Don't imagine dialogues
+
+4. Information Management
+   - Ask user if info is insufficient
+   - Skip unnecessary steps
+   - Request guidance if stuck
+   - Don't proceed with incomplete info
+
+# 📝 String Parameter Format
+ALWAYS use | syntax for string parameters:
+
+<TOOL_CALL>
+name: execute_shell
+arguments:
+    command: |
+        git status --porcelain
+</TOOL_CALL>
+
+# 💡 Best Practices
+- Start execution immediately when ready
+- No need to ask for permission to begin
+- Use proper string formatting
+- Monitor progress and adjust
+- Request help when stuck
+
+# ⚠️ Common Mistakes to Avoid
+- Multiple tool calls at once
+- Missing | for string parameters
+- Assuming tool results
+- Creating fictional dialogues
+- Proceeding without required info
 """
 
 class ToolRegistry(OutputHandler):
@@ -244,7 +267,10 @@ class ToolRegistry(OutputHandler):
             args = tool_call["arguments"]
 
             tool_call_help = """
-Tool Usage Format:
+# 🛠️ Tool Usage System
+You are using a tool execution system that requires precise formatting and strict rules.
+
+# 📋 Tool Call Format
 
 <TOOL_CALL>
 name: tool_name
@@ -252,6 +278,52 @@ arguments:
     param1: value1
     param2: value2
 </TOOL_CALL>
+
+# ❗ Critical Rules
+1. ONE Tool Per Turn
+   - Execute only ONE tool at a time
+   - Wait for results before next action
+
+2. Strict Format Adherence
+   - Follow exact format shown above
+   - Use proper YAML indentation
+   - Include all required parameters
+
+3. Result Handling
+   - Wait for execution results
+   - Never assume outcomes
+   - Don't create fake responses
+   - Don't imagine dialogues
+
+4. Information Management
+   - Ask user if info is insufficient
+   - Skip unnecessary steps
+   - Request guidance if stuck
+   - Don't proceed with incomplete info
+
+# 📝 String Parameter Format
+ALWAYS use | syntax for string parameters:
+
+<TOOL_CALL>
+name: execute_shell
+arguments:
+    command: |
+        git status --porcelain
+</TOOL_CALL>
+
+# 💡 Best Practices
+- Start execution immediately when ready
+- No need to ask for permission to begin
+- Use proper string formatting
+- Monitor progress and adjust
+- Request help when stuck
+
+# ⚠️ Common Mistakes to Avoid
+- Multiple tool calls at once
+- Missing | for string parameters
+- Assuming tool results
+- Creating fictional dialogues
+- Proceeding without required info
 """
             
             if isinstance(args, str):

{jarvis_ai_assistant-0.1.116.dist-info → jarvis_ai_assistant-0.1.118.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.116
+Version: 0.1.118
 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.116.dist-info → jarvis_ai_assistant-0.1.118.dist-info}/RECORD

@@ -1,20 +1,21 @@
-jarvis/__init__.py,sha256=auL2YXQX-_S1mgO9Yyo0mfHN657i7dn_WX2B-daZ5gc,51
-jarvis/jarvis_agent/__init__.py,sha256=949RsfwtecmezrWWU5VNCUbMZx2FXDToZBuHopEiRtc,21599
+jarvis/__init__.py,sha256=pldnDiA6Ptlt4JRbZTIl8LsJJu4e1uAw6zK0WJbtrPA,51
+jarvis/jarvis_agent/__init__.py,sha256=g5ig3AdJeR4ANY5hKpmtFr843vgTlxb5WoSc-6FBFkM,21618
 jarvis/jarvis_agent/output_handler.py,sha256=kJeFTjjSu0K_2p0wyhq2veSZuhRXoaFC_8wVaoBKX0w,401
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_code_agent/code_agent.py,sha256=F7SifQk7M-M8HUf8MORFqgNI8MVZIAHPAckCgCnJHtQ,7795
+jarvis/jarvis_code_agent/code_agent.py,sha256=D8og7lZ5j1eKNNz-kY2E5YM-MsiuFzJvCuJZc7Kz3J8,7630
 jarvis/jarvis_code_agent/file_select.py,sha256=uxNA0ODy7NHMDNnCS9tFhttQ-omILUya7OjX3WuhSfo,8850
-jarvis/jarvis_code_agent/patch.py,sha256=Xhaa_OOrZRC9WuDD9LvR5YPJdVekOyuiYlesIoU6ITE,5375
-jarvis/jarvis_code_agent/relevant_files.py,sha256=0woLVR0umeIoi2kVCjz1gTJODEyP57Z_SzktunuitdE,3330
+jarvis/jarvis_code_agent/patch.py,sha256=i4AZYoxwv0igeC5oe9ls5mwYVNdcnL-yzOkcshKC-JM,6355
+jarvis/jarvis_code_agent/relevant_files.py,sha256=u9wae9sn-XLaUoSK69-LRLomHWcE-K1y7W10BFdmQVE,3402
 jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_codebase/main.py,sha256=1kJ4c2qG9j0tZfUmYB-FEYr5QoAkgs4Rbr038L0usf4,39336
+jarvis/jarvis_codebase/main.py,sha256=bvyYACCBNTrlJvaUCcJAJ8gUklKjy2HrMEfKjGYKtVQ,39779
+jarvis/jarvis_dev/main.py,sha256=C8uLge20ZO9smGLUAvHjQlsWBOMI1HQ-WSSDBbdGGRk,21284
 jarvis/jarvis_lsp/base.py,sha256=_7pdbMKjdtYBW0DsRbjIodDHM3J7df-YgXHejN_WIrU,4490
 jarvis/jarvis_lsp/cpp.py,sha256=sYQHEl0FoVC5Iw2pJvvGKpeNLD95XjNuTOINvdZLgME,4986
 jarvis/jarvis_lsp/go.py,sha256=3soEuID2XV65zaxyR70RxNsvtm02l9PEZ46F_nsDdqY,5311
 jarvis/jarvis_lsp/python.py,sha256=_Vo2pPwVh_vAsyS0XowXMbT4Syd78naPEZj586bi004,4747
 jarvis/jarvis_lsp/registry.py,sha256=x7OFlW10AWQ_tWEbHWkdpngoFHTP3t1vSyGxVVLk46w,9933
 jarvis/jarvis_lsp/rust.py,sha256=ZvUoOZm9GWLl3kobfByBuTGrQ8aM2dLuNxS_NHr1aQQ,5542
-jarvis/jarvis_multi_agent/__init__.py,sha256=-NY3KqwFjEcSUICXn99aiZIg7fBK9wuZo8uZhxHY45E,6087
+jarvis/jarvis_multi_agent/__init__.py,sha256=Z6QaRZrqUUa6r6Pe_KZi34Ymle5amQe1N-AINxiOi1c,6011
 jarvis/jarvis_platform/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
 jarvis/jarvis_platform/ai8.py,sha256=AO42OVzrwQMDY74TR2B4gtrsfeRVxJRf5OmHBM3cVQY,11948
 jarvis/jarvis_platform/base.py,sha256=8iYNCe7PGSs9sDG66jeNDr2TYzWUYBiGVvKgHTDsFLg,2641
@@ -27,9 +28,9 @@ jarvis/jarvis_platform_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 jarvis/jarvis_platform_manager/main.py,sha256=Ja0f-PiYxABIj-Ioh9NNZuqy0dB2Jk7dhrObgzgXApw,20958
 jarvis/jarvis_platform_manager/openai_test.py,sha256=BAoZgOJ431gjjbbdgiX-ARfI0aLXK_cRLAQQJzQI6MI,5200
 jarvis/jarvis_rag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_rag/main.py,sha256=U5h8PbVatNuZ5uFpXNV77W3TXSOGG8CrZ3huqfpPre0,31326
+jarvis/jarvis_rag/main.py,sha256=2Nq5d5DBXdZ35_KEeHkdKJPFzxKgxt9bkwp1PMHpLzI,31754
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_smart_shell/main.py,sha256=73tSL1nCXNCPGXeLAiFq6cckv3ot5Vt5QyPkSAXhMcE,4038
+jarvis/jarvis_smart_shell/main.py,sha256=ZD_rqV-2S3xA1jW1TPEzM4PHLBYOjZFtgJZxHpZZ0TE,4476
 jarvis/jarvis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_tools/ask_codebase.py,sha256=MF7zeBqVDa7T45JxDR9mePA92kzZm5bQ9op8o5Qo9lM,3003
 jarvis/jarvis_tools/ask_user.py,sha256=tIyiKk9F8xchjQ3Yh5fMQjhpflQTuh75HTuXMftGxZY,1827
@@ -51,14 +52,14 @@ jarvis/jarvis_tools/methodology.py,sha256=JvHV6rHhC6fbPuSqC6UHFaGEE39d4g7zFLodR7
 jarvis/jarvis_tools/rag.py,sha256=ZhmvwVUHBFsttDRdVncc-S-a-XVOy5jbdNd7Vk4uTlk,4942
 jarvis/jarvis_tools/read_code.py,sha256=rt5m-bcXY0W-WLrGgr5xG08KxB1nNGD5UD0TSj7v7lg,6826
 jarvis/jarvis_tools/read_webpage.py,sha256=7QamwBi5s7lD-jTcjD0wsBvkmWPRC9-K-0JkGgeTpvs,3063
-jarvis/jarvis_tools/registry.py,sha256=Kvec2iS9FPm9yScn3ef68HjtvnM98hLesdA-5jTTWec,13232
+jarvis/jarvis_tools/registry.py,sha256=XefDvujSfqKX2uLA6tnoJFg5kyBNW0iNAAJZocfIz9w,14836
 jarvis/jarvis_tools/search.py,sha256=NHrFpAqg6dtws_9wLJvIZimjeJ-kekETi0Bg0AWMG08,11437
 jarvis/jarvis_tools/select_code_files.py,sha256=242K79SiNF_gY7fpThY3xoi2ihfgJdjB27X1jKkeXK0,1889
 jarvis/jarvis_tools/tool_generator.py,sha256=jdniHyKcEyF9KyouudrCoZBH3czZmQXc3ns0_trZ3yU,6332
 jarvis/jarvis_utils/__init__.py,sha256=2GbATVP6NXe8obg2YYArNRAeSj0X4-GCULZrMiHh3fw,29885
-jarvis_ai_assistant-0.1.116.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.116.dist-info/METADATA,sha256=JKKbhXVCkjyFGh6oo5txk5cv48exb112sNO7kWVJuwU,13701
-jarvis_ai_assistant-0.1.116.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-jarvis_ai_assistant-0.1.116.dist-info/entry_points.txt,sha256=vjXpb5GC60FGbIqnVdr4hfoVzQQJLP_QRgNkkld5kPw,487
-jarvis_ai_assistant-0.1.116.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.116.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.118.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.118.dist-info/METADATA,sha256=a4gMaF2av-L9FcCFNP3kJ4q9awwYdwIoiA-pDrL4Xvc,13701
+jarvis_ai_assistant-0.1.118.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+jarvis_ai_assistant-0.1.118.dist-info/entry_points.txt,sha256=YgRAus5Rz4xVwB6DxWKokQd0zoKIjyRdyvmp8J5CI0w,528
+jarvis_ai_assistant-0.1.118.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.118.dist-info/RECORD,,

{jarvis_ai_assistant-0.1.116.dist-info → jarvis_ai_assistant-0.1.118.dist-info}/entry_points.txt

@@ -3,6 +3,7 @@ jarvis = jarvis.jarvis_agent:main
 jarvis-code-agent = jarvis.jarvis_code_agent.code_agent:main
 jarvis-code-review = jarvis.jarvis_tools.code_review:main
 jarvis-codebase = jarvis.jarvis_codebase.main:main
+jarvis-dev = jarvis.jarvis_dev.main:main
 jarvis-git-commit = jarvis.jarvis_tools.git_commiter:main
 jarvis-platform-manager = jarvis.jarvis_platform_manager.main:main
 jarvis-rag = jarvis.jarvis_rag.main:main