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

autocoder/terminal_v3/models/tool_display.py

@@ -0,0 +1,247 @@
+"""
+Terminal V3 工具显示模块
+提供简洁友好的工具调用展示，类似 IDE 风格的简化显示
+"""
+
+from pathlib import Path
+from typing import Optional
+from autocoder.common.v2.agent.agentic_edit_types import (
+    BaseTool,
+    ReadFileTool,
+    WriteToFileTool,
+    ReplaceInFileTool,
+    ExecuteCommandTool,
+    ListFilesTool,
+    SearchFilesTool,
+    ListCodeDefinitionNamesTool,
+    AskFollowupQuestionTool,
+    UseMcpTool,
+    AttemptCompletionTool,
+    TodoReadTool,
+    TodoWriteTool,
+    UseRAGTool,
+    ACModReadTool,
+    ACModWriteTool,
+    ACModListTool,
+    CountTokensTool,
+    SessionStartTool,
+    SessionInteractiveTool,
+    SessionStopTool,
+    ConversationMessageIdsWriteTool,
+    ConversationMessageIdsReadTool,
+    RunNamedSubagentsTool,
+)
+
+
+def get_short_path(path: str, max_length: int = 50) -> str:
+    """
+    获取路径的简短版本
+
+    Args:
+        path: 完整路径
+        max_length: 最大长度
+
+    Returns:
+        简化后的路径
+    """
+    if len(path) <= max_length:
+        return path
+
+    # 尝试只显示文件名
+    p = Path(path)
+    if len(p.name) <= max_length:
+        return p.name
+
+    # 如果文件名也太长，截断
+    return "..." + path[-(max_length - 3) :]
+
+
+def get_tool_simple_display(tool: BaseTool) -> str:
+    """
+    获取工具的简洁显示文本（类似 IDE 风格）
+
+    Args:
+        tool: 工具实例
+
+    Returns:
+        简洁的工具描述字符串
+    """
+    try:
+        if isinstance(tool, ReadFileTool):
+            path = get_short_path(tool.path)
+            if tool.start_line and tool.end_line:
+                return f"Read({path}:{tool.start_line}-{tool.end_line})"
+            elif tool.query:
+                return f"Search({path}, '{tool.query[:30]}...')"
+            return f"Read({path})"
+
+        elif isinstance(tool, WriteToFileTool):
+            path = get_short_path(tool.path)
+            mode = "Append" if tool.mode == "append" else "Write"
+            lines = len(tool.content.splitlines())
+            return f"{mode}({path}, {lines} lines)"
+
+        elif isinstance(tool, ReplaceInFileTool):
+            path = get_short_path(tool.path)
+            # 计算修改的行数
+            changes = len(
+                [line for line in tool.diff.splitlines() if line.startswith(("+", "-"))]
+            )
+            return f"Edit({path}, ~{changes} changes)"
+
+        elif isinstance(tool, ExecuteCommandTool):
+            cmd = tool.command
+            if len(cmd) > 50:
+                cmd = cmd[:47] + "..."
+            bg = " [bg]" if tool.background else ""
+            return f"Run({cmd}){bg}"
+
+        elif isinstance(tool, ListFilesTool):
+            path = get_short_path(tool.path)
+            mode = "recursive" if tool.recursive else "flat"
+            return f"List({path}, {mode})"
+
+        elif isinstance(tool, SearchFilesTool):
+            path = get_short_path(tool.path)
+            pattern = tool.file_pattern or "*"
+            regex = tool.regex[:30] if len(tool.regex) > 30 else tool.regex
+            return f"Search({path}, pattern={pattern}, regex='{regex}')"
+
+        elif isinstance(tool, ListCodeDefinitionNamesTool):
+            path = get_short_path(tool.path)
+            return f"ListDefinitions({path})"
+
+        elif isinstance(tool, AskFollowupQuestionTool):
+            question = tool.question[:50]
+            if len(tool.question) > 50:
+                question += "..."
+            options = f", {len(tool.options)} options" if tool.options else ""
+            return f"Ask('{question}'{options})"
+
+        elif isinstance(tool, UseMcpTool):
+            return f"MCP({tool.server_name}.{tool.tool_name})"
+
+        elif isinstance(tool, UseRAGTool):
+            query = tool.query[:40]
+            if len(tool.query) > 40:
+                query += "..."
+            return f"RAG({tool.server_name}, '{query}')"
+
+        elif isinstance(tool, TodoReadTool):
+            return "TodoList()"
+
+        elif isinstance(tool, TodoWriteTool):
+            action_map = {
+                "create": "Create",
+                "update": "Update",
+                "delete": "Delete",
+                "complete": "Complete",
+            }
+            action = action_map.get(tool.action, tool.action)
+            if tool.task_id:
+                return f"Todo.{action}(#{tool.task_id})"
+            return f"Todo.{action}()"
+
+        elif isinstance(tool, ACModReadTool):
+            path = get_short_path(tool.path)
+            return f"ACMod.Read({path})"
+
+        elif isinstance(tool, ACModWriteTool):
+            path = get_short_path(tool.path)
+            changes = len(
+                [line for line in tool.diff.splitlines() if line.startswith(("+", "-"))]
+            )
+            return f"ACMod.Write({path}, ~{changes} changes)"
+
+        elif isinstance(tool, ACModListTool):
+            if tool.path:
+                path = get_short_path(tool.path)
+                return f"ACMod.List({path})"
+            return "ACMod.List()"
+
+        elif isinstance(tool, CountTokensTool):
+            path = get_short_path(tool.path)
+            mode = "recursive" if tool.recursive else "single"
+            return f"CountTokens({path}, {mode})"
+
+        elif isinstance(tool, SessionStartTool):
+            cmd = tool.command
+            if len(cmd) > 40:
+                cmd = cmd[:37] + "..."
+            return f"Session.Start('{cmd}')"
+
+        elif isinstance(tool, SessionInteractiveTool):
+            input_text = tool.input[:30]
+            if len(tool.input) > 30:
+                input_text += "..."
+            return f"Session.Send({tool.session_id}, '{input_text}')"
+
+        elif isinstance(tool, SessionStopTool):
+            force = " [force]" if tool.force else ""
+            return f"Session.Stop({tool.session_id}){force}"
+
+        elif isinstance(tool, ConversationMessageIdsReadTool):
+            return "ConversationIds.Read()"
+
+        elif isinstance(tool, ConversationMessageIdsWriteTool):
+            return f"ConversationIds.{tool.action.capitalize()}()"
+
+        elif isinstance(tool, RunNamedSubagentsTool):
+            # 尝试统计子代理数量
+            import re
+
+            agents_count = len(re.findall(r'"name"\s*:', tool.subagents))
+            if agents_count == 0:
+                agents_count = len(re.findall(r"name:\s*", tool.subagents))
+            if agents_count > 0:
+                return f"RunSubagents({agents_count} agents)"
+            return "RunSubagents()"
+
+        elif isinstance(tool, AttemptCompletionTool):
+            result = tool.result[:50] if tool.result else "Done"
+            if tool.result and len(tool.result) > 50:
+                result += "..."
+            return f"Complete('{result}')"
+
+        else:
+            # 未知工具的通用显示
+            tool_name = type(tool).__name__.replace("Tool", "")
+            return f"{tool_name}(...)"
+
+    except Exception as e:
+        # 出错时返回通用格式
+        tool_name = type(tool).__name__
+        return f"{tool_name}(error: {str(e)[:30]})"
+
+
+def get_tool_result_display(
+    tool_name: str, success: bool, message: Optional[str] = None
+) -> str:
+    """
+    获取工具结果的简洁显示
+
+    Args:
+        tool_name: 工具名称（如 ReadFileToolResolver）
+        success: 是否成功
+        message: 结果消息（可选）
+
+    Returns:
+        简洁的结果描述
+    """
+    # 清理工具名称
+    base_name = tool_name
+    if base_name.endswith("ToolResolver"):
+        base_name = base_name[:-12]
+    elif base_name.endswith("Resolver"):
+        base_name = base_name[:-8]
+    if base_name.endswith("Tool"):
+        base_name = base_name[:-4]
+
+    status = "✓" if success else "✗"
+
+    if message and len(message) < 50:
+        return f"{status} {base_name}: {message}"
+    elif message:
+        return f"{status} {base_name}: {message[:47]}..."
+    else:
+        return f"{status} {base_name}"

