auto-coder 0.1.260__tar.gz → 0.1.261__tar.gz

{auto_coder-0.1.260 → auto_coder-0.1.261}/PKG-INFO

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

{auto_coder-0.1.260 → auto_coder-0.1.261}/src/auto_coder.egg-info/PKG-INFO

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

{auto_coder-0.1.260 → auto_coder-0.1.261}/src/auto_coder.egg-info/SOURCES.txt

@@ -58,11 +58,14 @@ src/autocoder/common/code_modification_ranker.py
 src/autocoder/common/command_completer.py
 src/autocoder/common/command_generator.py
 src/autocoder/common/command_templates.py
+src/autocoder/common/conf_validator.py
 src/autocoder/common/const.py
+src/autocoder/common/conversation_pruner.py
 src/autocoder/common/files.py
 src/autocoder/common/git_utils.py
 src/autocoder/common/global_cancel.py
 src/autocoder/common/image_to_page.py
+src/autocoder/common/index_import_export.py
 src/autocoder/common/interpreter.py
 src/autocoder/common/llm_rerank.py
 src/autocoder/common/mcp_hub.py
@@ -150,6 +153,7 @@ src/autocoder/utils/model_provider_selector.py
 src/autocoder/utils/multi_turn.py
 src/autocoder/utils/operate_config_api.py
 src/autocoder/utils/print_table.py
+src/autocoder/utils/project_structure.py
 src/autocoder/utils/queue_communicate.py
 src/autocoder/utils/request_event_queue.py
 src/autocoder/utils/request_queue.py

{auto_coder-0.1.260 → auto_coder-0.1.261}/src/autocoder/agent/auto_review_commit.py

@@ -8,6 +8,7 @@ from rich.console import Console
 from autocoder.common.printer import Printer
 from autocoder.common import AutoCoderArgs
 from autocoder.common.utils_code_auto_generate import stream_chat_with_continue
+import hashlib
 
 
 def load_yaml_config(yaml_file: str) -> Dict:
@@ -41,13 +42,13 @@ class AutoReviewCommit:
         self.console = console or Console()
 
     @byzerllm.prompt()
