auto-coder 0.1.338__tar.gz → 0.1.340__tar.gz

{auto_coder-0.1.338 → auto_coder-0.1.340}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.338
+Version: 0.1.340
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence

{auto_coder-0.1.338 → auto_coder-0.1.340}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.338
+Version: 0.1.340
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence

{auto_coder-0.1.338 → auto_coder-0.1.340}/src/autocoder/auto_coder_runner.py

@@ -2821,8 +2821,9 @@ def generate_new_yaml(query: str):
 def auto_command(query: str,extra_args: Dict[str,Any]={}):    
     """处理/auto指令"""        
     args = get_final_config() 
-    memory = get_memory()            
-    if args.enable_agentic_edit:
+    memory = get_memory()         
+    if args.enable_agentic_edit:        
+        from autocoder.run_context import get_run_context,RunMode
         execute_file,args = generate_new_yaml(query)
         args.file = execute_file                      
         current_files = memory.get("current_files",{}).get("files",[])
@@ -2831,16 +2832,20 @@ def auto_command(query: str,extra_args: Dict[str,Any]={}):
             with open(file,"r",encoding="utf-8") as f:
                 sources.append(SourceCode(module_name=file,source_code=f.read()))  
                     
-            llm = get_single_llm(args.code_model or args.model,product_mode=args.product_mode)    
-            agent = AgenticEdit(llm=llm,args=args,files=SourceCodeList(sources=sources), 
-                                conversation_history=[],
-                                memory_config=MemoryConfig(memory=memory, 
-                                save_memory_func=save_memory), command_config=CommandConfig,
-                                conversation_name="current"
-                                )
+        llm = get_single_llm(args.code_model or args.model,product_mode=args.product_mode) 
+        conversation_history = extra_args.get("conversations",[])   
+        agent = AgenticEdit(llm=llm,args=args,files=SourceCodeList(sources=sources), 
+                            conversation_history=conversation_history,
+                            memory_config=MemoryConfig(memory=memory, 
+                            save_memory_func=save_memory), command_config=CommandConfig,
+                            conversation_name="current"
+                            )
+        if get_run_context() == RunMode.TERMINAL:
             agent.run_in_terminal(AgenticEditRequest(user_input=query))
-            return
-    
+        else:
+            agent.run_with_events(AgenticEditRequest(user_input=query))
+        return
+        
     args = get_final_config()  
     # 准备请求参数
     request = AutoCommandRequest(

{auto_coder-0.1.338 → auto_coder-0.1.340}/src/autocoder/common/v2/agent/agentic_edit.py

@@ -11,6 +11,7 @@ from autocoder.common.printer import Printer
 from rich.console import Console
 from rich.panel import Panel
 from pydantic import SkipValidation
+from byzerllm.utils.types import SingleOutputMeta
 
 # Removed ResultManager, stream_out, git_utils, AutoCommandTools, count_tokens, global_cancel, ActionYmlFileManager, get_event_manager, EventContentCreator, get_run_context, AgenticFilterStreamOutType
 from autocoder.common import AutoCoderArgs, git_utils, SourceCodeList, SourceCode
@@ -118,6 +119,8 @@ class AgenticEdit:
 
         self.conversation_manager = AgenticConversation(
             args, self.conversation_history, conversation_name=conversation_name)
+        # 当前不开启历史记录，所以清空
+        self.conversation_manager.clear_history()
 
         self.shadow_manager = ShadowManager(
             args.source_dir, args.event_file, args.ignore_clean_shadows)
@@ -126,17 +129,17 @@ class AgenticEdit:
             self.shadow_manager, verbose=False)
 
         self.mcp_server_info = ""
-        # try:
-        #     self.mcp_server = get_mcp_server()
-        #     mcp_server_info_response = self.mcp_server.send_request(
-        #         McpServerInfoRequest(
-        #             model=args.inference_model or args.model,
-        #             product_mode=args.product_mode,
-        #         )
-        #     )
-        #     self.mcp_server_info = mcp_server_info_response.result
-        # except Exception as e:
-        #     logger.error(f"Error getting MCP server info: {str(e)}")
+        try:
+            self.mcp_server = get_mcp_server()
+            mcp_server_info_response = self.mcp_server.send_request(
+                McpServerInfoRequest(
+                    model=args.inference_model or args.model,
+                    product_mode=args.product_mode,
+                )
+            )
+            self.mcp_server_info = mcp_server_info_response.result
+        except Exception as e:
+            logger.error(f"Error getting MCP server info: {str(e)}")
 
         # 变更跟踪信息
         # 格式: { file_path: FileChangeEntry(...) }
