auto-coder 0.1.337__tar.gz → 0.1.339__tar.gz

{auto_coder-0.1.337 → auto_coder-0.1.339}/PKG-INFO

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

{auto_coder-0.1.337 → auto_coder-0.1.339}/src/auto_coder.egg-info/PKG-INFO

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

{auto_coder-0.1.337 → auto_coder-0.1.339}/src/autocoder/auto_coder_runner.py

@@ -2835,7 +2835,9 @@ def auto_command(query: str,extra_args: Dict[str,Any]={}):
             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)
+                                save_memory_func=save_memory), command_config=CommandConfig,
+                                conversation_name="current"
+                                )
             agent.run_in_terminal(AgenticEditRequest(user_input=query))
             return
     

{auto_coder-0.1.337 → auto_coder-0.1.339}/src/autocoder/common/auto_coder_lang.py

@@ -837,6 +837,42 @@ MESSAGES = {
 }
 
 
+# 新增 ReplaceInFileToolResolver 国际化消息
+MESSAGES.update({
+    "replace_in_file.access_denied": {
+        "en": "Error: Access denied. Attempted to modify file outside the project directory: {{file_path}}",
+        "zh": "错误：拒绝访问。尝试修改项目目录之外的文件：{{file_path}}"
+    },
+    "replace_in_file.file_not_found": {
+        "en": "Error: File not found at path: {{file_path}}",
+        "zh": "错误：未找到文件路径：{{file_path}}"
+    },
+    "replace_in_file.read_error": {
+        "en": "An error occurred while reading the file for replacement: {{error}}",
+        "zh": "读取待替换文件时发生错误：{{error}}"
+    },
+    "replace_in_file.no_valid_blocks": {
+        "en": "Error: No valid SEARCH/REPLACE blocks found in the provided diff.",
+        "zh": "错误：在提供的diff中未找到有效的SEARCH/REPLACE代码块。"
+    },
+    "replace_in_file.apply_failed": {
+        "en": "Failed to apply any changes. Errors:\n{{errors}}",
+        "zh": "未能应用任何更改。错误信息：\n{{errors}}"
+    },
+    "replace_in_file.apply_success": {
+        "en": "Successfully applied {{applied}}/{{total}} changes to file: {{file_path}}.",
+        "zh": "成功应用了 {{applied}}/{{total}} 个更改到文件：{{file_path}}。"
+    },
+    "replace_in_file.apply_success_with_warnings": {
+        "en": "Successfully applied {{applied}}/{{total}} changes to file: {{file_path}}.\nWarnings:\n{{errors}}",
+        "zh": "成功应用了 {{applied}}/{{total}} 个更改到文件：{{file_path}}。\n警告信息：\n{{errors}}"
+    },
+    "replace_in_file.write_error": {
+        "en": "An error occurred while writing the modified file: {{error}}",
+        "zh": "写入修改后的文件时发生错误：{{error}}"
+    }
+})
+
 def get_system_language():
     try:
         return locale.getdefaultlocale()[0][:2]

{auto_coder-0.1.337 → auto_coder-0.1.339}/src/autocoder/common/v2/agent/agentic_edit.py

@@ -1,3 +1,4 @@
+from autocoder.common.v2.agent.agentic_edit_conversation import AgenticConversation
 from enum import Enum
 from enum import Enum
 import json
@@ -64,7 +65,7 @@ from autocoder.common.v2.agent.agentic_edit_types import (AgenticEditRequest, To
                                                           TOOL_MODEL_MAP,
                                                           # Event Types
                                                           LLMOutputEvent, LLMThinkingEvent, ToolCallEvent,
-                                                          ToolResultEvent, CompletionEvent, ErrorEvent,TokenUsageEvent,
+                                                          ToolResultEvent, CompletionEvent, PlanModeRespondEvent, ErrorEvent, TokenUsageEvent,
                                                           # Import specific tool types for display mapping
                                                           ReadFileTool, WriteToFileTool, ReplaceInFileTool, ExecuteCommandTool,
                                                           ListFilesTool, SearchFilesTool, ListCodeDefinitionNamesTool,
@@ -87,6 +88,7 @@ TOOL_RESOLVER_MAP: Dict[Type[BaseTool], Type[BaseToolResolver]] = {
     UseMcpTool: UseMcpToolResolver,
 }
 
+
 # --- Tool Display Customization is now handled by agentic_tool_display.py ---
 
 
@@ -99,6 +101,7 @@ class AgenticEdit:
         args: AutoCoderArgs,
         memory_config: MemoryConfig,
         command_config: Optional[CommandConfig] = None,
+        conversation_name: str = "current"
     ):
         self.llm = llm
         self.args = args