-    def review(self, querie_with_urls_and_diffs: List[Tuple[str, List[str], str]], query: str) -> Generator[str,None,None]:
+    def review(self, querie_with_urls_and_changes: List[Tuple[str, List[str], Dict[str, Tuple[str, str]]]], query: str) -> Generator[str,None,None]:
         """
         如果前面我们对话提供了文档，请参考上面的文档对提交的代码变更进行审查，提供改进建议。
 
         下面包含最新一次提交的信息：        
         <commit>
-        {% for query,urls,diff in querie_with_urls_and_diffs %}
+        {% for query,urls,changes in querie_with_urls_and_changes %}
         ## 任务需求
         {{ query }}
 
@@ -57,9 +58,18 @@ class AutoReviewCommit:
         {% endfor %}
 
         代码变更:
-        ```diff
-        {{ diff }}
-        ```
+        {% for file_path, (before, after) in changes.items() %}
+        ##File: {{ file_path }}
+        ##修改前:
+        
+        {{ before or "New file" }}        
+        
+        ##File: {{ file_path }}
+        ##修改后:
+        
+        {{ after or "File deleted" }}
+        
+        {% endfor %}
         {% endfor %}
         </commit>
 
@@ -70,7 +80,7 @@ class AutoReviewCommit:
            - 实现逻辑：算法和数据结构的选择是否合适
            
         2. 潜在问题检查
-           - 常见错误：是否存在空指针，数组越界，类型转换，未声明变量,typo等低级错误
+           - 常见错误：缩进（比如python）,闭合标签（前端vue,reactjs）,是否存在空指针，数组越界，类型转换，未声明变量,typo等低级错误
            - 安全性：是否存在安全隐患
            - 性能：是否有性能问题
            - 并发：是否有并发安全问题
@@ -83,8 +93,7 @@ class AutoReviewCommit:
            - 依赖关系：组件耦合是否合理
            - 复用性：是否有重复代码
 
-        返回格式说明：
-        返回 markdown 格式，包含以下内容：
+        评审结果包含以下内容：
         1. issues: 发现的具体问题列表
         2. suggestions: 对应的改进建议列表
         3. severity: 问题的严重程度(low/medium/high)
@@ -130,10 +139,10 @@ class AutoReviewCommit:
 
         action_file = action_files[0]
 
-        querie_with_urls_and_diffs = []
+        querie_with_urls_and_changes = []
         repo = git.Repo(self.project_dir)
 
-        # 收集所有query、urls和对应的commit diff
+        # 收集所有query、urls和对应的文件变化
         for yaml_file in [action_file]:
             yaml_path = os.path.join(self.actions_dir, yaml_file)
             config = load_yaml_config(yaml_path)
@@ -145,11 +154,12 @@ class AutoReviewCommit:
             urls = config.get('urls', [])
 
             if query and urls:
-                commit_diff = ""
+                changes = {}
                 if not self.skip_diff:
-                    # 计算文件的MD5用于匹配commit
-                    import hashlib
-                    file_md5 = hashlib.md5(open(yaml_path, 'rb').read()).hexdigest()
+                    # 计算文件的MD5用于匹配commit   
+                    with open(yaml_path, 'r', encoding='utf-8') as f:
+                        yaml_content = f.read()                 
+                        file_md5 = hashlib.md5(yaml_content.encode("utf-8")).hexdigest()
                     response_id = f"auto_coder_{yaml_file}_{file_md5}"
                     # 查找对应的commit                   
                     try:
@@ -157,21 +167,38 @@ class AutoReviewCommit:
                             if response_id in commit.message:
                                 if commit.parents:
                                     parent = commit.parents[0]
-                                    commit_diff = repo.git.diff(
-                                        parent.hexsha, commit.hexsha)
-                                else:
-                                    commit_diff = repo.git.show(commit.hexsha)
+                                    # 获取所有文件的前后内容
+                                    for diff_item in parent.diff(commit):
+                                        file_path = diff_item.a_path if diff_item.a_path else diff_item.b_path
+                                        
+                                        # 获取变更前内容
+                                        before_content = None
+                                        try:
+                                            if diff_item.a_blob:
+                                                before_content = repo.git.show(f"{parent.hexsha}:{file_path}")
+                                        except git.exc.GitCommandError:
+                                            pass  # 文件可能是新增的
+
+                                        # 获取变更后内容
+                                        after_content = None
+                                        try:
+                                            if diff_item.b_blob:
+                                                after_content = repo.git.show(f"{commit.hexsha}:{file_path}")
+                                        except git.exc.GitCommandError:
+                                            pass  # 文件可能被删除
+
+                                        changes[file_path] = (before_content, after_content)
                                 break
                     except git.exc.GitCommandError as e:
                         printer = Printer()
                         printer.print_in_terminal("git_command_error", style="red", error=str(e))
                     except Exception as e:
                         printer = Printer()
-                        printer.print_in_terminal("get_commit_diff_error", style="red", error=str(e))
+                        printer.print_in_terminal("get_commit_changes_error", style="red", error=str(e))
 
-                querie_with_urls_and_diffs.append((query, urls, commit_diff))
+                querie_with_urls_and_changes.append((query, urls, changes))
 
-        return querie_with_urls_and_diffs
+        return querie_with_urls_and_changes
     
 
     def review_commit(self,query: str, conversations: List[Dict]) -> Generator[str,None,None]:
@@ -183,15 +210,15 @@ class AutoReviewCommit:
         """
         printer = Printer()
         # 获取最新的提交信息
-        commits = self.parse_history_tasks()
-        if not commits:            
+        changes = self.parse_history_tasks()
+        if not changes:            
             printer.print_in_terminal("no_latest_commit", style="red")
             return None
 
         # 调用LLM进行代码审查
         try:
             # 获取 prompt 内容            
-            query = self.review.prompt(commits, query)
+            query = self.review.prompt(changes, query)
             new_conversations = conversations.copy()[0:-1]
             new_conversations.append({"role": "user", "content": query})
             # 构造对话消息            

