auto-coder 0.1.341__tar.gz → 0.1.344__tar.gz

{auto_coder-0.1.341 → auto_coder-0.1.344}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.341
+Version: 0.1.344
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10

{auto_coder-0.1.341 → auto_coder-0.1.344}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.341
+Version: 0.1.344
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10

{auto_coder-0.1.341 → auto_coder-0.1.344}/src/autocoder/commands/auto_command.py

@@ -787,11 +787,10 @@ class CommandAutoTuner:
         <name>list_files</name>
         <description>list_files 查看某个目录下的所有文件</description>
         <usage>
-         该命令不需要任何参数，直接使用即可。
-         使用例子：
-
-         list_files()
-
+        该工具用于列出指定目录下的所有文件（不包括子目录中的文件）。
+        输入参数 path: 要列出文件的目录路径
+        返回值是目录下所有文件的列表，以换行符分隔
+        list_files(path="/tmp")
         </usage>
         </command>        
 
@@ -1529,3 +1528,10 @@ class CommandAutoTuner:
                 query=f"Command: {command} Parameters: {json.dumps(parameters) if parameters else 'None'}",
                 response=f"Command execution failed: {error_msg}"
             )
+
+            self.result_manager = ResultManager()
+            result = f"command {command} with parameters {parameters} execution failed with error {error_msg}"
+            self.result_manager.add_result(content=result, meta={
+                "action": command,
+                "input": parameters
+            })

{auto_coder-0.1.341 → auto_coder-0.1.344}/src/autocoder/commands/tools.py

@@ -655,7 +655,7 @@ class AutoCommandTools:
         该工具用于列出指定目录下的所有文件（不包括子目录中的文件）。
         输入参数 path: 要列出文件的目录路径
         返回值是目录下所有文件的列表，以逗号分隔。
-        """
+        """        
         # 处理绝对路径和相对路径
         target_path = path
         if not os.path.isabs(path):
@@ -687,12 +687,10 @@ class AutoCommandTools:
         file_list = []
         for item in os.listdir(target_path):
             item_path = os.path.join(target_path, item)
-            # 只添加文件，不添加目录
-            if os.path.isfile(item_path):
-                file_list.append(item_path)
+            file_list.append(item_path)                
 
         # 生成以逗号分隔的文件列表
-        result = ",".join(file_list)
+        result = "\n".join(file_list)
 
         # 记录结果
         self.result_manager.add_result(content=result, meta={

{auto_coder-0.1.341 → auto_coder-0.1.344}/src/autocoder/common/v2/agent/agentic_edit.py

@@ -938,16 +938,23 @@ class AgenticEdit:
                     if 'requires_approval' in params:
                         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 '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
+                    # Attempt to handle JSON parsing for ask_followup_question_tool
+                    if tool_tag == 'ask_followup_question' and 'options' in params:
+                        try:
+                            params['options'] = json.loads(
+                                params['options'])
+                        except json.JSONDecodeError:
+                            logger.warning(
+                                f"Could not decode JSON options for ask_followup_question_tool: {params['options']}")
+                            # Keep as string or handle error? Let's keep as string for now.
+                            pass
+                    if tool_tag == 'plan_mode_respond' and 'options' in params:
+                        try:
+                            params['options'] = json.loads(
+                                params['options'])
+                        except json.JSONDecodeError:
+                            logger.warning(
+                                f"Could not decode JSON options for plan_mode_respond_tool: {params['options']}")                               
                     # Handle recursive for list_files
                     if tool_tag == 'list_files' and 'recursive' in params:
                         params['recursive'] = params['recursive'].lower() == 'true'                    
@@ -1106,7 +1113,7 @@ class AgenticEdit:
             for agent_event in event_stream:
                 content = None
                 metadata = EventMetadata(
-                    action_file=self.args.event_file,
+                    action_file=self.args.file,
                     is_streaming=False,
                     stream_out_type="/agent/edit")
 
@@ -1182,6 +1189,8 @@ class AgenticEdit:
                             first_token_time=last_meta.first_token_time,
                             input_tokens=last_meta.input_tokens_count,
                             output_tokens=last_meta.generated_tokens_count,
+                            input_cost=input_cost,
+                            output_cost=output_cost
                         ).to_dict()),metadata=metadata.to_dict())
 
                 elif isinstance(agent_event, CompletionEvent):

{auto_coder-0.1.341 → auto_coder-0.1.344}/src/autocoder/common/v2/agent/agentic_edit_tools/ask_followup_question_tool_resolver.py

@@ -12,6 +12,7 @@ from prompt_toolkit.styles import Style
 from rich.console import Console
 from rich.panel import Panel
 from rich.text import Text
+from autocoder.common.result_manager import ResultManager
 
 if typing.TYPE_CHECKING:
     from autocoder.common.v2.agent.agentic_edit import AgenticEdit
@@ -20,6 +21,7 @@ class AskFollowupQuestionToolResolver(BaseToolResolver):
     def __init__(self, agent: Optional['AgenticEdit'], tool: AskFollowupQuestionTool, args: AutoCoderArgs):
         super().__init__(agent, tool, args)
         self.tool: AskFollowupQuestionTool = tool # For type hinting
