auto-coder 0.1.341__py3-none-any.whl → 0.1.342__py3-none-any.whl

{auto_coder-0.1.341.dist-info → auto_coder-0.1.342.dist-info}/METADATA

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

{auto_coder-0.1.341.dist-info → auto_coder-0.1.342.dist-info}/RECORD

@@ -14,7 +14,7 @@ autocoder/command_parser.py,sha256=fx1g9E6GaM273lGTcJqaFQ-hoksS_Ik2glBMnVltPCE,1
 autocoder/lang.py,sha256=PFtATuOhHRnfpqHQkXr6p4C893JvpsgwTMif3l-GEi0,14321
 autocoder/models.py,sha256=_SCar82QIeBFTZZBdM2jPS6atKVhHnvE0gX3V0CsxD4,11590
 autocoder/run_context.py,sha256=IUfSO6_gp2Wt1blFWAmOpN0b0nDrTTk4LmtCYUBIoro,1643
-autocoder/version.py,sha256=LegJaIowJMsa5uThYESSu9bRr94ij_6zuPr7GfWvb-4,23
+autocoder/version.py,sha256=EolTlQKlIqZEveTaGm_5Y3zX1HFWEe5tn-3pZ2Yg2Yk,23
 autocoder/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/agent/agentic_edit.py,sha256=XsfePZ-t6M-uBSdG1VLZXk1goqXk2HPeJ_A8IYyBuWQ,58896
 autocoder/agent/agentic_edit_types.py,sha256=oFcDd_cxJ2yH9Ed1uTpD3BipudgoIEWDMPb5pAkq4gI,3288
@@ -126,18 +126,18 @@ autocoder/common/v2/code_editblock_manager.py,sha256=G0CIuV9Ki0FqMLnpA8nBT4pnkCN
 autocoder/common/v2/code_manager.py,sha256=C403bS-f6urixwitlKHcml-J03hci-UyNwHJOqBiY6Q,9182
 autocoder/common/v2/code_strict_diff_manager.py,sha256=v-J1kDyLg7tLGg_6_lbO9S4fNkx7M_L8Xr2G7fPptiU,9347
 autocoder/common/v2/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder/common/v2/agent/agentic_edit.py,sha256=e35KhV0hTz973RcF98qylVFCaBoWtC0EufmEZgHrHD4,91123
+autocoder/common/v2/agent/agentic_edit.py,sha256=Nw2rXRMhiPzrd69eRuZOzbHYY_Qk9Ph4WiERU2Zqwec,91585
 autocoder/common/v2/agent/agentic_edit_conversation.py,sha256=qLLhTegH619JQTp3s1bj5FVn2hAcoV-DlhGO3UyIOMc,7338
 autocoder/common/v2/agent/agentic_edit_types.py,sha256=6qBLLmvdlcsbzrpMHsYQVIHqbOWubMXOnmkqTs1pBWQ,4629
 autocoder/common/v2/agent/agentic_tool_display.py,sha256=WKirt-2V346KLnbHgH3NVJiK3xvriD9oaCWj2IdvzLU,7309
 autocoder/common/v2/agent/agentic_edit_tools/__init__.py,sha256=wGICCc1dYh07osB21j62zOQ9Ws0PyyOQ12UYRHmHrtI,1229
-autocoder/common/v2/agent/agentic_edit_tools/ask_followup_question_tool_resolver.py,sha256=pjrukXjWXMIfUAUzoHzr7j2Onf1L7bxmjsUR1gGaFoA,2809
+autocoder/common/v2/agent/agentic_edit_tools/ask_followup_question_tool_resolver.py,sha256=YktmocUR0ygth8CVq9gXdUzIhX3FicULhwmnA_DTfik,3099
 autocoder/common/v2/agent/agentic_edit_tools/attempt_completion_tool_resolver.py,sha256=82ZGKeRBSDKeead_XVBW4FxpiE-5dS7tBOk_3RZ6B5s,1511
 autocoder/common/v2/agent/agentic_edit_tools/base_tool_resolver.py,sha256=Zid2m1uZd-2wVFGc_n_KAViXZyNjbdLSpI5n7ut1RUQ,1036
 autocoder/common/v2/agent/agentic_edit_tools/execute_command_tool_resolver.py,sha256=GueQfIY2hVu2R5j9R5rBtn2znl5MlmEdGtsa6snsMHs,4112
 autocoder/common/v2/agent/agentic_edit_tools/list_code_definition_names_tool_resolver.py,sha256=8QoMsADUDWliqiDt_dpguz31403syB8eeW0Pcw-qfb8,3842
 autocoder/common/v2/agent/agentic_edit_tools/list_files_tool_resolver.py,sha256=ERM5E7s2azQ8vcvogan4A_LZci8Pmhmxw1uQaNQhon4,5469