{auto_coder-0.1.260 → auto_coder-0.1.261}/src/autocoder/chat_auto_coder.py

@@ -1,3 +1,4 @@
+from itertools import product
 from prompt_toolkit.formatted_text import HTML
 from prompt_toolkit.shortcuts import radiolist_dialog
 from prompt_toolkit import prompt
@@ -57,6 +58,7 @@ import pkg_resources
 from autocoder.common.printer import Printer
 from autocoder.utils.thread_utils import run_in_thread,run_in_raw_thread
 from autocoder.common.command_completer import CommandCompleter,FileSystemModel as CCFileSystemModel,MemoryConfig as CCMemoryModel
+from autocoder.common.conf_validator import ConfigValidator
 
 class SymbolItem(BaseModel):
     symbol_name: str
@@ -129,6 +131,8 @@ commands = [
     "/revert",
     "/index/query",
     "/index/build",
+    "/index/export",
+    "/index/import",
     "/exclude_dirs",
     "/help",
     "/shell",
@@ -584,6 +588,9 @@ def configure(conf: str, skip_print=False):
         if not value:
             printer.print_in_terminal("config_value_empty", style="red")
             return
+        product_mode = memory["conf"].get("product_mode",None)  
+        if product_mode:
+            ConfigValidator.validate(key, value, product_mode)    
         memory["conf"][key] = value
         save_memory()
         if not skip_print:
@@ -1863,6 +1870,13 @@ def generate_shell_command(input_text):
         auto_coder_main(["agent", "generate_command", "--file", execute_file])
         with open(os.path.join(".auto-coder", "exchange.txt"), "r") as f:
             shell_script = f.read()
+        result_manager = ResultManager()
+        result_manager.add_result(content=shell_script,meta={
+            "action": "generate_shell_command",
+            "input": {
+                "query": input_text
+            }
+        })
         return shell_script
     finally:
         os.remove(execute_file)
@@ -2323,6 +2337,28 @@ def help(query: str):
     auto_config_tuner = ConfigAutoTuner(llm=llm, memory_config=MemoryConfig(memory=memory, save_memory_func=save_memory))
     auto_config_tuner.tune(AutoConfigRequest(query=query))    
 
+@run_in_raw_thread()
+def index_export(export_path: str):
+    from autocoder.common.index_import_export import export_index
+    from autocoder.common.printer import Printer
+    printer = Printer()
+    project_root = os.getcwd()
+    if export_index(project_root, export_path):
+        printer.print_in_terminal("index_export_success", path=export_path)
+    else:
+        printer.print_in_terminal("index_export_fail", path=export_path)
+
+@run_in_raw_thread()
+def index_import(import_path: str):
+    from autocoder.common.index_import_export import import_index
+    from autocoder.common.printer import Printer
+    printer = Printer()
+    project_root = os.getcwd()
+    if import_index(project_root, import_path):
+        printer.print_in_terminal("index_import_success", path=import_path)
+    else:
+        printer.print_in_terminal("index_import_fail", path=import_path)
+
 @run_in_raw_thread()
 def index_query(query: str):
     conf = memory.get("conf", {})
@@ -2547,15 +2583,15 @@ def auto_command(params,query: str):
     
     # 生成建议
     response = tuner.analyze(request)
-    
+    printer = Printer()
     # 显示建议
-    console = Console()    
+    console = Console()        
     console.print(Panel(
         Markdown(response.reasoning or ""),
-        title="Reasoning",
+        title=printer.get_message_from_key_with_format("auto_command_reasoning_title"),
         border_style="blue",
         padding=(1, 2)
-    ))
+    ))    
       
 
 def main():
@@ -2736,6 +2772,20 @@ def main():
 
             elif user_input.startswith("/index/build"):
                 index_build()
