auto-coder 0.1.264__py3-none-any.whl → 0.1.266__py3-none-any.whl

autocoder/commands/tools.py

@@ -27,6 +27,7 @@ from autocoder.utils.queue_communicate import (
 )
 import sys
 import io
+from autocoder.common import files as files_utils
 
 @byzerllm.prompt()
 def detect_rm_command(command: str) -> Bool:
@@ -286,34 +287,33 @@ class AutoCommandTools:
 
         result = []
         try:
-            with open(absolute_path, 'r', encoding='utf-8') as f:
-                lines = f.readlines()
+            
+            lines = files_utils.read_lines(absolute_path)            
+            # Find all lines containing the keyword
+            keyword_lines = []
+            for i, line in enumerate(lines):
+                if keyword.lower() in line.lower():
+                    keyword_lines.append(i)
+            
+            # Process each keyword line and its surrounding range
+            processed_ranges = set()
+            for line_num in keyword_lines:
+                # Calculate range boundaries
+                start = max(0, line_num - before_size)
+                end = min(len(lines), line_num + after_size + 1)
                 
-                # Find all lines containing the keyword
-                keyword_lines = []
-                for i, line in enumerate(lines):
-                    if keyword.lower() in line.lower():
-                        keyword_lines.append(i)
+                # Check if this range overlaps with any previously processed range
+                range_key = (start, end)
+                if range_key in processed_ranges:
+                    continue
                 
-                # Process each keyword line and its surrounding range
-                processed_ranges = set()
-                for line_num in keyword_lines:
-                    # Calculate range boundaries
-                    start = max(0, line_num - before_size)
-                    end = min(len(lines), line_num + after_size + 1)
-                    
-                    # Check if this range overlaps with any previously processed range
-                    range_key = (start, end)
-                    if range_key in processed_ranges:
-                        continue
-                    
-                    processed_ranges.add(range_key)
-                    
-                    # Format the content block
-                    content = f"##File: {absolute_path}\n"
-                    content += f"##Line: {start+1}-{end}\n\n"
-                    content += "".join(lines[start:end])
-                    result.append(content)
+                processed_ranges.add(range_key)
+                
+                # Format the content block
+                content = f"##File: {absolute_path}\n"
+                content += f"##Line: {start+1}-{end}\n\n"
+                content += "".join(lines[start:end])
+                result.append(content)
                 
         except Exception as e:
             v = f"Error reading file {absolute_path}: {str(e)}"
@@ -403,23 +403,22 @@ class AutoCommandTools:
                         if path in os.path.join(root, file):
                             absolute_path = os.path.join(root, file)
                             break
-
-            with open(absolute_path, "r", encoding="utf-8") as f:
-                if path in file_line_ranges:
-                    # Read specific line ranges
-                    lines = f.readlines()
-                    filtered_lines = []
-                    for start, end in file_line_ranges[path]:
-                        # Adjust for 0-based indexing
-                        start = max(0, start - 1)
-                        end = min(len(lines), end)
-                        content = "".join(lines[start:end])
-                        filtered_lines.extend(f"##File: {absolute_path}\n##Line: {start}-{end}\n\n{content}")
-                    source_code = "".join(filtered_lines)
-                else:
-                    # Read entire file if no range specified
-                    content = f.read()
-                    source_code = f"##File: {absolute_path}\n\n{content}"
+            
+            if path in file_line_ranges:
+                # Read specific line ranges
+                lines = files_utils.read_lines(absolute_path)
+                filtered_lines = []
+                for start, end in file_line_ranges[path]:
+                    # Adjust for 0-based indexing
+                    start = max(0, start - 1)
+                    end = min(len(lines), end)
+                    content = "".join(lines[start:end])
+                    filtered_lines.extend(f"##File: {absolute_path}\n##Line: {start}-{end}\n\n{content}")
+                source_code = "".join(filtered_lines)
+            else:
+                # Read entire file if no range specified
+                content = files_utils.read_file(absolute_path)
+                source_code = f"##File: {absolute_path}\n\n{content}"
                 
                 sc = SourceCode(module_name=absolute_path, source_code=source_code)
                 source_code_str += f"{sc.source_code}\n\n"