@@ -113,27 +116,30 @@ class AgenticEdit:
         self.project_type_analyzer = ProjectTypeAnalyzer(
             args=args, llm=self.llm)
 
+        self.conversation_manager = AgenticConversation(
+            args, self.conversation_history, conversation_name=conversation_name)
+
         self.shadow_manager = ShadowManager(
             args.source_dir, args.event_file, args.ignore_clean_shadows)
         self.shadow_linter = ShadowLinter(self.shadow_manager, verbose=False)
         self.shadow_compiler = ShadowCompiler(
-            self.shadow_manager, verbose=False)    
-            
+            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(...) }        
+        # 格式: { file_path: FileChangeEntry(...) }
         self.file_changes: Dict[str, FileChangeEntry] = {}
 
     def record_file_change(self, file_path: str, change_type: str, diff: Optional[str] = None, content: Optional[str] = None):
@@ -148,7 +154,8 @@ class AgenticEdit:
         """
         entry = self.file_changes.get(file_path)
         if entry is None:
-            entry = FileChangeEntry(type=change_type, diffs=[], content=content)
+            entry = FileChangeEntry(
+                type=change_type, diffs=[], content=content)
             self.file_changes[file_path] = entry
         else:
             # 文件已经存在，可能之前是 added，现在又被 modified，或者多次 modified
@@ -185,8 +192,10 @@ class AgenticEdit:
             for fname in files:
                 shadow_file_path = os.path.join(root, fname)
                 try:
-                    project_file_path = self.shadow_manager.from_shadow_path(shadow_file_path)
-                    rel_path = os.path.relpath(project_file_path, self.args.source_dir)
+                    project_file_path = self.shadow_manager.from_shadow_path(
+                        shadow_file_path)
+                    rel_path = os.path.relpath(
+                        project_file_path, self.args.source_dir)
                     changed_files.append(rel_path)
                 except Exception:
                     # 非映射关系，忽略
@@ -377,7 +386,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.
@@ -391,7 +400,7 @@ class AgenticEdit:
         Your query here
         </query>
         </use_mcp_tool> 
-        
+
         {%if mcp_server_info %}
         ### MCP_SERVER_LIST
         {{mcp_server_info}}
@@ -463,24 +472,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
 
@@ -660,12 +658,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"
@@ -735,11 +733,15 @@ 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},
-            {"role": "user", "content": request.user_input}
-        ]
+        ] + self.conversation_manager.get_history()
+        conversations.append({
+            "role": "user", "content": request.user_input
+        })
+        self.conversation_manager.add_user_message(request.user_input)
         logger.debug(
             f"Initial conversation history size: {len(conversations)}")
 
@@ -749,17 +751,17 @@ class AgenticEdit:
                 f"Starting LLM interaction cycle. History size: {len(conversations)}")
             tool_executed = False
             assistant_buffer = ""
-            
+
             llm_response_gen = stream_chat_with_continue(
                 llm=self.llm,
                 conversations=conversations,
                 llm_config={},  # Placeholder for future LLM configs
                 args=self.args
             )
-            
+
             meta_holder = byzerllm.MetaHolder()
             parsed_events = self.stream_and_parse_llm_response(
-                llm_response_gen,meta_holder)
+                llm_response_gen, meta_holder)
 
             for event in parsed_events:
                 global_cancel.check_and_raise()
@@ -777,6 +779,8 @@ class AgenticEdit:
                         "role": "assistant",
                         "content": assistant_buffer + tool_xml
                     })
+                    self.conversation_manager.add_assistant_message(
+                        assistant_buffer + tool_xml)
                     assistant_buffer = ""  # Reset buffer after tool call
 
                     yield event  # Yield the ToolCallEvent for display
@@ -790,6 +794,14 @@ class AgenticEdit:
                             "AgenticEdit analyze loop finished due to AttemptCompletion.")
                         return
 
+                    if isinstance(tool_obj, PlanModeRespondTool):
+                        logger.info(
+                            "PlanModeRespondTool received. Finalizing session.")
+                        yield PlanModeRespondEvent(completion=tool_obj, completion_xml=tool_xml)
+                        logger.info(
+                            "AgenticEdit analyze loop finished due to PlanModeRespond.")
+                        return
+
                     # Resolve the tool
                     resolver_cls = TOOL_RESOLVER_MAP.get(type(tool_obj))
                     if not resolver_cls:
@@ -844,6 +856,7 @@ class AgenticEdit:
                         "role": "user",  # Simulating the user providing the tool result
                         "content": error_xml
                     })
+                    self.conversation_manager.add_user_message(error_xml)
                     logger.debug(
                         f"Added tool result to conversations for tool {type(tool_obj).__name__}")
                     break  # After tool execution and result, break to start a new LLM cycle
@@ -862,6 +875,8 @@ class AgenticEdit:
                 if assistant_buffer:
                     conversations.append(
                         {"role": "assistant", "content": assistant_buffer})
+                    self.conversation_manager.add_assistant_message(
+                        assistant_buffer)
                 # If the loop ends without AttemptCompletion, it means the LLM finished talking
                 # without signaling completion. We might just stop or yield a final message.
                 # Let's assume it stops here.
@@ -870,7 +885,7 @@ class AgenticEdit:
         logger.info("AgenticEdit analyze loop finished.")
 
     def stream_and_parse_llm_response(
-        self, generator: Generator[Tuple[str, Any], None, None],meta_holder: byzerllm.MetaHolder
+        self, generator: Generator[Tuple[str, Any], None, None], meta_holder: byzerllm.MetaHolder
     ) -> Generator[Union[LLMOutputEvent, LLMThinkingEvent, ToolCallEvent, ErrorEvent], None, None]:
         """
         Streamingly parses the LLM response generator, distinguishing between