+                
+            elif user_input.startswith("/index/export"):
+                export_path = user_input[len("/index/export"):].strip()
+                if not export_path:
+                    print("Please specify the export path")
+                else:
+                    index_export(export_path)
+                    
+            elif user_input.startswith("/index/import"):
+                import_path = user_input[len("/index/import"):].strip()
+                if not import_path:
+                    print("Please specify the import path")
+                else:
+                    index_import(import_path)
 
             elif user_input.startswith("/list_files"):
                 list_files()

{auto_coder-0.1.260 → auto_coder-0.1.261}/src/autocoder/chat_auto_coder_lang.py

@@ -75,6 +75,14 @@ MESSAGES = {
         "help_desc": "Show this help message",
         "exclude_dirs_desc": "Add directories to exclude from project",
         "shell_desc": "Execute a shell command",
+        "index_export_success": "Successfully exported index to {{ path }}",
+        "index_export_fail": "Failed to export index to {{ path }}",
+        "index_import_success": "Successfully imported index from {{ path }}",
+        "index_import_fail": "Failed to import index from {{ path }}",
+        "index_not_found": "Index file not found at {{ path }}",
+        "index_backup_success": "Backed up existing index to {{ path }}",
+        "index_convert_path_fail": "Could not convert path {{ path }}",
+        "index_error": "Error in index operation: {{ error }}",
         "voice_input_desc": "Convert voice input to text",
         "mode_desc": "Switch input mode",
         "conf_key": "Key",
@@ -123,6 +131,7 @@ MESSAGES = {
         "files_removed": "Files Removed",
         "models_api_key_empty": "Warning : {{name}} API key is empty. Please set a valid API key.",
         "commit_generating": "{{ model_name }} Generating commit message...",
+        "auto_command_reasoning_title": "Reply", 
         "commit_message": "{{ model_name }} Generated commit message: {{ message }}",
         "commit_failed": "{{ model_name }} Failed to generate commit message: {{ error }}",
         "confirm_execute": "Do you want to execute this script?",
@@ -131,6 +140,7 @@ MESSAGES = {
     "zh": {
         "auto_command_analyzing": "正在分析命令请求",
         "commit_generating": "{{ model_name }} 正在生成提交信息...",
+        "auto_command_reasoning_title": "回复", 
         "commit_message": "{{ model_name }} 生成的提交信息: {{ message }}",
         "commit_failed": "{{ model_name }} 生成提交信息失败: {{ error }}",
         "mcp_remove_error": "移除 MCP 服务器时出错:{error}",
@@ -204,6 +214,14 @@ MESSAGES = {
         "help_desc": "显示此帮助消息",
         "exclude_dirs_desc": "添加要从项目中排除的目录",
         "shell_desc": "执行shell命令",
+        "index_export_success": "成功导出索引到 {{ path }}",
+        "index_export_fail": "导出索引到 {{ path }} 失败",
+        "index_import_success": "成功从 {{ path }} 导入索引",
+        "index_import_fail": "从 {{ path }} 导入索引失败",
+        "index_not_found": "在 {{ path }} 未找到索引文件",
+        "index_backup_success": "已备份现有索引到 {{ path }}",
+        "index_convert_path_fail": "无法转换路径 {{ path }}",
+        "index_error": "索引操作出错：{{ error }}",
         "voice_input_desc": "将语音输入转换为文本",
         "mode_desc": "切换输入模式",
         "lib_desc": "管理库",

{auto_coder-0.1.260 → auto_coder-0.1.261}/src/autocoder/commands/auto_command.py

@@ -7,7 +7,6 @@ from typing import List, Dict, Any, Union, Callable, Optional
 from autocoder.common.printer import Printer
 from rich.console import Console
 from rich.panel import Panel
-from rich.markdown import Markdown
 from pydantic import SkipValidation
 
 from autocoder.common.result_manager import ResultManager
@@ -19,8 +18,9 @@ from autocoder.auto_coder import AutoCoderArgs
 from autocoder.common import detect_env
 from autocoder.common import shells
 from loguru import logger
-from autocoder.common import auto_coder_lang
 from autocoder.utils import llms as llms_utils
+from autocoder.rag.token_counter import count_tokens
+from autocoder.common.global_cancel import global_cancel
 
 class CommandMessage(BaseModel):
     role: str
@@ -197,6 +197,7 @@ class CommandAutoTuner:
         函数组合说明：        
         <function_combination_readme>
         如果用户是一个编码需求，你可以先简单观察当前活跃区文件列表：
+        0. 关注下当前软件的配置，诸如索引开启关闭。如果有觉得不合理的可以通过 help 函数来修改。
         1. 如果你觉得这些文件不够满足用户的需求，而当前的索引配置关闭的，那么你可以通过help("将skip_filter_index 和 skip_build_index 设置为 false") 让
         chat,coding 函数来获取更多文件，或者你也可以自己通过调用 get_project_structure 函数来获取项目结构，然后通过 get_project_map 函数来获取某个文件的用途，符号列表，以及
         文件大小（tokens数）,最后再通过 read_files/read_file_with_keyword_ranges 函数来读取文件内容, 最后通过 add_files 函数来添加文件到活跃区。
@@ -207,6 +208,7 @@ class CommandAutoTuner:
         通过 get_project_structure 来获取项目结构，然后通过 get_project_map 来获取你想看的某个文件的用途，符号列表，最后再通过 read_files/read_file_with_keyword_ranges 函数来读取文件内容,确认对应的功能是否在相关的文件里。
         5. 调用 coding 函数的时候，尽可能多的 @文件和@@符号，让需求更加清晰明了，建议多描述具体怎么完成对应的需求。
         6. 对于代码需求设计，尽可能使用 chat 函数。
+        7. 如果成功执行了 coding 函数，最好再调用一次 chat("/review /commit")
         </function_combination_readme>
 
 
@@ -273,8 +275,11 @@ class CommandAutoTuner:
         
         *** 非常非常重要的提示 ***
         1. 如果已经满足要求，则不要返回任何函数,确保 suggestions 为空。
-        2. 你最多尝试10次，如果10次都没有满足要求，则不要返回任何函数，确保 suggestions 为空。
-        '''    
+        2. 你最多尝试 {{ auto_command_max_iterations }} 次，如果 {{ auto_command_max_iterations }} 次都没有满足要求，则不要返回任何函数，确保 suggestions 为空。
+        '''   
+        return {
+            "auto_command_max_iterations": self.args.auto_command_max_iterations
+        } 
     
     def analyze(self, request: AutoCommandRequest) -> AutoCommandResponse:
         # 获取 prompt 内容
@@ -317,8 +322,7 @@ class CommandAutoTuner:
         )
                 
         if last_meta:
-            elapsed_time = time.monotonic() - start_time
-            printer = Printer()
+            elapsed_time = time.monotonic() - start_time            
             speed = last_meta.generated_tokens_count / elapsed_time
             
             # Get model info for pricing
@@ -355,6 +359,10 @@ class CommandAutoTuner:
         result_manager = ResultManager()
         
         while True:
+            if global_cancel.requested:
+                printer = Printer(console)
+                printer.print_in_terminal("generation_cancelled")                    
+                break
             # 执行命令
             command = response.suggestions[0].command
             parameters = response.suggestions[0].parameters
@@ -376,8 +384,10 @@ class CommandAutoTuner:
                     changes = git_utils.get_changes_by_commit_message("", last_result.meta["commit_message"])
                     if changes.success:
                         for file_path, change in changes.changes.items():
-                            if change.before:
-                                content += f"## File: {file_path}[更改前]\n{change.before}\n\nFile: {file_path}\n\n[更改后]\n{change.after}\n\n"
+                            if change:
+                                content += f"## File: {file_path}[更改前]\n{change.before or 'New File'}\n\nFile: {file_path}\n\n[更改后]\n{change.after or 'Deleted File'}\n\n"
+                    else:
+                        content = printer.get_message_from_key_with_format("no_changes_made")            
                 else:
                     # 其他的直接获取执行结果
                     content = last_result.content
@@ -403,9 +413,26 @@ class CommandAutoTuner:
                 ))
                 # 保持原content不变，继续后续处理
                 
-                conversations.append({"role": "user", "content": self._execute_command_result.prompt(content)})
-                title = printer.get_message_from_key("auto_command_analyzing")
+                # 添加新的对话内容
+                new_content = self._execute_command_result.prompt(content)
+                conversations.append({"role": "user", "content": new_content})
+                
+                # 统计 token 数量                
+                total_tokens = count_tokens(json.dumps(conversations,ensure_ascii=False))                
+
+                # 如果对话过长，使用默认策略进行修剪
+                if total_tokens > self.args.conversation_prune_safe_zone_tokens:
+                    self.printer.print_in_terminal(
+                        "conversation_pruning_start", 
+                        style="yellow",
+                        total_tokens=total_tokens,
+                        safe_zone=self.args.conversation_prune_safe_zone_tokens
+                    )
+                    from autocoder.common.conversation_pruner import ConversationPruner
+                    pruner = ConversationPruner(self.llm)
+                    conversations = pruner.prune_conversations(conversations)                    
 
+                title = printer.get_message_from_key("auto_command_analyzing")
                 model_name = ",".join(llms_utils.get_llm_names(self.llm))
                 
                 start_time = time.monotonic()
@@ -453,7 +480,7 @@ class CommandAutoTuner:
                     response=response.model_dump_json(indent=2)
                 )
 
-            else:
+            else:                               
                 self.printer.print_in_terminal("auto_command_break", style="yellow", command=command)
                 break            
         
@@ -555,7 +582,7 @@ class CommandAutoTuner:
         <name>revert</name>
         <description>
         撤销最后一次代码修改，恢复到修改前的状态。同时会删除对应的操作记录文件，
-        如果很明显你对上一次coding执行后的效果觉得不满意，可以使用该函数来撤销上一次的代码修改。
+        如果很明显你对上一次coding函数执行后的效果觉得不满意，可以使用该函数来撤销上一次的代码修改。
         </description>
         <usage>
          该命令不需要任何参数，直接使用即可。会撤销最近一次的代码修改操作。
@@ -1107,6 +1134,7 @@ class CommandAutoTuner:
             "lib": self.command_config.lib,
             "models": self.command_config.models,
             "execute_shell_command": self.command_config.execute_shell_command,
+            "generate_shell_command": self.command_config.generate_shell_command,
 
             "run_python": self.tools.run_python_code,            
             "get_related_files_by_symbols": self.tools.get_related_files_by_symbols,
@@ -1117,7 +1145,8 @@ class CommandAutoTuner:
             "find_files_by_content": self.tools.find_files_by_content,        
             "get_project_related_files": self.tools.get_project_related_files,
             "ask_user":self.tools.ask_user,
-            "read_file_with_keyword_ranges": self.tools.read_file_with_keyword_ranges
+            "read_file_with_keyword_ranges": self.tools.read_file_with_keyword_ranges,
+            
                         
         }
 