@@ -510,13 +509,12 @@ class AutoCommandTools:
             for file in files:
                 file_path = os.path.join(root, file)
                 try:
-                    with open(file_path, "r", encoding="utf-8") as f:
-                        content = f.read()
-                        if keyword.lower() in content.lower():
-                            matched_files.append(file_path)
-                            # Limit to first 10 matches
-                            if len(matched_files) >= 10:
-                                break
+                    content = files_utils.read_file(file_path)
+                    if keyword.lower() in content.lower():
+                        matched_files.append(file_path)
+                        # Limit to first 10 matches
+                        if len(matched_files) >= 10:
+                            break
                 except Exception:
                     # Skip files that can't be read
                     pass

autocoder/common/__init__.py

@@ -6,7 +6,6 @@ import os
 import time
 from typing import List, Dict, Any, Optional, Union
 
-
 class SourceCode(pydantic.BaseModel):
     module_name: str
     source_code: str

autocoder/common/auto_coder_lang.py

@@ -3,6 +3,7 @@ from byzerllm.utils import format_str_jinja2
 
 MESSAGES = {
     "en": {
+        "invalid_file_pattern": "Invalid file pattern: {{file_pattern}}. e.g. regex://.*/package-lock\\.json",
         "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",
@@ -116,6 +117,7 @@ MESSAGES = {
         "quick_filter_stats": "{{ model_names }} Quick filter completed in {{ elapsed_time }} seconds, input tokens: {{ input_tokens }}, output tokens: {{ output_tokens }}, input cost: {{ input_cost }}, output cost: {{ output_cost }} speed: {{ speed }} tokens/s",
         "upsert_file": "✅ Updated file: {{ file_path }}",
         "unmerged_blocks_title": "Unmerged Blocks",
+        "merged_blocks_title": "Merged Changes",
         "quick_filter_title": "{{ model_name }} is analyzing how to filter context...",
         "quick_filter_failed": "❌ Quick filter failed: {{ error }}. ",
         "unmerged_file_path": "File: {{file_path}}",
@@ -139,9 +141,42 @@ MESSAGES = {
         "conversation_pruning_start": "⚠️ Conversation pruning started, total tokens: {{total_tokens}}, safe zone: {{safe_zone}}",
         "invalid_file_number": "⚠️ Invalid file number {{file_number}}, total files: {{total_files}}",
         "all_merge_results_failed": "⚠️ All merge attempts failed, returning first candidate",
-        "only_one_merge_result_success": "✅ Only one merge result succeeded, returning that candidate"
-        },
+        "only_one_merge_result_success": "✅ Only one merge result succeeded, returning that candidate",
+        "conf_import_success": "Successfully imported configuration: {{path}}",
+        "conf_export_success": "Successfully exported configuration: {{path}}",
+        "conf_import_error": "Error importing configuration: {{error}}",
+        "conf_export_error": "Error exporting configuration: {{error}}",
+        "conf_import_invalid_format": "Invalid import configuration format, expected 'key:value'",
+        "conf_export_invalid_format": "Invalid export configuration format, expected 'key:value'",
+        "conf_import_file_not_found": "Import configuration file not found: {{file_path}}",
+        "conf_export_file_not_found": "Export configuration file not found: {{file_path}}",
+        "conf_import_file_empty": "Import configuration file is empty: {{file_path}}",
+        "conf_export_file_empty": "Export configuration file is empty: {{file_path}}",
+        "generated_shell_script": "Generated Shell Script",
+        "confirm_execute_shell_script": "Do you want to execute this shell script?",
+        "shell_script_not_executed": "Shell script was not executed",
+        "conf_not_found": "Configuration file not found: {{path}}",
+        "index_export_success": "Index exported successfully: {{path}}",
+        "index_import_success": "Index imported successfully: {{path}}",
+        "edits_title": "edits",
+        "diff_blocks_title":"diff blocks"
+    },
     "zh": {
+        "invalid_file_pattern": "无效的文件模式: {{file_pattern}}. 例如: regex://.*/package-lock\\.json",
+        "conf_not_found": "未找到配置文件: {{path}}",
+        "conf_import_success": "成功导入配置: {{path}}",
+        "conf_export_success": "成功导出配置: {{path}}",
+        "conf_import_error": "导入配置出错: {{error}}",
+        "conf_export_error": "导出配置出错: {{error}}",
+        "conf_import_invalid_format": "导入配置格式无效, 应为 'key:value' 格式",
+        "conf_export_invalid_format": "导出配置格式无效, 应为 'key:value' 格式",
+        "conf_import_file_not_found": "未找到导入配置文件: {{file_path}}",
+        "conf_export_file_not_found": "未找到导出配置文件: {{file_path}}",
+        "conf_import_file_empty": "导入配置文件为空: {{file_path}}",
+        "conf_export_file_empty": "导出配置文件为空: {{file_path}}",
+        "generated_shell_script": "生成的 Shell 脚本",
+        "confirm_execute_shell_script": "您要执行此 shell 脚本吗？",
+        "shell_script_not_executed": "Shell 脚本未执行",
         "config_validation_error": "配置验证错误: {{error}}",
         "invalid_boolean_value": "值 '{{value}}' 不是有效的布尔值(true/false)",
         "invalid_integer_value": "值 '{{value}}' 不是有效的整数",
@@ -241,6 +276,7 @@ MESSAGES = {
         "merge_success": "✅ 成功合并了 {{ num_files }} 个文件中的更改 {{ num_changes }}/{{ total_blocks }} 个代码块。",
         "no_changes_made": "⚠️ 未对任何文件进行更改。这个原因可能是因为coding函数生成的文本块格式有问题，导致无法合并进项目",
         "unmerged_blocks_title": "未合并代码块",
+        "merged_blocks_title": "合并的更改",
         "unmerged_file_path": "文件: {{file_path}}",
         "unmerged_search_block": "Search Block({{similarity}}):",
         "unmerged_replace_block": "Replace Block:",
@@ -276,7 +312,11 @@ MESSAGES = {
         "conversation_pruning_start": "⚠️ 对话长度 {{total_tokens}} tokens 超过安全阈值 {{safe_zone}}，开始修剪对话。",
         "invalid_file_number": "⚠️ 无效的文件编号 {{file_number}}，总文件数为 {{total_files}}",        
         "all_merge_results_failed": "⚠️ 所有合并尝试都失败，返回第一个候选",
-        "only_one_merge_result_success": "✅ 只有一个合并结果成功，返回该候选"
+        "only_one_merge_result_success": "✅ 只有一个合并结果成功，返回该候选",
+        "index_export_success": "索引导出成功: {{path}}",
+        "index_import_success": "索引导入成功: {{path}}",
+        "edits_title": "编辑块",
+        "diff_blocks_title": "差异块",
     }}
 
 

autocoder/common/code_auto_generate.py

@@ -197,7 +197,7 @@ class CodeAutoGenerate:
                 instruction=query, content=source_content
             )
 
-        with open(self.args.target_file, "w") as file:
+        with open(self.args.target_file, "w",encoding="utf-8") as file:
             file.write(init_prompt)
 
         conversations = []
@@ -298,7 +298,7 @@ class CodeAutoGenerate:
 
         conversations = [{"role": "user", "content": init_prompt}]
 
-        with open(self.args.target_file, "w") as file:
+        with open(self.args.target_file, "w",encoding="utf-8") as file:
             file.write(init_prompt)
 
         t = self.llm.chat_oai(conversations=conversations, llm_config=llm_config)
@@ -320,7 +320,7 @@ class CodeAutoGenerate:
 
             conversations.append({"role": "user", "content": "继续"})
 
-            with open(self.args.target_file, "w") as file:
+            with open(self.args.target_file, "w",encoding="utf-8") as file:
                 file.write("继续")
 
             t = self.llm.chat_oai(conversations=conversations, llm_config=llm_config)

autocoder/common/code_auto_generate_diff.py

@@ -315,10 +315,7 @@ class CodeAutoGenerateDiff:
         elif self.args.template == "auto_implement":
             init_prompt = self.auto_implement_function.prompt(
                 instruction=query, content=source_content
-            )
-
-        with open(self.args.target_file, "w") as file:
-            file.write(init_prompt)
+            )        
 
         conversations = []
 
@@ -447,7 +444,7 @@ class CodeAutoGenerateDiff:
         # conversations.append({"role": "system", "content": sys_prompt.prompt()})
         conversations.append({"role": "user", "content": init_prompt})
 
-        with open(self.args.target_file, "w") as file:
+        with open(self.args.target_file, "w",encoding="utf-8") as file:
             file.write(init_prompt)
 
         code_llm = self.llms[0]
@@ -467,7 +464,7 @@ class CodeAutoGenerateDiff:
 
             conversations.append({"role": "user", "content": "继续"})
 
-            with open(self.args.target_file, "w") as file:
+            with open(self.args.target_file, "w",encoding="utf-8") as file:
                 file.write("继续")
 
             t = code_llm.chat_oai(

autocoder/common/code_auto_generate_editblock.py

@@ -418,7 +418,7 @@ class CodeAutoGenerateEditBlock:
                 instruction=query, content=source_content
             )
 
-        with open(self.args.target_file, "w") as file:
+        with open(self.args.target_file, "w",encoding="utf-8") as file:
             file.write(init_prompt)
 
         conversations = []
@@ -538,7 +538,7 @@ class CodeAutoGenerateEditBlock:
         # conversations.append({"role": "system", "content": sys_prompt.prompt()})
         conversations.append({"role": "user", "content": init_prompt})
 
-        with open(self.args.target_file, "w") as file:
+        with open(self.args.target_file, "w",encoding="utf-8") as file:
             file.write(init_prompt)
 
         code_llm = self.llms[0]
@@ -558,7 +558,7 @@ class CodeAutoGenerateEditBlock:
 
             conversations.append({"role": "user", "content": "继续"})
 
-            with open(self.args.target_file, "w") as file:
+            with open(self.args.target_file, "w",encoding="utf-8") as file:
                 file.write("继续")
 
             t = code_llm.chat_oai(

autocoder/common/code_auto_generate_strict_diff.py

@@ -287,7 +287,7 @@ class CodeAutoGenerateStrictDiff:
                 instruction=query, content=source_content
             )
 
-        with open(self.args.target_file, "w") as file:
+        with open(self.args.target_file, "w",encoding="utf-8") as file:
             file.write(init_prompt)
 
         conversations = []
@@ -417,7 +417,7 @@ class CodeAutoGenerateStrictDiff:
         # conversations.append({"role": "system", "content": sys_prompt.prompt()})
         conversations.append({"role": "user", "content": init_prompt})
 
-        with open(self.args.target_file, "w") as file:
+        with open(self.args.target_file, "w",encoding="utf-8") as file:
             file.write(init_prompt)
         
         code_llm = self.llms[0]
@@ -437,7 +437,7 @@ class CodeAutoGenerateStrictDiff:
 
             conversations.append({"role": "user", "content": "继续"})
 
-            with open(self.args.target_file, "w") as file:
+            with open(self.args.target_file, "w",encoding="utf-8") as file:
                 file.write("继续")
 
             t = code_llm.chat_oai(

autocoder/common/code_auto_merge_diff.py

@@ -462,7 +462,7 @@ class CodeAutoMergeDiff:
             full_path = self.abs_root_path(path)
 
             if not os.path.exists(full_path):            
-                with open(full_path, "w",encoding="utf-8") as f:
+                with open(full_path, "w") as f:
                     f.write("")
             
             content = FileUtils.read_file(full_path)
@@ -528,10 +528,41 @@ class CodeAutoMergeDiff:
             failed_blocks=failed_blocks
         )
 
+    def print_edits(self, edits: List[Tuple[str, List[str]]]):
+        """Print diffs for user review using rich library"""
+        from rich.syntax import Syntax
+        from rich.panel import Panel
+
+        # Group edits by file path
+        file_edits = {}
+        for path, hunk in edits:
+            if path not in file_edits:
+                file_edits[path] = []
+            file_edits[path].append(hunk)
+
+        # Generate formatted text for each file
+        formatted_text = ""
+        for path, hunks in file_edits.items():
+            formatted_text += f"##File: {path}\n"
+            for hunk in hunks:
+                formatted_text += "".join(hunk)
+            formatted_text += "\n"
+
+        # Print with rich panel
+        self.printer.print_in_terminal("edits_title", style="bold green")
+        self.printer.console.print(
+            Panel(
+                Syntax(formatted_text, "diff", theme="monokai"),
+                title="Edits",
+                border_style="green",
+                expand=False
+            )
+        )
+
     def _merge_code(self, content: str,force_skip_git:bool=False):        
         total = 0
         
-        file_content = open(self.args.file).read()
+        file_content = FileUtils.read_file(self.args.file)
         md5 = hashlib.md5(file_content.encode('utf-8')).hexdigest()
         # get the file name 
         file_name = os.path.basename(self.args.file)
@@ -544,9 +575,12 @@ class CodeAutoMergeDiff:
                 return            
        
         edits = self.get_edits(content)        
-        self.apply_edits(edits)
+        self.apply_edits(edits)        
 
         self.printer.print_in_terminal("files_merged_total", total=total)
         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)