autocoder/terminal_v3/ui/__init__.py

@@ -0,0 +1,7 @@
+"""UI 组件"""
+
+from .styles import get_styles
+from .layout import create_layout
+from .keybindings import create_key_bindings
+
+__all__ = ["get_styles", "create_layout", "create_key_bindings"]

autocoder/terminal_v3/ui/keybindings.py

@@ -0,0 +1,56 @@
+from typing import TYPE_CHECKING
+from pluggy import PluginManager
+from prompt_toolkit.key_binding import KeyBindings
+from prompt_toolkit.filters import has_focus
+from autocoder.common.global_cancel import global_cancel
+from prompt_toolkit.buffer import Buffer
+from autocoder.common.terminal_paste import register_paste_handler
+if TYPE_CHECKING:
+    from ..app import AutoCoderChatApp
+
+
+def create_key_bindings(app_instance: "AutoCoderChatApp", input_buffer: Buffer, plugin_manager: PluginManager):
+    """创建键盘绑定"""
+    kb = KeyBindings()
+
+    @kb.add("c-c")
+    def _(event):
+        """Ctrl+C - 取消当前任务"""        
+        if app_instance.is_processing:
+            global_cancel.set_active_tokens()
+            app_instance.is_processing = False
+            app_instance.current_task = ""
+            app_instance.animation_counter = 0
+            app_instance.conversation_buffer.add_system_message("The user tried to cancel the task")
+            app_instance.app.invalidate()
+
+    @kb.add("c-d")
+    def _(event):
+        """Ctrl+D - 退出应用"""
+        event.app.exit()
+
+    @kb.add("c-l")
+    def _(event):
+        """Ctrl+L - 清空对话"""
+        app_instance.conversation_buffer.clear_conversation()
+        app_instance.app.invalidate()
+
+    @kb.add("?")
+    def _(event):
+        """? - 显示/隐藏快捷键帮助"""
+        if not input_buffer.text:
+            app_instance.show_shortcuts = not app_instance.show_shortcuts
+            app_instance.app.invalidate()
+
+    @kb.add("enter", filter=has_focus(input_buffer))
+    def _(event):
+        """Enter - 提交输入"""
+        event.current_buffer.validate_and_handle()
+    
+    # 注册粘贴处理器
+    register_paste_handler(kb)
+
+    # 应用插件的键盘绑定
+    plugin_manager.apply_keybindings(kb)
+
+    return kb