@@ -386,7 +389,7 @@ class AgenticEdit:
         </options>
         </plan_mode_respond>
 
-        ## MCP_TOOL
+        ## mcp_tool
         Description: Request to execute a tool via the Model Context Protocol (MCP) server. Use this when you need to execute a tool that is not natively supported by the agentic edit tools.
         Parameters:
         - server_name: (optional) The name of the MCP server to use. If not provided, the tool will automatically choose the best server based on the query.
@@ -472,24 +475,13 @@ class AgenticEdit:
         </diff>
         </replace_in_file>
 
-        ## Example 4: Another example of using an MCP tool (where the server name is a unique identifier such as a URL)
+        ## Example 4: Another example of using an MCP tool (where the server name is a unique identifier listed in MCP_SERVER_LIST)
 
         <use_mcp_tool>
-        <server_name>github.com/modelcontextprotocol/servers/tree/main/src/github</server_name>
+        <server_name>github</server_name>
         <tool_name>create_issue</tool_name>
-        <arguments>
-        {
-        "owner": "octocat",
-        "repo": "hello-world",
-        "title": "Found a bug",
-        "body": "I'm having a problem with this.",
-        "labels": ["bug", "help wanted"],
-        "assignees": ["octocat"]
-        }
-        </arguments>
-        </use_mcp_tool>`
-                : ""
-        }
+        <query>ower is octocat, repo is hello-world, title is Found a bug, body is I'm having a problem with this. labels is "bug" and "help wanted",assignees is "octocat"</query>        
+        </use_mcp_tool>                
 
         # Tool Use Guidelines
 
@@ -669,12 +661,12 @@ class AgenticEdit:
         4. Once you've completed the user's task, you must use the attempt_completion tool to present the result of the task to the user. You may also provide a CLI command to showcase the result of your task; this can be particularly useful for web development tasks, where you can run e.g. \`open index.html\` to show the website you've built.
         5. The user may provide feedback, which you can use to make improvements and try again. But DO NOT continue in pointless back and forth conversations, i.e. don't end your responses with questions or offers for further assistance.
 
-        {{ enable_active_context }}
+        {% if enable_active_context %}
         **Very Important Notice**
         Each directory has a description file stored separately. For example, the description for the directory `{{ current_project }}/src/abc/bbc` can be found in the file `{{ current_project }}/.auto-coder/active-context/src/abc/bbc/active.md`.
         You can use the tool  `read_file` to read these description files, which helps you decide exactly which files need detailed attention. Note that the `active.md` file does not contain information about all files within the directory—it only includes information 
         about the files that were recently changed.
-        {{ enable_active_context }}
+        {% endif %}
         """
         env_info = detect_env()
         shell_type = "bash"
@@ -744,8 +736,8 @@ class AgenticEdit:
         Analyzes the user request, interacts with the LLM, parses responses,
         executes tools, and yields structured events for visualization until completion or error.
         """
-        system_prompt = self._analyze.prompt(request)
-
+        system_prompt = self._analyze.prompt(request)  
+        # print(system_prompt)      
         conversations = [
             {"role": "system", "content": system_prompt},
         ] + self.conversation_manager.get_history()
@@ -755,12 +747,13 @@ class AgenticEdit:
         self.conversation_manager.add_user_message(request.user_input)
         logger.debug(
             f"Initial conversation history size: {len(conversations)}")
-
+        
+        tool_executed = False
         while True:
             global_cancel.check_and_raise()
             logger.info(
                 f"Starting LLM interaction cycle. History size: {len(conversations)}")
-            tool_executed = False
+            
             assistant_buffer = ""
 
             llm_response_gen = stream_chat_with_continue(
@@ -946,19 +939,18 @@ class AgenticEdit:
                         params['requires_approval'] = params['requires_approval'].lower(
                         ) == 'true'
                     # Attempt to handle JSON parsing for arguments in use_mcp_tool
-                    if tool_tag == 'use_mcp_tool' and 'arguments' in params:
-                        try:
-                            params['arguments'] = json.loads(
-                                params['arguments'])
-                        except json.JSONDecodeError:
-                            logger.warning(
-                                f"Could not decode JSON arguments for use_mcp_tool: {params['arguments']}")
-                            # Keep as string or handle error? Let's keep as string for now.
-                            pass
+                    # if tool_tag == 'use_mcp_tool' and 'query' in params:
+                    #     try:
+                    #         params['arguments'] = json.loads(
+                    #             params['arguments'])
+                    #     except json.JSONDecodeError:
+                    #         logger.warning(
+                    #             f"Could not decode JSON arguments for use_mcp_tool: {params['arguments']}")
+                    #         # Keep as string or handle error? Let's keep as string for now.
+                    #         pass
                     # Handle recursive for list_files
                     if tool_tag == 'list_files' and 'recursive' in params:
-                        params['recursive'] = params['recursive'].lower() == 'true'
-
+                        params['recursive'] = params['recursive'].lower() == 'true'                    
                     return tool_cls(**params)
                 else:
                     logger.error(f"Tool class not found for tag: {tool_tag}")
@@ -996,7 +988,7 @@ class AgenticEdit:
                         break
 
                 # 2. Check for </tool_tag> if inside tool block
-                elif in_tool_block:
+                elif in_tool_block:                    
                     end_tag = f"</{current_tool_tag}>"
                     end_tool_pos = buffer.find(end_tag)
                     if end_tool_pos != -1:
@@ -1154,7 +1146,44 @@ class AgenticEdit:
                         metadata={}
                     )
                     event_manager.write_result(
-                        content=content.to_dict(), metadata=metadata)
+                        content=content.to_dict(), metadata=metadata.to_dict())
+                elif isinstance(agent_event, PlanModeRespondEvent):
+                    metadata.path = "/agent/edit/plan_mode_respond"                    
+                    content = EventContentCreator.create_markdown_result(
+                        content=agent_event.completion.response,
+                        metadata={}
+                    )                    
+                    event_manager.write_result(
+                        content=content.to_dict(), metadata=metadata.to_dict())
+
+                elif isinstance(agent_event, TokenUsageEvent):                    
+                    last_meta: SingleOutputMeta = agent_event.usage                                                                           
+                    # Get model info for pricing
+                    from autocoder.utils import llms as llm_utils
+                    model_name = ",".join(llm_utils.get_llm_names(self.llm))
+                    model_info = llm_utils.get_model_info(
+                        model_name, self.args.product_mode) or {}
+                    input_price = model_info.get(
+                        "input_price", 0.0) if model_info else 0.0
+                    output_price = model_info.get(
+                        "output_price", 0.0) if model_info else 0.0
+
+                    # Calculate costs
+                    input_cost = (last_meta.input_tokens_count *
+                                  input_price) / 1000000  # Convert to millions
+                    # Convert to millions
+                    output_cost = (
+                        last_meta.generated_tokens_count * output_price) / 1000000
+                                      
+                    get_event_manager(self.args.event_file).write_result(
+                        EventContentCreator.create_result(content=EventContentCreator.ResultTokenStatContent(
+                            model_name=model_name,
+                            elapsed_time=0.0,
+                            first_token_time=last_meta.first_token_time,
+                            input_tokens=last_meta.input_tokens_count,
+                            output_tokens=last_meta.generated_tokens_count,
+                        ).to_dict()),metadata=metadata.to_dict())
+
                 elif isinstance(agent_event, CompletionEvent):
                     # 在这里完成实际合并
                     try:
@@ -1168,7 +1197,7 @@ class AgenticEdit:
                         success_code="AGENT_COMPLETE",
                         success_message="Agent attempted task completion.",
                         result={
-                            **agent_event.completion.model_dump()
+                            "response": agent_event.completion.result
                         }
                     )
                     event_manager.write_completion(
@@ -1212,7 +1241,7 @@ class AgenticEdit:
     def apply_changes(self):
         """
         Apply all tracked file changes to the original project directory.
-        """
+        """        
         for (file_path, change) in self.get_all_file_changes().items():
             with open(file_path, 'w', encoding='utf-8') as f:
                 f.write(change.content)

{auto_coder-0.1.338 → auto_coder-0.1.340}/src/autocoder/common/v2/agent/agentic_edit_conversation.py

@@ -144,6 +144,7 @@ class AgenticConversation:
     def clear_history(self):
         """Clears the conversation history."""
         self._history = []
+        self._save_memory()
 
     def __len__(self) -> int:
         """Returns the number of messages in the history."""

{auto_coder-0.1.338 → auto_coder-0.1.340}/src/autocoder/common/v2/agent/agentic_tool_display.py

@@ -165,7 +165,7 @@ def get_tool_display_message(tool: BaseTool) -> str:
             "options_text": options_text_zh if lang == 'zh' else options_text_en
         }
     elif isinstance(tool, UseMcpTool):
-        args_str = json.dumps(tool.arguments, ensure_ascii=False)
+        args_str = tool.query
         snippet = args_str[:100]
         context = {
             "server_name": tool.server_name,

auto_coder-0.1.340/src/autocoder/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.340"

auto_coder-0.1.338/src/autocoder/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.338"