auto-coder 1.0.0__py3-none-any.whl → 2.0.0__py3-none-any.whl

autocoder/common/v2/agent/runner/sdk_runner.py

@@ -5,15 +5,20 @@ SdkRunner 提供生成器接口，适用于SDK环境下的代理运行。
 它是三种运行模式中最轻量级的一种，适合集成到其他应用程序中。
 """
 
-import logging
-from typing import Generator, Any
+from loguru import logger
+from typing import Generator, Any, Optional
+import os
+import time
 
 from autocoder.common.v2.agent.agentic_edit_types import (
-    AgenticEditRequest, AgentEvent, CompletionEvent
+    AgenticEditRequest, AgentEvent, CompletionEvent, PullRequestEvent, 
+    PullRequestResult, CommitEvent,PreCommitEvent
 )
-from .base_runner import BaseRunner
+from autocoder.common import  git_utils
+from autocoder.common.git_utils import CommitResult
+from autocoder.common.pull_requests import create_pull_request
 
-logger = logging.getLogger(__name__)
+from .base_runner import BaseRunner
 
 class SdkRunner(BaseRunner):
     """
@@ -22,17 +27,154 @@ class SdkRunner(BaseRunner):
     这个运行器返回一个事件生成器，允许外部代码迭代处理代理事件。
     它是三种运行模式中最轻量级的一种，适合集成到其他应用程序中。
     """
+
+    def apply_pre_changes(self)->Optional[CommitResult]:
+        # get the file name
+        file_name = os.path.basename(self.args.file)
+        if not self.args.skip_commit:
+            try:
+                commit_result = git_utils.commit_changes(
+                    self.args.source_dir, f"auto_coder_pre_{file_name}")                
+                return commit_result
+
+            except Exception as e:
+                self.printer.print_in_terminal("git_init_required",
+                                               source_dir=self.args.source_dir, error=str(e))
+        return None
+
+    def apply_changes(self) -> tuple[Optional[CommitResult], Optional[PullRequestResult]]:
+        """
+        应用变更并可选地创建 Pull Request
+        
+        Returns:
+            tuple: (commit_result, pull_request_result)
+        """
+        if not self.args.skip_commit:
+            try:
+                file_name = os.path.basename(self.args.file)
+                commit_result = git_utils.commit_changes(
+                    self.args.source_dir,
+                    f"{self.args.query}\nauto_coder_{file_name}",
+                )
+                
+                pull_request_result = None
+                # 检查是否需要创建 Pull Request
+                if self.conversation_config and self.conversation_config.pull_request:
+                    pr_result = self._create_pull_request(commit_result)
+                    if pr_result:
+                        # 将 PRResult 转换为 PullRequestResult
+                        pull_request_result = PullRequestResult.from_pr_result(pr_result)
+
+                return commit_result, pull_request_result    
+
+            except Exception as e:
+                self.printer.print_str_in_terminal(
+                    str(e),
+                    style="red"
+                )  
+        
+        return None, None
+    
+    def _create_pull_request(self, commit_result):
+        """
+        创建 Pull Request 的内部方法
+        
+        Args:
+            commit_result: Git commit 结果对象
+            
+        Returns:
+            PRResult: Pull Request 创建结果
+        """
+        try:            
+            
+            # 获取当前分支名
+            current_branch = git_utils.get_current_branch(self.args.source_dir)
+            if not current_branch:
+                logger.warning("无法获取当前分支名")
+                return None
+
+            # 准备 PR 标题和描述
+            query = self.args.query or "Auto-coder generated changes"
+            pr_title = f"Auto-coder: {query[:40]}..."
+
+            # 构建 PR 描述
+            file_list = ""
+            if commit_result.changed_files:
+                for file_path in commit_result.changed_files:
+                    file_list += f"- `{file_path}`\n"
+
+            pr_description = f"""## 自动生成的代码变更
+
+**查询内容**: {query}
+
+**变更文件数量**: {len(commit_result.changed_files or [])}
+
+**Commit Hash**: {commit_result.commit_hash}
+
+### 变更文件列表:
+{file_list.strip()}
+
+**源分支**: {current_branch}  
+**目标分支**: main  
+**生成时间**: {time.strftime('%Y-%m-%d %H:%M:%S')}
+---
+此 Pull Request 由 Auto-coder 自动生成
+"""
+
+            # 创建 Pull Request
+            logger.info(f"正在创建 Pull Request: {pr_title}")
+
+            result = create_pull_request(
+                repo_path=self.args.source_dir,
+                title=pr_title,
+                description=pr_description,
+            )
+
+            if result.success:
+                logger.info("Pull Request 创建成功")
+                logger.info(f"PR URL: {result.pr_url}")
+                logger.info(f"PR 编号: {result.pr_number}")
+
+            return result
+
+        except Exception as e:
+            logger.exception(f"创建 Pull Request 时发生异常: {str(e)}")
+            # 返回一个失败的 PRResult
+            try:
+                from autocoder.common.pull_requests.models import PRResult
+                return PRResult(
+                    success=False,
+                    error_message=f"创建 Pull Request 失败: {str(e)}"
+                )
+            except ImportError:
+                return None
     
     def run(self, request: AgenticEditRequest) -> Generator[AgentEvent, None, None]:
         """
         Runs the agentic edit process and yields events for external processing.
         """
         try:
-            event_stream = self.analyze(request)
+            if self.conversation_config and self.conversation_config.pre_commit:
+                pre_commit_result = self.apply_pre_changes()
+                yield PreCommitEvent(commit_result=pre_commit_result)
+
+            event_stream = self.analyze(request)                                    
             for agent_event in event_stream:
                 if isinstance(agent_event, CompletionEvent):
-                    self.apply_changes()
-                yield agent_event
+                    if self.conversation_config and self.conversation_config.post_commit:
+                        commit_result, pull_request_result = self.apply_changes()                    
+                        # 发射 commit 事件
+                        if commit_result:
+                            yield CommitEvent(commit_result=commit_result)
+                        
+                        # 发射 pull request 事件（如果有）                        
+                        if pull_request_result:
+                            yield PullRequestEvent(pull_request_result=pull_request_result)
+                    
+                    # 总是发射 completion 事件
+                    yield agent_event
+                else:
+                    yield agent_event
                 
         except Exception as e:
             logger.exception(

autocoder/common/v2/agent/runner/terminal_runner.py

@@ -17,18 +17,21 @@ from rich.markdown import Markdown
 from rich.syntax import Syntax
 
 from autocoder.common.auto_coder_lang import get_message
+from byzerllm.utils.types import SingleOutputMeta
 from autocoder.utils import llms as llm_utils
 from autocoder.common.v2.agent.agentic_edit_types import (
     AgenticEditRequest, AgentEvent, CompletionEvent, 
     LLMOutputEvent, LLMThinkingEvent, ToolCallEvent, 
     ToolResultEvent, TokenUsageEvent, ErrorEvent,
     WindowLengthChangeEvent, ConversationIdEvent,
-    PlanModeRespondEvent, SingleOutputMeta, AttemptCompletionTool
+    PlanModeRespondEvent, AttemptCompletionTool,
+    ConversationAction, TodoReadTool, TodoWriteTool,
+    ConversationMessageIdsWriteTool, ConversationMessageIdsReadTool
 )
-from .tool_display import get_tool_display_message
+from .tool_display import get_tool_display_message, get_tool_title, get_tool_result_title
 from .base_runner import BaseRunner
-
-logger = logging.getLogger(__name__)
+from autocoder.common.wrap_llm_hint.utils import extract_content_from_text, has_hint_in_text
+from loguru import logger
 
 class TerminalRunner(BaseRunner):
     """