autocoder/terminal_v3/ui/layout.py

@@ -0,0 +1,141 @@
+"""布局定义"""
+
+from prompt_toolkit.layout.containers import (
+    HSplit,
+    VSplit,
+    Window,
+    WindowAlign,
+    ConditionalContainer,
+)
+from prompt_toolkit.layout.controls import FormattedTextControl, BufferControl
+from prompt_toolkit.layout.layout import Layout
+from prompt_toolkit.layout.dimension import Dimension as D
+from prompt_toolkit.filters import Condition
+from prompt_toolkit.widgets import Frame
+
+
+def create_layout(
+    conversation_buffer,
+    input_buffer,
+    get_prompt_text,
+    get_right_hint,
+    get_tips_text,
+    get_shortcuts_help_text,
+    show_shortcuts_condition,
+    input_has_text_condition,
+):
+    """创建应用布局"""
+
+    # 创建对话历史控件
+    conversation_control = FormattedTextControl(
+        text=conversation_buffer.get_formatted_text,
+        show_cursor=False,
+        focusable=False,
+    )
+
+    # 创建输入控件
+    input_control = BufferControl(
+        buffer=input_buffer, search_buffer_control=None, focus_on_click=True
+    )
+
+    # 创建欢迎面板
+    welcome_content = Window(
+        content=FormattedTextControl(
+            text=conversation_buffer.get_welcome_text, show_cursor=False
+        ),
+        style="class:welcome-panel",
+    )
+
+    welcome_panel = Frame(body=welcome_content, title="", style="class:welcome-border")
+
+    # 对话历史窗口
+    conversation_window = Window(
+        content=conversation_control,
+        wrap_lines=True,
+        style="class:conversation",
+        always_hide_cursor=True,
+        height=D(min=5),
+        dont_extend_height=False,
+        scroll_offsets=None,
+    )
+
+    # 主要内容区域
+    main_content = VSplit(
+        [
+            # 左侧留白
+            Window(width=D(min=2, max=2)),
+            # 中间内容
+            HSplit(
+                [
+                    # 欢迎面板
+                    welcome_panel,
+                    # Tips 部分
+                    Window(
+                        content=FormattedTextControl(
+                            text=get_tips_text, show_cursor=False
+                        ),
+                        height=D(min=7, max=7),
+                        style="class:tips",
+                    ),
+                    # 对话历史区域
+                    conversation_window,
+                ]
+            ),
+            # 右侧留白
+            Window(width=D(min=2, max=2)),
+        ]
+    )
+
+    # 输入区域
+    input_area = VSplit(
+        [
+            # 输入提示符
+            Window(
+                content=FormattedTextControl(text=get_prompt_text),
+                width=D(min=2, max=4),
+                style="class:prompt",
+            ),
+            # 输入框
+            Window(content=input_control, style="class:input", height=D(min=1, max=1)),
+            # 右侧提示信息
+            Window(
+                content=FormattedTextControl(text=get_right_hint),
+                width=D(min=30, max=30),
+                style="class:hint-right",
+                align=WindowAlign.RIGHT,
+            ),
+        ],
+        height=D(min=1, max=1),
+    )
+
+    # 创建布局
+    root_container = HSplit(
+        [
+            # 主内容区域
+            HSplit([main_content]),
+            # 底部分隔
+            Window(height=D(min=1, max=1)),
+            # 输入区域边框
+            Window(height=D(min=1, max=1), char="─", style="class:input-separator"),
+            # 输入区域
+            input_area,
+            # 底部快捷键帮助
+            ConditionalContainer(
+                content=Window(
+                    content=FormattedTextControl(
+                        text=get_shortcuts_help_text, show_cursor=False
+                    ),
+                    height=D(min=5, max=5),
+                    style="class:shortcuts-help",
+                ),
+                filter=Condition(
+                    lambda: show_shortcuts_condition()
+                    and not input_has_text_condition()
+                ),
+            ),
+            # 底部空白
+            Window(height=D(min=1, max=1)),
+        ]
+    )
+
+    return Layout(root_container, focused_element=input_buffer)