@@ -920,19 +935,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}")
@@ -970,7 +984,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:
@@ -1081,17 +1095,17 @@ class AgenticEdit:
         Runs the agentic edit process, converting internal events to the
         standard event system format and writing them using the event manager.
         """
-        event_manager = get_event_manager(self.args.event_file)        
+        event_manager = get_event_manager(self.args.event_file)
 
         try:
             event_stream = self.analyze(request)
             for agent_event in event_stream:
                 content = None
                 metadata = EventMetadata(
-                    action_file=self.args.event_file, 
-                    is_streaming=False, 
+                    action_file=self.args.event_file,
+                    is_streaming=False,
                     stream_out_type="/agent/edit")
-                
+
                 if isinstance(agent_event, LLMThinkingEvent):
                     content = EventContentCreator.create_stream_thinking(
                         content=agent_event.text)
@@ -1134,7 +1148,8 @@ class AgenticEdit:
                     try:
                         self.apply_changes()
                     except Exception as e:
-                        logger.exception(f"Error merging shadow changes to project: {e}")
+                        logger.exception(
+                            f"Error merging shadow changes to project: {e}")
 
                     metadata.path = "/agent/edit/completion"
                     content = EventContentCreator.create_completion(
@@ -1144,7 +1159,8 @@ class AgenticEdit:
                             **agent_event.completion.model_dump()
                         }
                     )
-                    event_manager.write_completion(content=content.to_dict(), metadata=metadata.to_dict())
+                    event_manager.write_completion(
+                        content=content.to_dict(), metadata=metadata.to_dict())
                 elif isinstance(agent_event, ErrorEvent):
                     metadata.path = "/agent/edit/error"
                     content = EventContentCreator.create_error(
@@ -1152,7 +1168,8 @@ class AgenticEdit:
                         error_message=agent_event.message,
                         details={"agent_event_type": "ErrorEvent"}
                     )
-                    event_manager.write_error(content=content.to_dict(), metadata=metadata.to_dict())
+                    event_manager.write_error(
+                        content=content.to_dict(), metadata=metadata.to_dict())
                 else:
                     metadata.path = "/agent/edit/error"
                     logger.warning(
@@ -1163,7 +1180,8 @@ class AgenticEdit:
                         details={"agent_event_type": type(
                             agent_event).__name__}
                     )
-                    event_manager.write_error(content=content.to_dict(), metadata=metadata.to_dict())
+                    event_manager.write_error(
+                        content=content.to_dict(), metadata=metadata.to_dict())
 
         except Exception as e:
             logger.exception(
@@ -1174,15 +1192,16 @@ class AgenticEdit:
                 error_message=f"An unexpected error occurred: {str(e)}",
                 details={"exception_type": type(e).__name__}
             )
-            event_manager.write_error(content=error_content.to_dict(), metadata=metadata.to_dict())
+            event_manager.write_error(
+                content=error_content.to_dict(), metadata=metadata.to_dict())
             # Re-raise the exception if needed, or handle appropriately
             raise e
 
     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():            
+        """
+        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)
 