@@ -38,37 +41,55 @@ class TerminalRunner(BaseRunner):
     并以用户友好的方式在终端中显示。
     """
     
-    def run(self, request: AgenticEditRequest) -> None:
+    def _safe_console_print(self, console: Console, renderable, fallback_content: Optional[str] = None, error_prefix: str = "Rich display"):
+        """
+        安全地在控制台打印内容，如果Rich markup失败则回退到纯文本。
+        
+        Args:
+            console: Rich Console对象
+            renderable: 要渲染的Rich对象（如Panel、Markdown等）
+            fallback_content: 回退时显示的内容，如果为None则从renderable中提取
+            error_prefix: 错误日志的前缀
+        """
+        try:
+            console.print(renderable)
+        except Exception as display_error:
+            logger.warning(f"{error_prefix} error, falling back to plain text: {display_error}")
+            
+            # 如果没有提供fallback_content，尝试从renderable中提取
+            if fallback_content is None:
+                if hasattr(renderable, 'renderable') and hasattr(renderable.renderable, 'markup'):
+                    # Panel with Markdown
+                    fallback_content = str(renderable.renderable.markup)
+                elif hasattr(renderable, 'renderable'):
+                    # Panel with other content
+                    fallback_content = str(renderable.renderable)
+                else:
+                    fallback_content = str(renderable)
+            
+            # 转义Rich markup字符
+            safe_content = fallback_content.replace('[', '\\[').replace(']', '\\]')
+            
+            # 如果原来是Panel，保持Panel结构
+            if hasattr(renderable, 'title') and hasattr(renderable, 'border_style'):
+                console.print(Panel(
+                    safe_content,
+                    title=renderable.title,
+                    border_style=renderable.border_style,
+                    title_align=getattr(renderable, 'title_align', 'center')
+                ))
+            else:
+                console.print(safe_content)
+    
+    def run(self, request: AgenticEditRequest) -> str:
         """
         Runs the agentic edit process based on the request and displays
         the interaction streamingly in the terminal using Rich.