{auto_coder-0.1.260 → auto_coder-0.1.261}/src/autocoder/common/__init__.py

@@ -370,6 +370,14 @@ class AutoCoderArgs(pydantic.BaseModel):
     in_code_apply: bool = False
     model_filter_path: Optional[str] = None
 
+    conversation_prune_safe_zone_tokens: Optional[int] = 50*1024
+    conversation_prune_group_size: Optional[int] = 4
+    conversation_prune_strategy: Optional[str] = "summarize"
+
+    auto_command_max_iterations: Optional[int] = 10
+    
+    skip_commit: Optional[bool] = False    
+
     class Config:
         protected_namespaces = ()
 

{auto_coder-0.1.260 → auto_coder-0.1.261}/src/autocoder/common/auto_coder_lang.py

@@ -3,6 +3,16 @@ from byzerllm.utils import format_str_jinja2
 
 MESSAGES = {
     "en": {
+        "config_validation_error": "Config validation error: {{error}}",
+        "invalid_boolean_value": "Value '{{value}}' is not a valid boolean(true/false)",
+        "invalid_integer_value": "Value '{{value}}' is not a valid integer",
+        "invalid_float_value": "Value '{{value}}' is not a valid float",
+        "invalid_type_value": "Value '{{value}}' is not a valid type (expected: {{types}})",
+        "value_out_of_range": "Value {{value}} is out of allowed range({{min}}~{{max}})",
+        "invalid_choice": "Value '{{value}}' is not in allowed options({{allowed}})",
+        "unknown_config_key": "Unknown config key '{{key}}'",
+        "model_not_found": "Model '{{model}}' is not configured in models.yml",
+        "required_without_default": "Config key '{{key}}' requires explicit value",
         "auto_command_action_break": "Command {{command}} execution failed (got {{action}} result), no result can be obtained, please try again",
         "auto_command_break": "Auto command execution failed to execute command: {{command}}",
         "auto_command_executing": "\n\n============= Executing command: {{command}} =============\n\n",
@@ -123,9 +133,22 @@ MESSAGES = {
         "auto_command_failed": "Auto command failed: {{error}}. Please check your input and try again.",
         "command_execution_result": "{{action}} execution result",
         "satisfied_prompt": "Requirements satisfied, no further action needed",
-        "auto_command_analyzed": "Selected command"
-    },
+        "auto_command_analyzed": "Selected command",
+        "invalid_enum_value": "Value '{{value}}' is not in allowed values ({{allowed}})",
+        "no_changes_made": "⚠️ no changes made, the reason may be that the text block generated by the coding function has a problem, so it cannot be merged into the project",
+        "conversation_pruning_start": "Conversation pruning started, total tokens: {{total_tokens}}, safe zone: {{safe_zone}}",
+        },
     "zh": {
+        "config_validation_error": "配置验证错误: {{error}}",
+        "invalid_boolean_value": "值 '{{value}}' 不是有效的布尔值(true/false)",
+        "invalid_integer_value": "值 '{{value}}' 不是有效的整数",
+        "invalid_float_value": "值 '{{value}}' 不是有效的浮点数",
+        "invalid_type_value": "值 '{{value}}' 不是有效的类型 (期望: {{types}})",
+        "value_out_of_range": "值 {value} 超出允许范围({min}~{max})",
+        "invalid_choice": "值 '{value}' 不在允许选项中({allowed})",
+        "unknown_config_key": "未知的配置项 '{key}'",
+        "model_not_found": "模型 '{model}' 未在 models.yml 中配置",
+        "required_without_default": "配置项 '{key}' 需要明确设置值",
         "auto_command_action_break": "命令 {{command}} 执行失败（获取到了 {{action}} 的结果），无法获得任何结果,请重试",
         "auto_command_break": "自动命令执行失败: {{command}}",
         "auto_command_executing": "\n\n============= 正在执行指令: {{command}} =============\n\n",
@@ -213,7 +236,7 @@ MESSAGES = {
         "unmerged_blocks_warning": "⚠️ 发现 {{ num_blocks }} 个未合并的代码块，更改将不会被应用。请手动检查后重试。",
         "pylint_file_check_failed": "⚠️ {{ file_path }} 的 Pylint 检查失败。更改未应用。错误: {{ error_message }}",
         "merge_success": "✅ 成功合并了 {{ num_files }} 个文件中的更改 {{ num_changes }}/{{ total_blocks }} 个代码块。",
-        "no_changes_made": "⚠️ 未对任何文件进行更改。",
+        "no_changes_made": "⚠️ 未对任何文件进行更改。这个原因可能是因为coding函数生成的文本块格式有问题，导致无法合并进项目",
         "unmerged_blocks_title": "未合并代码块",
         "unmerged_file_path": "文件: {{file_path}}",
         "unmerged_search_block": "Search Block({{similarity}}):",
@@ -245,7 +268,9 @@ MESSAGES = {
         "auto_command_failed": "自动命令执行失败: {{error}}。请检查您的输入并重试。",
         "command_execution_result": "{{action}} 执行结果",
         "satisfied_prompt": "已满足需求，无需进一步操作",
-        "auto_command_analyzed": "被选择指令"
+        "auto_command_analyzed": "被选择指令",
+        "invalid_enum_value": "值 '{{value}}' 不在允许的值列表中 ({{allowed}})",
+        "conversation_pruning_start": "⚠️ 对话长度 {{total_tokens}} tokens 超过安全阈值 {{safe_zone}}，开始修剪对话。"
     }}
 
 

{auto_coder-0.1.260 → auto_coder-0.1.261}/src/autocoder/common/code_auto_merge.py

@@ -157,7 +157,7 @@ class CodeAutoMerge:
         # get the file name 
         file_name = os.path.basename(self.args.file)
         
-        if not force_skip_git:
+        if not force_skip_git and not self.args.skip_commit:
             try:
                 git_utils.commit_changes(self.args.source_dir, f"auto_coder_pre_{file_name}_{md5}")
             except Exception as e:            
@@ -176,6 +176,6 @@ class CodeAutoMerge:
                 f.write(block.content)
 
         self.printer.print_in_terminal("files_merged", total=total)
-        if not force_skip_git:
+        if not force_skip_git and not self.args.skip_commit:
             commit_result = git_utils.commit_changes(self.args.source_dir, f"auto_coder_{file_name}_{md5}\n{self.args.query}")
             git_utils.print_commit_info(commit_result=commit_result)

{auto_coder-0.1.260 → auto_coder-0.1.261}/src/autocoder/common/code_auto_merge_diff.py

@@ -511,7 +511,7 @@ class CodeAutoMergeDiff:
         # get the file name 
         file_name = os.path.basename(self.args.file)
         
-        if not force_skip_git:
+        if not force_skip_git and not self.args.skip_commit:
             try:
                 git_utils.commit_changes(self.args.source_dir, f"auto_coder_pre_{file_name}_{md5}")
             except Exception as e:            
@@ -522,6 +522,6 @@ class CodeAutoMergeDiff:
         self.apply_edits(edits)
 
         self.printer.print_in_terminal("files_merged_total", total=total)
-        if not force_skip_git:
+        if not force_skip_git and not self.args.skip_commit:
             commit_result = git_utils.commit_changes(self.args.source_dir, f"auto_coder_{file_name}_{md5}\n{self.args.query}")
             git_utils.print_commit_info(commit_result=commit_result)

{auto_coder-0.1.260 → auto_coder-0.1.261}/src/autocoder/common/code_auto_merge_editblock.py

@@ -360,7 +360,7 @@ class CodeAutoMergeEditBlock:
                                                   file_path=file_path, 
                                                   error_message=error_message)
 
-        if changes_made and not force_skip_git:
+        if changes_made and not force_skip_git and not self.args.skip_commit:
             try:
                 git_utils.commit_changes(
                     self.args.source_dir, f"auto_coder_pre_{file_name}_{md5}"
@@ -400,7 +400,7 @@ class CodeAutoMergeEditBlock:
             )
 
         if changes_made:
-            if not force_skip_git:
+            if not force_skip_git and not self.args.skip_commit:
                 try:
                     commit_result = git_utils.commit_changes(
                         self.args.source_dir, f"auto_coder_{file_name}_{md5}\n{self.args.query}"

{auto_coder-0.1.260 → auto_coder-0.1.261}/src/autocoder/common/code_auto_merge_strict_diff.py

@@ -209,7 +209,7 @@ class CodeAutoMergeStrictDiff:
         # get the file name 
         file_name = os.path.basename(self.args.file)
         
-        if not force_skip_git:
+        if not force_skip_git and not self.args.skip_commit:
             try:
                 git_utils.commit_changes(self.args.source_dir, f"auto_coder_pre_{file_name}_{md5}")
             except Exception as e:            
@@ -232,7 +232,7 @@ class CodeAutoMergeStrictDiff:
                 raise Exception("Error applying diff to file: " + path)
                             
         self.printer.print_in_terminal("files_merged_total", total=total)
-        if not force_skip_git:
+        if not force_skip_git and not self.args.skip_commit:
             commit_result = git_utils.commit_changes(self.args.source_dir, f"auto_coder_{file_name}_{md5}\n{self.args.query}")
             git_utils.print_commit_info(commit_result=commit_result)