-autocoder/common/v2/agent/agentic_edit_tools/plan_mode_respond_tool_resolver.py,sha256=SZwFUxK6d2BaKWqQXi_c3IVe2iffviF6VUXJA9T9sx0,1492
+autocoder/common/v2/agent/agentic_edit_tools/plan_mode_respond_tool_resolver.py,sha256=lGT4_QYJK6Fa9f6HVSGo0cSsGK7qCsDYgJGUowNxPzk,1499
 autocoder/common/v2/agent/agentic_edit_tools/read_file_tool_resolver.py,sha256=9Bh0KVbL0qiIqwChlb77biiBiETQ3zekxGe5Fj7hXAg,2800
 autocoder/common/v2/agent/agentic_edit_tools/replace_in_file_tool_resolver.py,sha256=lpD4fCbVR8GTrynqXON69IjM94nPy3nuUL62Ashm5O4,7988
 autocoder/common/v2/agent/agentic_edit_tools/search_files_tool_resolver.py,sha256=ew0RwJ4oGjnpBOyYYtfxbFqU5W_kclT6FrCkpOB-tgs,6058
@@ -168,8 +168,8 @@ autocoder/dispacher/actions/plugins/action_regex_project.py,sha256=sbK9yFRaq8Ryt
 autocoder/dispacher/actions/plugins/action_translate.py,sha256=GEn7dZA22jy5WyzINomjmzzB795p2Olg-CJla97lRF8,7744
 autocoder/events/__init__.py,sha256=1x_juwr9Ows2RADDa2LyI4QlmPxOVOXZeLO1cht-slM,1443
 autocoder/events/event_content.py,sha256=eLHf5M1BifSqhzzEBgAWKn3JD5_z_1mWeNdZ53TpMqk,12240
-autocoder/events/event_manager.py,sha256=VLHrMGlCmuhi0bhLwKyHOQNZrm3ZlB9yfN2lH_phcYQ,11839
-autocoder/events/event_manager_singleton.py,sha256=8aBp97fgbas0KYrpHbljTg2n4RcWd85SOgQITu47ZWA,8809
+autocoder/events/event_manager.py,sha256=ObbvPfNrrhC85w5VvsnLS9oy92oHEwqMN08qGPReNNA,11884
+autocoder/events/event_manager_singleton.py,sha256=UubD6HQSDBmA0nBQyo6zr8ctzAPYTiA87ykOoNUCPZk,8895
 autocoder/events/event_store.py,sha256=y6tT3P-o3yhDptrKi-UmqI_ZBNg7v21FriI3f7lo_ME,12709
 autocoder/events/event_types.py,sha256=W_S6PTDIBdufcuPosgz64iITzQy79flL8s3hWB-vZ9o,3638
 autocoder/helper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -276,9 +276,9 @@ autocoder/utils/types.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/chat_stream_out.py,sha256=KW0mlmcHlStXi8-_6fXZ2-ifeJ5mgP0OV7DQFzCtIsw,14008
 autocoder/utils/chat_auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_coder-0.1.341.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-auto_coder-0.1.341.dist-info/METADATA,sha256=nXClzn15uBj3sXwn4stOcwYHoOwt52vJTA1_uE9Xa0o,2728
-auto_coder-0.1.341.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-auto_coder-0.1.341.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
-auto_coder-0.1.341.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
-auto_coder-0.1.341.dist-info/RECORD,,
+auto_coder-0.1.342.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+auto_coder-0.1.342.dist-info/METADATA,sha256=X_VZm5Bu13vhsbigTQzgyiMGwH3q9cmZkouvkn-S-0k,2728
+auto_coder-0.1.342.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+auto_coder-0.1.342.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
+auto_coder-0.1.342.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
+auto_coder-0.1.342.dist-info/RECORD,,

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'                    

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()
 

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:

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}")
         

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
 

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.341"
+__version__ = "0.1.342"