+        else:
+            # Print edits for review
+            self.print_edits(edits)    

autocoder/common/code_auto_merge_editblock.py

@@ -287,9 +287,10 @@ class CodeAutoMergeEditBlock:
                             for path, content in file_content_mapping.items()],
             failed_blocks=failed_blocks
         )
+    
 
     def _merge_code(self, content: str, force_skip_git: bool = False):
-        file_content = open(self.args.file).read()
+        file_content = FileUtils.read_file(self.args.file)
         md5 = hashlib.md5(file_content.encode("utf-8")).hexdigest()
         file_name = os.path.basename(self.args.file)
 
@@ -391,6 +392,7 @@ class CodeAutoMergeEditBlock:
                     style="red"
                 )
                 return
+            
         # Now, apply the changes
         for file_path, new_content in file_content_mapping.items():
             os.makedirs(os.path.dirname(file_path), exist_ok=True)
@@ -431,10 +433,14 @@ class CodeAutoMergeEditBlock:
                         self.git_require_msg(source_dir=self.args.source_dir, error=str(e)),
                         style="red"
                     )
+            else:
+                self.print_merged_blocks(merged_blocks)
+            
             self.printer.print_in_terminal("merge_success", 
                                          num_files=len(file_content_mapping.keys()),
                                          num_changes=len(changes_to_make),
                                          total_blocks=len(codes))
