auto-coder 0.1.277__py3-none-any.whl → 0.1.278__py3-none-any.whl

{auto_coder-0.1.277.dist-info → auto_coder-0.1.278.dist-info}/METADATA

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

{auto_coder-0.1.277.dist-info → auto_coder-0.1.278.dist-info}/RECORD

@@ -12,7 +12,7 @@ autocoder/chat_auto_coder_lang.py,sha256=ShOQVOnMA-WlT-fB9OrOer-xQkbcWxJGl-WMPuZ
 autocoder/command_args.py,sha256=9aYJ-AmPxP1sQh6ciw04FWHjSn31f2W9afXFwo8wgx4,30441
 autocoder/lang.py,sha256=U6AjVV8Rs1uLyjFCZ8sT6WWuNUxMBqkXXIOs4S120uk,14511
 autocoder/models.py,sha256=PlG1tKHSHwB57cKLOl5gTl5yTzFUDzCgeHPJU3N9F6Q,9106
-autocoder/version.py,sha256=aQmPFbK421hxX_q_qH6lzGAzBJ-yTN3E_wgJvqVGg9k,23
+autocoder/version.py,sha256=Q3OPt1PiXvKx5xTUCPxUFZP2zsuajLbxdpiOEm_K2L4,23
 autocoder/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/agent/auto_demand_organizer.py,sha256=NWSAEsEk94vT3lGjfo25kKLMwYdPcpy9e-i21txPasQ,6942
 autocoder/agent/auto_filegroup.py,sha256=CW7bqp0FW1GIEMnl-blyAc2UGT7O9Mom0q66ITz1ckM,6635
@@ -26,7 +26,7 @@ autocoder/agent/planner.py,sha256=SZTSZHxHzDmuWZo3K5fs79RwvJLWurg-nbJRRNbX65o,91
 autocoder/agent/project_reader.py,sha256=tWLaPoLw1gI6kO_NzivQj28KbobU2ceOLuppHMbfGl8,18234
 autocoder/chat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder/commands/auto_command.py,sha256=Qv5hObiIioIOAVkucFB2na6aLUuxSIgLVO9PfnXwyIo,52496
+autocoder/commands/auto_command.py,sha256=3ZQvG_JX2oWxTv_xiXQDQwMfTAVK-Tynqo6mC9fXb60,52671
 autocoder/commands/tools.py,sha256=lanjoBGR6H8HDJSY3KrM6ibrtHZbgKX6mKJHSSE66dg,20493
 autocoder/common/JupyterClient.py,sha256=O-wi6pXeAEYhAY24kDa0BINrLYvKS6rKyWe98pDClS0,2816
 autocoder/common/ShellClient.py,sha256=fM1q8t_XMSbLBl2zkCNC2J9xuyKN3eXzGm6hHhqL2WY,2286
@@ -75,7 +75,7 @@ autocoder/common/result_manager.py,sha256=nBcFRj5reBC7vp13M91f4B8iPW8B8OehayHlUd
 autocoder/common/screenshots.py,sha256=_gA-z1HxGjPShBrtgkdideq58MG6rqFB2qMUJKjrycs,3769
 autocoder/common/search.py,sha256=245iPFgWhMldoUK3CqCP89ltaxZiNPK73evoG6Fp1h8,16518
 autocoder/common/search_replace.py,sha256=GphFkc57Hb673CAwmbiocqTbw8vrV7TrZxtOhD0332g,22147
-autocoder/common/shells.py,sha256=-5j45qb1SVmkZaORqDZ5EM2zJ16b5QGM1wHDfBfGejk,18944
+autocoder/common/shells.py,sha256=elminFpNosnV0hsEUcsugDxlGO8NfH96uah-8bkaBvA,19929
 autocoder/common/stats_panel.py,sha256=wGl9O45pjVVDxhNumLv4_NfLYSlUP_18Tw4hcJSjw50,4596
 autocoder/common/sys_prompt.py,sha256=JlexfjZt554faqbgkCmzOJqYUzDHfbnxly5ugFfHfEE,26403
 autocoder/common/text.py,sha256=KGRQq314GHBmY4MWG8ossRoQi1_DTotvhxchpn78c-k,1003