-        """
-        import json
+        """        
+        self.attempt_result = ""
         console = Console()
-        project_name = os.path.basename(os.path.abspath(self.args.source_dir))
-
-        if self.conversation_config.action == "list":
-            conversations = self.agent.conversation_manager.list_conversations()
-            # 只保留 conversation_id 和 name 字段
-            filtered_conversations = []
-            for conv in conversations:
-                filtered_conv = {
-                    "conversation_id": conv.get("conversation_id"),
-                    "name": conv.get("name")
-                }
-                filtered_conversations.append(filtered_conv)
-            
-            # 格式化 JSON 输出，使用 JSON 格式渲染而不是 Markdown
-            json_str = json.dumps(filtered_conversations, ensure_ascii=False, indent=4)
-            console.print(Panel(json_str,
-                                  title="🏁 Task Completion", border_style="green", title_align="left"))
-            return
-        
-
-        if self.conversation_config.action == "new" and not request.user_input.strip():
-            console.print(Panel(Markdown(f"New conversation created: {self.agent.conversation_manager.get_current_conversation_id()}"),
-                                  title="🏁 Task Completion", border_style="green", title_align="left"))
-            return
+        source_dir = self.args.source_dir or "."
+        project_name = os.path.basename(os.path.abspath(source_dir))
 
         console.rule(f"[bold cyan]Starting Agentic Edit: {project_name}[/]")
         console.print(Panel(
@@ -83,10 +104,10 @@ class TerminalRunner(BaseRunner):
             "output_cost": 0.0
         }
 
-        try:
-            self.apply_pre_changes()
-            event_stream = self.analyze(request)
-            for event in event_stream:
+        try:            
+            self.apply_pre_changes()            
+            event_stream = self.analyze(request)            
+            for event in event_stream:                
                 if isinstance(event, ConversationIdEvent):
                     console.print(f"[dim]Conversation ID: {event.conversation_id}[/dim]")
                     continue
@@ -121,7 +142,10 @@ class TerminalRunner(BaseRunner):
                 elif isinstance(event, WindowLengthChangeEvent):
                     # 显示当前会话的token数量
                     logger.info(f"当前会话总 tokens: {event.tokens_used}")
-                    console.print(f"[dim]当前会话总 tokens: {event.tokens_used}[/dim]")
+                    if event.tokens_used > event.pruned_tokens_used:
+                        console.print(f"[dim]conversation tokens: {event.tokens_used} -> {event.pruned_tokens_used} (conversation round: {event.conversation_round})[/dim]")
+                    else:
+                        console.print(f"[dim]conversation tokens: {event.tokens_used} (conversation round: {event.conversation_round})[/dim]")
                     
                 elif isinstance(event, LLMThinkingEvent):
                     # Render thinking within a less prominent style, maybe grey?
@@ -134,11 +158,38 @@ class TerminalRunner(BaseRunner):
                     if isinstance(event.tool, AttemptCompletionTool):
                         continue  # Do not display AttemptCompletionTool tool call
 
-                    tool_name = type(event.tool).__name__
+                    # Special handling for ConversationMessageIds tools - only show compacting message
+                    if isinstance(event.tool, (ConversationMessageIdsWriteTool, ConversationMessageIdsReadTool)):
+                        # Use internationalization module to get the compacting message
+                        compacting_message = get_message("conversation_compacting")
+                        compacting_title = get_message("conversation_compacting_title")
+                        
+                        self._safe_console_print(
+                            console,
+                            Panel(f"[dim]{compacting_message}[/dim]", title=f"🗜️ {compacting_title}", border_style="yellow", title_align="left"),
+                            fallback_content=compacting_message,
+                            error_prefix="Compacting display"
+                        )
+                        continue
+
+                    # Get the descriptive title for the tool
+                    title = get_tool_title(event.tool)
+                    
                     # Use the new internationalized display function
                     display_content = get_tool_display_message(event.tool)
-                    console.print(Panel(
-                        display_content, title=f"🔧 Action: {tool_name}", border_style="blue", title_align="left"))
+                    
+                    # Use cyan border for todo tools, blue for others
+                    if isinstance(event.tool, (TodoReadTool, TodoWriteTool)):
+                        border_style = "cyan"
+                    else:
+                        border_style = "blue"
+                    
+                    self._safe_console_print(
+                        console,
+                        Panel(display_content, title=f"📝 {title}", border_style=border_style, title_align="left"),
+                        fallback_content=str(display_content),
+                        error_prefix="Tool display"
+                    )
                     
                 elif isinstance(event, ToolResultEvent):
                     # Skip displaying AttemptCompletionTool's result
@@ -148,11 +199,44 @@ class TerminalRunner(BaseRunner):
                     if event.tool_name == "PlanModeRespondTool":
                         continue
 
+                    # Skip displaying ConversationMessageIds tools' results - they are handled by the compacting message
+                    if event.tool_name in ["ConversationMessageIdsWriteTool", "ConversationMessageIdsReadTool"]:
+                        continue
+
                     result = event.result
-                    title = f"✅ Tool Result: {event.tool_name}" if result.success else f"❌ Tool Result: {event.tool_name}"
+                    
+                    # Use friendly result title instead of tool name
+                    result_title = get_tool_result_title(event.tool_name, result.success)
+                    title_icon = "✅" if result.success else "❌"
+                    title = f"{title_icon} {result_title}"
                     border_style = "green" if result.success else "red"
-                    base_content = f"[bold]Status:[/bold] {'Success' if result.success else 'Failure'}\n"
-                    base_content += f"[bold]Message:[/bold] {result.message}\n"
+                    
+                    # Special handling for TodoReadTool and TodoWriteTool
+                    if event.tool_name in ["TodoReadTool", "TodoWriteTool","SessionStartTool","SessionInteractiveTool","SessionStopTool"]:
+                        # For todo tools, display content directly without syntax highlighting
+                        if result.content:
+                            # The content is already nicely formatted by the resolver
+                            self._safe_console_print(
+                                console,
+                                Panel(result.content, title=title, border_style=border_style, title_align="left"),
+                                fallback_content=str(result.content),
+                                error_prefix="Todo content display"
+                            )
+                        else:
+                            # If no content, just show the message
+                            status_message = f"[bold]Status:[/bold] {'Success' if result.success else 'Failure'}\n[bold]Message:[/bold] {result.message}"
+                            fallback_message = f"Status: {'Success' if result.success else 'Failure'}\nMessage: {result.message}"
+                            self._safe_console_print(
+                                console,
+                                Panel(status_message, title=title, border_style=border_style, title_align="left"),
+                                fallback_content=fallback_message,
+                                error_prefix="Todo message display"
+                            )
+                        continue  # Skip the rest of the processing for todo tools
+                    
+                    # Regular processing for other tools
+                    base_content = f"[bold]Status:[/bold] {'Success' if result.success else 'Failure'}"
+                    base_content += f"\n[bold]Message:[/bold] {result.message}"
 
                     def _format_content(content):
                         if len(content) > 200:
@@ -167,13 +251,19 @@ class TerminalRunner(BaseRunner):
                     if result.content is not None:
                         content_str = ""
                         try:
-                            if isinstance(result.content, (dict, list)):
-                                import json
+                            # Remove hints from content before processing
+                            processed_content = result.content
+                            if isinstance(result.content, str) and has_hint_in_text(result.content):
+                                processed_content = extract_content_from_text(result.content)
+                            
+                            if isinstance(processed_content, (dict, list)):
+                                if not processed_content:
+                                    continue                                
                                 content_str = json.dumps(
-                                    result.content, indent=2, ensure_ascii=False)
+                                    processed_content, indent=2, ensure_ascii=False)
                                 syntax_content = Syntax(
                                     content_str, "json", theme="default", line_numbers=False)