+            
         else:
             self.printer.print_in_terminal("no_changes_made")
 
@@ -455,3 +461,39 @@ class CodeAutoMergeEditBlock:
             syntax = Syntax(update, "python", theme="monokai", line_numbers=True)
             self.printer.console.print(Panel(syntax, expand=False))
         self.printer.print_in_terminal("unmerged_blocks_total", num_blocks=len(unmerged_blocks), style="bold red")
+
+
+    def print_merged_blocks(self, merged_blocks: List[tuple]):
+        """Print search/replace blocks for user review using rich library"""
+        from rich.syntax import Syntax
+        from rich.panel import Panel
+
+        # Group blocks by file path
+        file_blocks = {}
+        for file_path, head, update, similarity in merged_blocks:
+            if file_path not in file_blocks:
+                file_blocks[file_path] = []
+            file_blocks[file_path].append((head, update, similarity))
+
+        # Generate formatted text for each file
+        formatted_text = ""
+        for file_path, blocks in file_blocks.items():
+            formatted_text += f"##File: {file_path}\n"
+            for head, update, similarity in blocks:
+                formatted_text += "<<<<<<< SEARCH\n"
+                formatted_text += head + "\n"
+                formatted_text += "=======\n"
+                formatted_text += update + "\n"
+                formatted_text += ">>>>>>> REPLACE\n"
+            formatted_text += "\n"
+
+        # Print with rich panel
+        self.printer.print_in_terminal("merged_blocks_title", style="bold green")
+        self.printer.console.print(
+            Panel(
+                Syntax(formatted_text, "diff", theme="monokai"),
+                title="Merged Changes",
+                border_style="green",
+                expand=False
+            )
+        )