+        self.result_manager = ResultManager()
 
     def resolve(self) -> ToolResult:
         """
@@ -28,17 +30,17 @@ class AskFollowupQuestionToolResolver(BaseToolResolver):
         """
         question = self.tool.question
         options = self.tool.options
-
+        options_text = "\n".join([f"{i+1}. {option}" for i, option in enumerate(options)])
         if get_run_context().is_web():
             answer = get_event_manager(
                 self.args.event_file).ask_user(prompt=question)
-            self.result_manager.append(content=answer, meta={
+            self.result_manager.append(content=answer + "\n" + options_text, meta={
                 "action": "ask_user",
                 "input": {
                     "question": question
                 }
             })
-            return answer
+            return ToolResult(success=True, message="Follow-up question prepared.", content=answer)
 
         console = Console()
 

{auto_coder-0.1.341 → auto_coder-0.1.344}/src/autocoder/common/v2/agent/agentic_edit_tools/plan_mode_respond_tool_resolver.py

@@ -18,8 +18,7 @@ class PlanModeRespondToolResolver(BaseToolResolver):
         Packages the response and options for Plan Mode interaction.
         """
         response_text = self.tool.response
-        options = self.tool.options
-
+        options = self.tool.options        
         logger.info(f"Resolving PlanModeRespondTool: Response='{response_text[:100]}...', Options={options}")
 
         if not response_text:

{auto_coder-0.1.341 → auto_coder-0.1.344}/src/autocoder/events/event_manager.py

@@ -138,7 +138,7 @@ class EventManager:
         blocker = threading.Event()        
         self.event_store.append_event(event)            
         self._blocking_events[event.event_id] = blocker
-        logger.debug(f"self._blocking_events: {self._blocking_events}")
+        logger.info(f"ASK_USER: {self} {self.event_store.file_path} self._blocking_events: {self._blocking_events}")
         if callback:
             self._response_callbacks[event.event_id] = callback
             logger.debug(f"Registered callback for event: {event.event_id}")
@@ -194,7 +194,7 @@ class EventManager:
         Returns:
             The created response event
         """
-        logger.debug(f"respond_to_user called for event: {ask_event_id} with response: '{response}'")
+        logger.info(f"respond_to_user called for event: {ask_event_id} with response: '{response}'")
         
         # 创建响应事件
         event = ResponseEvent(
@@ -205,7 +205,7 @@ class EventManager:
         
         # 存储响应事件
         self.event_store.append_event(event)
-        logger.debug(f"Response event created and stored with ID: {event.event_id}")
+        logger.info(f"Response event created and stored with ID: {event.event_id}")
                 
         # 获取回调和阻塞器
         callback = None
@@ -214,29 +214,28 @@ class EventManager:
         if ask_event_id in self._response_callbacks:
             callback = self._response_callbacks[ask_event_id]
             # 暂时不删除回调，确保不会丢失
-            logger.debug(f"Retrieved callback for event: {ask_event_id}")
+            logger.info(f"Retrieved callback for event: {ask_event_id}")
         else:
-            logger.debug(f"No callback found for event: {ask_event_id}")
+            logger.info(f"No callback found for event: {ask_event_id}")
                             
         
         # 如果找到了回调，执行它
         if callback:
             try:
-                logger.debug(f"Executing callback for event: {ask_event_id}")
+                logger.info(f"Executing callback for event: {ask_event_id}")
                 callback(response)
-                logger.debug(f"Callback execution completed for event: {ask_event_id}")
-                
-                # 回调执行后再移除它                
+                logger.info(f"Callback execution completed for event: {ask_event_id}")
+                                
                 if ask_event_id in self._response_callbacks:
                     del self._response_callbacks[ask_event_id]
             except Exception as e:
                 logger.error(f"Error in response callback: {e}")   
 
         # 检查是否存在对应的阻塞事件        
-        logger.debug(f"self._blocking_events: {self._blocking_events}")
+        logger.info(f"RESPONSD_TO_USER: {self} {self.event_store.file_path} self._blocking_events: {self._blocking_events}")
         if ask_event_id in self._blocking_events:
             self._blocking_events[ask_event_id].set()
-            logger.debug(f"Unblocked event: {ask_event_id}")
+            logger.info(f"Unblocked event: {ask_event_id}")
         else:
             logger.warning(f"No blocking event found for event_id: {ask_event_id}")
         

{auto_coder-0.1.341 → auto_coder-0.1.344}/src/autocoder/events/event_manager_singleton.py

@@ -93,8 +93,9 @@ def gengerate_event_file_path(project_path: Optional[str] = None) -> Tuple[str,s
     # 组合文件名
     file_name = f"{file_id}.jsonl"
     
+    # 要使用绝对路径，否则会被认为产生两个event_manager
     if project_path is None:
-        return os.path.join(".auto-coder", "events", file_name),file_id
+        return os.path.join(os.getcwd(),".auto-coder", "events", file_name),file_id
     else:   
         return os.path.join(project_path, ".auto-coder", "events", file_name),file_id
 

auto_coder-0.1.344/src/autocoder/version.py

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

auto_coder-0.1.341/src/autocoder/version.py

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