autocoder/terminal_v3/ui/styles.py

@@ -0,0 +1,43 @@
+"""样式定义"""
+
+from prompt_toolkit.styles import Style
+
+
+def get_styles() -> Style:
+    """获取应用样式 - 接近 Claude 的配色"""
+    return Style.from_dict(
+        {
+            # 背景色
+            "dialog": "bg:#f7f7f8",
+            # 主内容区域
+            "main-content": "bg:#f7f7f8",
+            # 欢迎面板
+            "welcome-panel": "bg:#f7f7f8 #2d2d30",
+            "welcome-border": "#e3e3e6",
+            "welcome": "#2d2d30 bold",
+            # 提示部分
+            "tips": "bg:#f7f7f8 #666666",
+            # 对话区域
+            "conversation": "bg:#ffffff #2d2d30",
+            # 消息样式
+            "system": "#ff6b6b",
+            "system-text": "#666666",
+            "user-prompt": "#2d2d30 bold",
+            "user-text": "#2d2d30",
+            "assistant": "#2d2d30 bold",
+            "assistant-text": "#2d2d30",
+            # 输入区域
+            "input-separator": "#e3e3e6",
+            "prompt": "bg:#ffffff #2d2d30 bold",
+            "input": "bg:#ffffff #2d2d30",
+            "hint-right": "bg:#ffffff #999999",
+            "shortcuts-help": "bg:#ffffff #666666",
+            # 默认
+            "default": "#2d2d30",
+            # 滚动条样式
+            "scrollbar": "bg:#e3e3e6 #666666",
+            "scrollbar.background": "bg:#f7f7f8",
+            "scrollbar.button": "bg:#e3e3e6 #666666",
+            "scrollbar.arrow": "#2d2d30",
+        }
+    )