@@ -165,9 +165,9 @@ autocoder/utils/types.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/chat_stream_out.py,sha256=lkJ_A-sYU36JMzjFWkk3pR6uos8oZHYt9GPsPe_CPAo,11766
 autocoder/utils/chat_auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_coder-0.1.277.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-auto_coder-0.1.277.dist-info/METADATA,sha256=m2MjOLFknaEjczW5V_NfTL4jj7bikJe0jbn_tuYRfdQ,2643
-auto_coder-0.1.277.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-auto_coder-0.1.277.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
-auto_coder-0.1.277.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
-auto_coder-0.1.277.dist-info/RECORD,,
+auto_coder-0.1.278.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+auto_coder-0.1.278.dist-info/METADATA,sha256=W8ANCnQ9mFraLjuXIUaggoO_jH5Yx-bmm4FNxHLfOvo,2643
+auto_coder-0.1.278.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+auto_coder-0.1.278.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
+auto_coder-0.1.278.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
+auto_coder-0.1.278.dist-info/RECORD,,

autocoder/commands/auto_command.py

@@ -23,6 +23,7 @@ from autocoder.rag.token_counter import count_tokens
 from autocoder.common.global_cancel import global_cancel
 from autocoder.common.auto_configure import config_readme
 from autocoder.utils.auto_project_type import ProjectTypeAnalyzer
+from rich.text import Text
 
 class CommandMessage(BaseModel):
     role: str
@@ -435,8 +436,10 @@ class CommandAutoTuner:
                     "command_execution_result", 
                     action=action
                 )