autocoder/common/code_auto_merge_strict_diff.py

@@ -10,6 +10,7 @@ import hashlib
 from pathlib import Path
 from autocoder.common.types import CodeGenerateResult, MergeCodeWithoutEffect
 from autocoder.common.code_modification_ranker import CodeModificationRanker
+from autocoder.common import files as  FileUtils
 
 class PathAndCode(pydantic.BaseModel):
     path: str
@@ -195,8 +196,7 @@ class CodeAutoMergeStrictDiff:
                 continue
                 
             if full_path not in file_content_mapping:
-                with open(full_path, "r") as f:
-                    file_content_mapping[full_path] = f.read()
+                file_content_mapping[full_path] = FileUtils.read_file(full_path)
             
             try:
                 import patch
@@ -221,10 +221,41 @@ class CodeAutoMergeStrictDiff:
             failed_blocks=failed_blocks
         )
 
+    def print_diff_blocks(self, diff_blocks: List[PathAndCode]):
+        """Print diff blocks for user review using rich library"""
+        from rich.syntax import Syntax
+        from rich.panel import Panel
+
+        # Group blocks by file path
+        file_blocks = {}
+        for block in diff_blocks:
+            if block.path not in file_blocks:
+                file_blocks[block.path] = []
+            file_blocks[block.path].append(block.content)
+
+        # Generate formatted text for each file
+        formatted_text = ""
+        for path, contents in file_blocks.items():
+            formatted_text += f"##File: {path}\n"
+            for content in contents:
+                formatted_text += content + "\n"
+            formatted_text += "\n"
+
+        # Print with rich panel
+        self.printer.print_in_terminal("diff_blocks_title", style="bold green")
+        self.printer.console.print(
+            Panel(
+                Syntax(formatted_text, "diff", theme="monokai"),
+                title="Diff Blocks",
+                border_style="green",
+                expand=False
+            )
+        )
+
     def _merge_code(self, content: str, force_skip_git: bool = False):        
         total = 0
         