-                            elif isinstance(result.content, str) and ('\n' in result.content or result.content.strip().startswith('<')):
+                            elif isinstance(processed_content, str) and ('\n' in processed_content or processed_content.strip().startswith('<')):
                                 # Heuristic for code or XML/HTML
                                 lexer = "python"  # Default guess
                                 if event.tool_name == "ReadFileTool" and isinstance(event.result.message, str):
@@ -202,9 +292,9 @@ class TerminalRunner(BaseRunner):
                                     lexer = "text"
 
                                 syntax_content = Syntax(
-                                    _format_content(result.content), lexer, theme="default", line_numbers=True)
+                                    _format_content(processed_content), lexer, theme="default", line_numbers=True)
                             else:
-                                content_str = str(result.content)
+                                content_str = str(processed_content)
                                 # Append simple string content directly
                                 panel_content.append(
                                     _format_content(content_str))
@@ -215,16 +305,32 @@ class TerminalRunner(BaseRunner):
                                 # Fallback
                                 _format_content(str(result.content)))
 
-                    # Print the base info panel
-                    console.print(Panel("\n".join(
-                        panel_content), title=title, border_style=border_style, title_align="left"))
+                    # Print the base info panel with error handling for Rich markup
+                    panel_content_str = "\n".join(panel_content)
+                    self._safe_console_print(
+                        console,
+                        Panel(panel_content_str, title=title, border_style=border_style, title_align="left"),
+                        fallback_content=panel_content_str,
+                        error_prefix="Tool result panel"
+                    )
+                    
                     # Print syntax highlighted content separately if it exists
                     if syntax_content:
-                        console.print(syntax_content)
+                        content_fallback = f"[bold]Content:[/bold]\n{result.content}"
+                        self._safe_console_print(
+                            console,
+                            syntax_content,
+                            fallback_content=content_fallback,
+                            error_prefix="Syntax highlighting"
+                        )
                             
                 elif isinstance(event, PlanModeRespondEvent):
-                    console.print(Panel(Markdown(event.completion.response),
-                                  title="🏁 Task Completion", border_style="green", title_align="left"))
+                    self._safe_console_print(
+                        console,
+                        Panel(Markdown(event.completion.response), title="🏁 Task Completion", border_style="green", title_align="left"),
+                        fallback_content=event.completion.response,
+                        error_prefix="Plan mode response"
+                    )
 
                 elif isinstance(event, CompletionEvent):
                     # 在这里完成实际合并
@@ -234,8 +340,13 @@ class TerminalRunner(BaseRunner):
                         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"))
+                    self._safe_console_print(
+                        console,
+                        Panel(Markdown(event.completion.result), title="🏁 Task Completion", border_style="green", title_align="left"),
+                        fallback_content=event.completion.result,
+                        error_prefix="Task completion"
+                    )
+                    self.attempt_result = event.completion.result
                     if event.completion.command:
                         console.print(
                             f"[dim]Suggested command:[/dim] [bold cyan]{event.completion.command}[/]")
@@ -257,7 +368,7 @@ class TerminalRunner(BaseRunner):
                     speed=0.0,
                     model_names=accumulated_token_usage["model_name"],
                     sampling_count=1
-                )
+                )            
                 
         except Exception as e:
             # 在处理异常时也打印累计的token使用情况
@@ -281,3 +392,5 @@ class TerminalRunner(BaseRunner):
             raise e
         finally:
             console.rule("[bold cyan]Agentic Edit Finished[/]")
+
+        return self.attempt_result