autocoder/tsproject/__init__.py

@@ -12,8 +12,6 @@ from loguru import logger
 import re
 from pydantic import BaseModel, Field
 from rich.console import Console
-import json
-from autocoder.utils.queue_communicate import queue_communicate, CommunicateEvent, CommunicateEventType
 from autocoder.common import files as FileUtils
 
 
@@ -101,16 +99,16 @@ class TSProject:
 
     def should_exclude(self, file_path):
         for pattern in self.exclude_patterns:
-            if pattern.search(file_path):                
+            if pattern.search(file_path):
                 return True
         return False
 
     def output(self):
-        with open(self.target_file, "r",encoding="utf-8") as file:
+        with open(self.target_file, "r", encoding="utf-8") as file:
             return file.read()
 
     def read_file_content(self, file_path):
-        return FileUtils.read_file(file_path)        
+        return FileUtils.read_file(file_path)
 
     def is_likely_useful_file(self, file_path):
         # Ignore common build output, dependency and configuration directories
@@ -172,7 +170,7 @@ class TSProject:
         return SourceCode(module_name=module_name, source_code=source_code)
 
     def get_source_codes(self) -> Generator[SourceCode, None, None]:
-        for root, dirs, files in os.walk(self.directory,followlinks=True):
+        for root, dirs, files in os.walk(self.directory, followlinks=True):
             dirs[:] = [d for d in dirs if d not in self.default_exclude_dirs]
             for file in files:
                 file_path = os.path.join(root, file)
@@ -197,20 +195,22 @@ class TSProject:
     def get_rag_source_codes(self):
         if not self.args.enable_rag_search and not self.args.enable_rag_context:
             return []
-            
+
         console = Console()
-        console.print(f"\n[bold blue]Starting RAG search for:[/bold blue] {self.args.query}")
-            
+        console.print(
+            f"\n[bold blue]Starting RAG search for:[/bold blue] {self.args.query}"
+        )
+
         from autocoder.rag.rag_entry import RAGFactory
+
         rag = RAGFactory.get_rag(self.llm, self.args, "")
         docs = rag.search(self.args.query)
         for doc in docs:
             doc.tag = "RAG"
-            
 
         console = Console()
         console.print(f"[bold green]Found {len(docs)} relevant documents[/bold green]")
-            
+
         return docs
 
     @byzerllm.prompt()
@@ -291,20 +291,20 @@ class TSProject:
         if self.git_url is not None:
             self.clone_repository()
 
-        if self.target_file:
-            with open(self.target_file, "w",encoding="utf-8") as file:
-                for code in self.get_rest_source_codes():
-                    self.sources.append(code)
-                    file.write(f"##File: {code.module_name}\n")
-                    file.write(f"{code.source_code}\n\n")
+        # 先收集所有sources
+        for code in self.get_rest_source_codes():
+            self.sources.append(code)
 
-                for code in self.get_search_source_codes():
-                    self.sources.append(code)
-                    file.write(f"##File: {code.module_name}\n")
-                    file.write(f"{code.source_code}\n\n")
+        for code in self.get_search_source_codes():
+            self.sources.append(code)
 
-                for code in self.get_source_codes():
-                    self.sources.append(code)
+        for code in self.get_source_codes():
+            self.sources.append(code)
+
+        # 如果target_file存在，才写入文件
+        if self.target_file:
+            with open(self.target_file, "w", encoding="utf-8") as file:
+                for code in self.sources:
                     file.write(f"##File: {code.module_name}\n")
                     file.write(f"{code.source_code}\n\n")
 

autocoder/utils/auto_coder_utils/chat_stream_out.py

@@ -231,7 +231,7 @@ def stream_out(
             console=console
         ) as live:
             for res in stream_generator:  
-                global_cancel.check_and_raise(args.event_file)                                  
+                global_cancel.check_and_raise(cancel_token or args.cancel_token)                                  
                 last_meta = res[1]                
                 content = res[0]