-        file_content = open(self.args.file).read()
+        file_content = FileUtils.read_file(self.args.file)
         md5 = hashlib.md5(file_content.encode('utf-8')).hexdigest()
         # get the file name 
         file_name = os.path.basename(self.args.file)
@@ -236,7 +267,8 @@ class CodeAutoMergeStrictDiff:
                 self.printer.print_in_terminal("git_init_required", style="red", source_dir=self.args.source_dir, error=str(e))
                 return            
        
-        diff_blocks = self.parse_diff_block(content)
+        diff_blocks = self.parse_diff_block(content)        
+
         for diff_blocks in diff_blocks:
             path = diff_blocks.path
             content = diff_blocks.content          
@@ -255,6 +287,9 @@ class CodeAutoMergeStrictDiff:
         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)
+        else:
+            # Print diff blocks for review
+            self.print_diff_blocks(diff_blocks)    
 
     @byzerllm.prompt(render="jinja2")
     def git_require_msg(self, source_dir: str, error: str) -> str:

autocoder/common/command_completer.py

@@ -43,6 +43,9 @@ COMMANDS = {
         "/output_price": "",       
     },
     "/auto": {     
+    },
+    "/shell": {
+        "/chat": "",
     }
 }
 

autocoder/common/command_generator.py

@@ -4,6 +4,7 @@ from autocoder.utils.auto_coder_utils.chat_stream_out import stream_out
 from autocoder.common import detect_env
 from autocoder.common import shells
 from autocoder.common.printer import Printer