@@ -1194,33 +1213,40 @@ class AgenticEdit:
                         self.args.source_dir,
                         f"{self.args.query}\nauto_coder_{file_name}",
                     )
-                    
-                    action_yml_file_manager = ActionYmlFileManager(self.args.source_dir)
+
+                    action_yml_file_manager = ActionYmlFileManager(
+                        self.args.source_dir)
                     action_file_name = os.path.basename(self.args.file)
                     add_updated_urls = []
                     commit_result.changed_files
                     for file in commit_result.changed_files:
-                        add_updated_urls.append(os.path.join(self.args.source_dir, file))
+                        add_updated_urls.append(
+                            os.path.join(self.args.source_dir, file))
 
                     self.args.add_updated_urls = add_updated_urls
-                    update_yaml_success = action_yml_file_manager.update_yaml_field(action_file_name, "add_updated_urls", add_updated_urls)
-                    if not update_yaml_success:                        
-                        self.printer.print_in_terminal("yaml_save_error", style="red", yaml_file=action_file_name)  
+                    update_yaml_success = action_yml_file_manager.update_yaml_field(
+                        action_file_name, "add_updated_urls", add_updated_urls)
+                    if not update_yaml_success:
+                        self.printer.print_in_terminal(
+                            "yaml_save_error", style="red", yaml_file=action_file_name)
 
                     if self.args.enable_active_context:
-                        active_context_manager = ActiveContextManager(self.llm, self.args.source_dir)
-                        task_id = active_context_manager.process_changes(self.args)
-                        self.printer.print_in_terminal("active_context_background_task", 
-                                                     style="blue",
-                                                     task_id=task_id)
+                        active_context_manager = ActiveContextManager(
+                            self.llm, self.args.source_dir)
+                        task_id = active_context_manager.process_changes(
+                            self.args)
+                        self.printer.print_in_terminal("active_context_background_task",
+                                                       style="blue",
+                                                       task_id=task_id)
                     git_utils.print_commit_info(commit_result=commit_result)
                 except Exception as e:
                     self.printer.print_str_in_terminal(
-                        self.git_require_msg(source_dir=self.args.source_dir, error=str(e)),
+                        self.git_require_msg(
+                            source_dir=self.args.source_dir, error=str(e)),
                         style="red"
-                    )                                                
+                    )
         else:
-            self.printer.print_in_terminal("no_changes_made")        
+            self.printer.print_in_terminal("no_changes_made")
 
     def run_in_terminal(self, request: AgenticEditRequest):
         """
@@ -1258,6 +1284,9 @@ class AgenticEdit:
                     if event.tool_name == "AttemptCompletionTool":
                         continue  # Do not display AttemptCompletionTool result
 
+                    if event.tool_name == "PlanModeRespondTool":
+                        continue
+
                     result = event.result
                     title = f"✅ Tool Result: {event.tool_name}" if result.success else f"❌ Tool Result: {event.tool_name}"
                     border_style = "green" if result.success else "red"
@@ -1274,7 +1303,7 @@ class AgenticEdit:
                     panel_content = [base_content]
                     syntax_content = None
 
-                    if result.content is not None:                        
+                    if result.content is not None:
                         content_str = ""
                         try:
                             if isinstance(result.content, (dict, list)):
@@ -1316,7 +1345,8 @@ class AgenticEdit:
                             else:
                                 content_str = str(result.content)
                                 # Append simple string content directly
-                                panel_content.append(_format_content(content_str))
+                                panel_content.append(
+                                    _format_content(content_str))
                         except Exception as e:
                             logger.warning(
                                 f"Error formatting tool result content: {e}")
@@ -1329,13 +1359,17 @@ class AgenticEdit:
                     # Print syntax highlighted content separately if it exists
                     if syntax_content:
                         console.print(syntax_content)
+                elif isinstance(event, PlanModeRespondEvent):
+                    console.print(Panel(Markdown(event.completion.response),
+                                  title="🏁 Task Completion", border_style="green", title_align="left"))
 
                 elif isinstance(event, CompletionEvent):
                     # 在这里完成实际合并
                     try:
                         self.apply_changes()
                     except Exception as e:
-                        logger.exception(f"Error merging shadow changes to project: {e}")
+                        logger.exception(
+                            f"Error merging shadow changes to project: {e}")
 
                     console.print(Panel(Markdown(event.completion.result),
                                   title="🏁 Task Completion", border_style="green", title_align="left"))

{auto_coder-0.1.337 → auto_coder-0.1.339}/src/autocoder/common/v2/agent/agentic_edit_conversation.py

@@ -1,6 +1,7 @@
 # src/autocoder/common/v2/agent/agentic_edit_conversation.py
 import os
 import json
+import uuid
 from typing import List, Dict, Any, Optional
 from autocoder.common import AutoCoderArgs
 
@@ -15,16 +16,32 @@ class AgenticConversation:
     and retrieving the history.
     """
 