+                # 转义内容，避免Rich将内容中的[]解释为markup语法                
+                text_content = Text(truncated_content)
                 console.print(Panel(
-                    truncated_content,
+                    text_content,
                     title=title,
                     border_style="blue",
                     padding=(1, 2)

autocoder/common/shells.py

@@ -11,6 +11,9 @@ from rich.panel import Panel
 from rich.text import Text
 from rich.live import Live
 import getpass
+from rich.markup import escape
+import threading
+import queue
 
 from autocoder.common.result_manager import ResultManager
 
@@ -356,7 +359,7 @@ def _win_code_page_to_encoding(code_page: str) -> str:
 
 def execute_shell_command(command: str):
     """
-    Execute a shell command with cross-platform encoding support.
+    Execute a shell command with cross-platform encoding support and streaming output.
     
     Args:
         command (str): The shell command to execute
@@ -446,81 +449,95 @@ set PYTHONIOENCODING=utf-8
             encoding='utf-8',  # 直接指定 UTF-8 编码
             errors='replace',  # 处理无法解码的字符
             env=env,          # 传递修改后的环境变量
-            startupinfo=startupinfo
+            startupinfo=startupinfo,
+            bufsize=1,        # Line buffering for immediate flushing
+            universal_newlines=True  # Use text mode to handle platform line endings
         )
 
         # Safe decoding helper (for binary output)
-        def safe_decode(byte_stream, encoding):
-            if isinstance(byte_stream, str):
-                return byte_stream.strip()
+        def safe_decode(text, encoding):
+            if isinstance(text, str):
+                return text.strip()
             try:
-                # 首先尝试 UTF-8
-                return byte_stream.decode('utf-8').strip()
+                # Try UTF-8 first
+                return text.decode('utf-8').strip()
             except UnicodeDecodeError:
                 try:
-                    # 如果失败，尝试 GBK
-                    return byte_stream.decode('gbk').strip()
+                    # If that fails, try GBK
+                    return text.decode('gbk').strip()
                 except UnicodeDecodeError:
-                    # 最后使用替换模式
-                    return byte_stream.decode(encoding, errors='replace').strip()
+                    # Finally use replacement mode
+                    return text.decode(encoding, errors='replace').strip()
 
         output = []
-        with Live(console=console, refresh_per_second=4) as live:
-            while True:
-                # Read output streams
-                output_bytes = process.stdout.readline()
-                error_bytes = process.stderr.readline()
-
-                # Handle standard output
-                if output_bytes:
-                    output_line = safe_decode(output_bytes, encoding)
-                    output.append(output_line)
-                    live.update(
-                        Panel(
-                            Text("\n".join(output[-20:])),
-                            title="Shell Output",
-                            border_style="green",
-                        )
-                    )
-
-                # Handle error output
-                if error_bytes:
-                    error_line = safe_decode(error_bytes, encoding)
-                    output.append(f"ERROR: {error_line}")
-                    live.update(
-                        Panel(
-                            Text("\n".join(output[-20:])),
-                            title="Shell Output",
-                            border_style="red",
-                        )
-                    )
-
-                # Check if process has ended
-                if process.poll() is not None:
+        # Use direct printing for streaming output, not a Live object
+        console.print(f"[bold blue]Running command:[/bold blue] {command}")
+        console.print("[bold blue]Output streaming:[/bold blue]")                
+                
+        output_queue = queue.Queue()
+        
+        def read_stream(stream, stream_name):
+            """Read data from stream and put in queue"""
+            for line in stream:
+                line = line.rstrip() if isinstance(line, str) else safe_decode(line, encoding)
+                prefix = "[ERROR] " if stream_name == "stderr" else ""
+                output_queue.put((stream_name, f"{prefix}{line}"))
+            output_queue.put((stream_name, None))  # Mark stream end
+            
+        # Create threads to read stdout and stderr
+        stdout_thread = threading.Thread(target=read_stream, args=(process.stdout, "stdout"))
+        stderr_thread = threading.Thread(target=read_stream, args=(process.stderr, "stderr"))
+        stdout_thread.daemon = True
+        stderr_thread.daemon = True
+        stdout_thread.start()
+        stderr_thread.start()
+        
+        # Track number of active streams
+        active_streams = 2
+        
+        # Process output from queue
+        while active_streams > 0:
+            try:
+                stream_name, line = output_queue.get(timeout=0.1)
+                if line is None:
+                    active_streams -= 1
+                    continue
+                    
+                output.append(line)
+                # Print each line directly for true streaming output
+                if stream_name == "stderr":
+                    console.print(f"[red]{line}[/red]")
+                else:
+                    console.print(line)
+                    
+            except queue.Empty:
+                # Check if process is still running
+                if process.poll() is not None and active_streams == 2:
+                    # If process ended but threads are still running, may have no output
                     break
-
-        # Get remaining output
-        remaining_out, remaining_err = process.communicate()
-        if remaining_out:
-            output.append(safe_decode(remaining_out, encoding))
-        if remaining_err:
-            output.append(f"ERROR: {safe_decode(remaining_err, encoding)}")
+                continue
+                
+        # Wait for threads to finish
+        stdout_thread.join()
+        stderr_thread.join()
         
-        result_manager.add_result(content="\n".join(output),meta={
+        # Wait for process to end and get return code
+        return_code = process.wait()
+        
+        # Compile results
+        result_content = "\n".join(output)
+        result_manager.add_result(content=result_content, meta={
             "action": "execute_shell_command",
             "input": {
                 "command": command
-            }
+            },
+            "return_code": return_code
         })
-        # Show final output
-        console.print(
-            Panel(
-                Text("\n".join(output)),
-                title="Final Output",
-                border_style="blue",
-                subtitle=f"Encoding: {encoding} | OS: {sys.platform}"
-            )
-        )
+        
+        # Show command completion info
+        completion_message = f"Command completed with return code: {return_code}"
+        style = "green" if return_code == 0 else "red"
+        console.print(f"[bold {style}]{escape(completion_message)}[/bold {style}]")
 
     except FileNotFoundError:
         result_manager.add_result(content=f"[bold red]Command not found:[/bold red] [yellow]{command}[/yellow]",meta={

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.277"
+__version__ = "0.1.278"