+from typing import Dict,Union
 
 @byzerllm.prompt()
 def _generate_shell_script(user_input: str) -> str:
@@ -14,6 +15,11 @@ def _generate_shell_script(user_input: str) -> str:
     Python版本: {{ env_info.python_version }}
     终端类型: {{ env_info.shell_type }}
     终端编码: {{ env_info.shell_encoding }}
+    
+    {%- if shell_type %}
+    脚本类型：{{ shell_type }}
+    {%- endif %}
+
     {%- if env_info.conda_env %}
     Conda环境: {{ env_info.conda_env }}
     {%- endif %}
@@ -21,29 +27,39 @@ def _generate_shell_script(user_input: str) -> str:
     虚拟环境: {{ env_info.virtualenv }}
     {%- endif %}    
 
-    根据用户的输入以及当前的操作系统和Shell类型生成合适的 shell 脚本，注意只能生成一个shell脚本，不要生成多个。
+    根据用户的输入以及当前的操作系统和终端类型以及脚本类型生成脚本，
+    注意只能生成一个shell脚本，不要生成多个。    
 
     用户输入: {{ user_input }}
 
-    请生成一个适当的 shell 脚本来执行用户的请求。确保脚本是安全的,并且可以在当前Shell环境中运行。
+    请生成一个适当的脚本来执行用户的请求。确保脚本是安全的,并且可以在当前Shell环境中运行。
     脚本应该包含必要的注释来解释每个步骤。
     脚本内容请用如下方式返回:
 
-    ```shell    
-    # 你的 shell 脚本内容
+    ```script    
+    # 你的 script 脚本内容
     ```
     """
-    env_info = detect_env()    
+    env_info = detect_env() 
+    shell_type = "bash"
+    if shells.is_running_in_cmd():
+        shell_type = "cmd"
+    elif shells.is_running_in_powershell():
+        shell_type = "powershell"
     return {
         "env_info": env_info,
-        "shell_type": shells.get_terminal_name(),
+        "shell_type": shell_type,
         "shell_encoding": shells.get_terminal_encoding()
     }
 
 
-def generate_shell_script(user_input: str, llm: byzerllm.ByzerLLM) -> str:
+def generate_shell_script(user_input: str, llm: Union[byzerllm.ByzerLLM,byzerllm.SimpleByzerLLM]) -> str:
     # 获取 prompt 内容
     prompt = _generate_shell_script.prompt(user_input=user_input)
+    if llm.get_sub_client("chat_model"):
+        shell_llm = llm.get_sub_client("chat_model")                
+    else:
+        shell_llm = llm
     
     # 构造对话上下文
     conversations = [{"role": "user", "content": prompt}]
@@ -52,7 +68,7 @@ def generate_shell_script(user_input: str, llm: byzerllm.ByzerLLM) -> str:
     printer = Printer()
     title = printer.get_message_from_key("generating_shell_script")
     result, _ = stream_out(
-        llm.stream_chat_oai(conversations=conversations, delta_mode=True),
+        shell_llm.stream_chat_oai(conversations=conversations, delta_mode=True),
         model_name=llm.default_model_name,
         title=title        
     )

autocoder/common/command_templates.py

@@ -139,7 +139,7 @@ def create_actions(source_dir:str,params:Dict[str,str]):
         "000_example": base_000_example.prompt(),
     }
     init_file_path = os.path.join(source_dir, "actions", "101_current_work.yml")
-    with open(init_file_path, "w") as f:
+    with open(init_file_path, "w", encoding="utf-8") as f:
         f.write(init_command_template.prompt(source_dir=source_dir))
 
     for k,v in mapping.items():
@@ -152,7 +152,7 @@ def create_actions(source_dir:str,params:Dict[str,str]):
         if k == "000_example":
             file_path = os.path.join(source_dir, "actions", f"{k}.yml")
 
-        with open(file_path, "w") as f:
+        with open(file_path, "w", encoding="utf-8") as f:
             f.write(v)    
 
 @byzerllm.prompt()