-    def __init__(self, args: AutoCoderArgs, initial_history: Optional[List[MessageType]] = None):
+    def __init__(self, args: AutoCoderArgs, initial_history: Optional[List[MessageType]] = None, conversation_name: Optional[str] = None):
         """
         Initializes the conversation history.
 
         Args:
             initial_history: An optional list of messages to start with.
+            conversation_name: Optional conversation identifier. If provided, history is saved/loaded from a file named after it.
         """
         self.project_path = args.source_dir
         self._history: List[MessageType] = initial_history if initial_history is not None else []
-        self.memory_file_path = os.path.join(self.project_path, ".auto-coder", "memory", "agentic_edit_memory.json")
+
+        # Determine the memory directory
+        memory_dir = os.path.join(self.project_path, ".auto-coder", "memory", "agentic_edit_memory")
+        os.makedirs(memory_dir, exist_ok=True)
+
+        # Determine conversation file path
+        if conversation_name:
+            filename = f"{conversation_name}.json"
+        else:
+            conversation_name = str(uuid.uuid4())
+            filename = f"{conversation_name}.json"
+
+        self.conversation_name = conversation_name
+        self.memory_file_path = os.path.join(memory_dir, filename)
+
+        # Load existing history if file exists
         self._load_memory()
 
     def add_message(self, role: str, content: Any, **kwargs):
@@ -67,14 +84,62 @@ class AgenticConversation:
 
     def get_history(self) -> List[MessageType]:
         """
-        Returns the current conversation history.
-
+        Returns the latest 20 pairs of (user, assistant) conversation history.
+        Merges adjacent same-role messages into one, concatenated by newline.
+        Ensures that each user message is paired with the subsequent assistant response,
+        skips other roles, and that the last message is always assistant (drops trailing user if unpaired).
+        
         Returns:
-            A list of message dictionaries.
+            A list of message dictionaries, ordered chronologically.
         """
-        # Return a deep copy might be safer if messages contain mutable objects,
-        # but a shallow copy is usually sufficient for typical message structures.
-        return self._history.copy()
+        paired_history = []
+        pair_count = 0
+        pending_assistant = None
+        pending_user = None
+
+        # Traverse history in reverse to collect latest pairs with merging
+        for msg in reversed(self._history):
+            role = msg.get("role")
+            if role == "assistant":
+                if pending_assistant is None:
+                    pending_assistant = dict(msg)
+                else:
+                    # Merge with previous assistant
+                    prev_content = pending_assistant.get("content", "")
+                    curr_content = msg.get("content", "")
+                    merged_content = (curr_content.strip() + "\n" + prev_content.strip()).strip()
+                    pending_assistant["content"] = merged_content
+            elif role == "user":
+                if pending_user is None:
+                    pending_user = dict(msg)
+                else:
+                    # Merge with previous user
+                    prev_content = pending_user.get("content", "")
+                    curr_content = msg.get("content", "")
+                    merged_content = (curr_content.strip() + "\n" + prev_content.strip()).strip()
+                    pending_user["content"] = merged_content
+
+                if pending_assistant is not None:
+                    # Have a full pair, insert in order
+                    paired_history.insert(0, pending_user)
+                    paired_history.insert(1, pending_assistant)
+                    pair_count += 1
+                    pending_assistant = None
+                    pending_user = None
+                    if pair_count >= 20:
+                        break
+                else:
+                    # User without assistant yet, continue accumulating
+                    continue
+            else:
+                # Ignore other roles
+                continue
+
+        # Ensure last message is assistant, drop trailing user if unpaired
+        if paired_history and paired_history[-1].get("role") == "user":
+            paired_history.pop()
+
+        return paired_history
 
     def clear_history(self):
         """Clears the conversation history."""