agentcrew-ai 0.8.4__tar.gz → 0.8.5__tar.gz

agentcrew_ai-0.8.5/AgentCrew/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.8.5"

{agentcrew_ai-0.8.4 → agentcrew_ai-0.8.5}/AgentCrew/modules/a2a/task_manager.py

@@ -604,7 +604,7 @@ class AgentTaskManager(TaskManager):
         Yields:
             Streaming responses with task updates
         """
-        task_id = request.params.task_id
+        task_id = request.params.id
 
         if task_id not in self.tasks:
             error = A2AError.task_not_found(task_id)

{agentcrew_ai-0.8.4 → agentcrew_ai-0.8.5}/AgentCrew/modules/agents/local_agent.py

@@ -642,7 +642,7 @@ Check if `when` condition in <Global_Behavior> or <Project_Behavior> matches, up
                     adaptive_messages["content"].append(
                         {
                             "type": "text",
-                            "text": f"Here are conversations that we have discussed:\n- {'\n- '.join(memory_headers)}",
+                            "text": f"Here are conversations that we have discussed from oldest to latest:\n - {'\n - '.join(memory_headers)}",
                         }
                     )
         if len(adaptive_messages["content"]) > 0:

{agentcrew_ai-0.8.4 → agentcrew_ai-0.8.5}/AgentCrew/modules/browser_automation/element_extractor.py

@@ -68,7 +68,7 @@ def clean_markdown_images(markdown_content: str) -> str:
         Cleaned markdown content
     """
     # Pattern for markdown images: ![alt](url)
-    markdown_img_pattern = r"!\[([^\]]*)\]\(([^)]+)\)"
+    markdown_img_pattern = r"!?\[([^\]]*)\]\(([^)]+)\)"
 
     def replace_markdown_img(match):
         alt_text = match.group(1)

{agentcrew_ai-0.8.4 → agentcrew_ai-0.8.5}/AgentCrew/modules/browser_automation/service.py

@@ -7,7 +7,7 @@ scroll content, and extract page information using Chrome DevTools Protocol.
 
 import time
 from typing import Dict, Any, Optional, List
-from html_to_markdown import convert_to_markdown
+from html_to_markdown import convert, ConversionOptions, PreprocessingOptions
 import urllib.parse
 
 from html.parser import HTMLParser
@@ -344,13 +344,23 @@ class BrowserAutomationService:
                 filtered_html = self._filter_hidden_elements(raw_html)
 
             # Convert HTML to markdown
-            raw_markdown_content = convert_to_markdown(
+            # raw_markdown_content = convert_to_markdown(
+            #     filtered_html,
+            #     source_encoding="utf-8",
+            #     strip_newlines=True,
+            #     extract_metadata=False,
+            #     remove_forms=False,
+            #     remove_navigation=False,
+            # )
+            raw_markdown_content = convert(
                 filtered_html,
-                source_encoding="utf-8",
-                strip_newlines=True,
-                extract_metadata=False,
-                remove_forms=False,
-                remove_navigation=False,
+                ConversionOptions(
+                    strip_newlines=True,
+                    extract_metadata=False,
+                ),
+                PreprocessingOptions(
+                    remove_navigation=False, remove_forms=False, preset="minimal"
+                ),
             )
             if not raw_markdown_content:
                 return {"success": False, "error": "Could not convert HTML to markdown"}

{agentcrew_ai-0.8.4 → agentcrew_ai-0.8.5}/AgentCrew/modules/chat/message/command_processor.py

@@ -101,6 +101,9 @@ class CommandProcessor:
 
     async def _handle_copy_command(self, user_input: str) -> CommandResult:
         copy_idx = user_input[5:].strip() or 1
+        user_input_idxs = [
+            turn.message_index for turn in self.message_handler.conversation_turns
+        ]
 
         asssistant_messages_iterator = reversed(
             [
@@ -108,8 +111,7 @@ class CommandProcessor:
                 for i, msg in enumerate(self.message_handler.streamline_messages)
                 if msg.get("role") == "assistant"
                 and (
-                    self.message_handler.streamline_messages[i + 1].get("role")
-                    == "user"
+                    i + 1 in user_input_idxs
                     if i + 1 < len(self.message_handler.streamline_messages)
                     else True
                 )

{agentcrew_ai-0.8.4 → agentcrew_ai-0.8.5}/AgentCrew/modules/chat/message/conversation.py

@@ -162,6 +162,7 @@ class ConversationManager:
                                 "Memories related to the user request:"
                             )
                             and not message_content.startswith("Content of ")
+                            and not message_content.startswith("<Transfer_Tool>")
                         ):
                             self.store_conversation_turn(message_content, i)
 

{agentcrew_ai-0.8.4 → agentcrew_ai-0.8.5}/AgentCrew/modules/chat/message/handler.py

@@ -279,7 +279,7 @@ class MessageHandler(Observable):
                     # Notify about response progress
                     if not self.agent.is_streaming():
                         # Delays it a bit when using without stream
-                        time.sleep(0.5)
+                        time.sleep(0.3)
                     self._notify("response_chunk", (chunk_text, assistant_response))
                     if voice_sentence is not None:
                         if (
@@ -321,6 +321,8 @@ class MessageHandler(Observable):
                                     .lstrip("\n")
                                 )
 
+            self.stream_generator = None
+
             # End thinking when break the response stream
             if not end_thinking and start_thinking:
                 self._notify("thinking_completed", thinking_content)
@@ -386,11 +388,6 @@ class MessageHandler(Observable):
 
                 return await self.get_assistant_response()
 
-            self.stream_generator = None
-
-            if thinking_content:
-                self._notify("agent_continue", self.agent.name)
-
             # Add assistant response to messages
             if assistant_response.strip():
                 self._messages_append(

{agentcrew_ai-0.8.4 → agentcrew_ai-0.8.5}/AgentCrew/modules/console/command_handlers.py

@@ -346,8 +346,8 @@ class CommandHandlers:
             for behavior_id, behavior_text in project_behaviors.items():
                 project_table.add_row(behavior_id, behavior_text)
 
-                self.console.print(project_table)
-                self.console.print()
+            self.console.print(project_table)
+            self.console.print()
 
     def handle_update_behavior_command(
         self, behavior_id: str, behavior_text: str, scope: str = "global"

{agentcrew_ai-0.8.4 → agentcrew_ai-0.8.5}/AgentCrew/modules/console/confirmation_handler.py

@@ -11,6 +11,8 @@ from rich.box import HORIZONTALS
 from rich.console import Group
 import time
 
+from .diff_display import DiffDisplay
+
 from .constants import (
     RICH_STYLE_BLUE,
     RICH_STYLE_BLUE_BOLD,
@@ -45,6 +47,20 @@ class ConfirmationHandler:
             self._handle_ask_tool(tool_use, confirmation_id, message_handler)
             return
 
+        # Special handling for 'write_or_edit_file' tool with search/replace blocks
+        if tool_use["name"] == "write_or_edit_file":
+            file_path = tool_use["input"].get("file_path", "")
+            text_or_blocks = tool_use["input"].get("text_or_search_replace_blocks", "")
+
+            if DiffDisplay.has_search_replace_blocks(text_or_blocks):
+                self._display_write_or_edit_file_diff(
+                    tool_use, file_path, text_or_blocks
+                )
+                self._get_and_handle_tool_response(
+                    tool_use, confirmation_id, message_handler
+                )
+                return
+
         tool_texts_group = []
         header = Text("🔧 Tool ", style=RICH_STYLE_YELLOW)
         header.append(tool_use["name"], style=RICH_STYLE_BLUE_BOLD)
@@ -72,8 +88,71 @@ class ConfirmationHandler:
             )
         )
 
-        # Get user response
+        self._get_and_handle_tool_response(tool_use, confirmation_id, message_handler)
+
+    def _handle_ask_tool(self, tool_use, confirmation_id, message_handler):
+        """Handle the ask tool - display question and guided answers."""
+        question = tool_use["input"].get("question", "")
+        guided_answers = tool_use["input"].get("guided_answers", [])
+        if isinstance(guided_answers, str):
+            guided_answers = guided_answers.strip("\n ").splitlines()
+
+        guided_answers.append("Custom your answer")
+
+        self.input_handler._stop_input_thread()
+        # Display the question
+        self.console.print(
+            Text("\n❓ Agent is asking for clarification:", style=RICH_STYLE_BLUE_BOLD)
+        )
+        response = self.input_handler.get_choice_input(f"{question}", guided_answers)
+
+        if response == "Custom your answer":
+            custom_answer = self.input_handler.get_prompt_input("Input your answer:")
+            message_handler.resolve_tool_confirmation(
+                confirmation_id, {"action": "answer", "answer": custom_answer}
+            )
+        elif response:
+            message_handler.resolve_tool_confirmation(
+                confirmation_id, {"action": "answer", "answer": response}
+            )
+
+        else:
+            message_handler.resolve_tool_confirmation(
+                confirmation_id, {"action": "answer", "answer": "Cancelled by user"}
+            )
+
+        self._ui.start_loading_animation()
+
+        self.input_handler._start_input_thread()
+
+    def _display_write_or_edit_file_diff(self, tool_use, file_path, blocks_text):
+        """Display split diff view for write_or_edit_file tool."""
+        header = Text("📝 File Edit ", style=RICH_STYLE_YELLOW)
+        header.append(file_path, style=RICH_STYLE_BLUE_BOLD)
+        header.append(" - Search/Replace Blocks", style=RICH_STYLE_YELLOW)
+
+        self.console.print(
+            Panel(header, box=HORIZONTALS, border_style=RICH_STYLE_YELLOW)
+        )
+
+        blocks = DiffDisplay.parse_search_replace_blocks(blocks_text)
+
+        if not blocks:
+            self.console.print(
+                Text("No valid search/replace blocks found", style=RICH_STYLE_RED)
+            )
+            return
+
+        for block in blocks:
+            diff_table = DiffDisplay.create_split_diff_table(
+                block["search"], block["replace"], max_width=self.console.width - 4
+            )
+            self.console.print(diff_table)
+
+    def _get_and_handle_tool_response(self, tool_use, confirmation_id, message_handler):
+        """Get user response for tool confirmation and handle it."""
         self.input_handler._stop_input_thread()
+
         choices = [
             "yes",
             "no",
@@ -91,11 +170,11 @@ class ConfirmationHandler:
                 confirmation_id, {"action": "approve"}
             )
         elif response == choices[1]:
-            response = self.input_handler.get_prompt_input(
+            deny_reason = self.input_handler.get_prompt_input(
                 "Please tell me why you are denying this tool: "
             )
             message_handler.resolve_tool_confirmation(
-                confirmation_id, {"action": "deny", "reason": response}
+                confirmation_id, {"action": "deny", "reason": deny_reason}
             )
         elif response == choices[2]:
             message_handler.resolve_tool_confirmation(
@@ -120,44 +199,10 @@ class ConfirmationHandler:
                 style=RICH_STYLE_YELLOW,
             )
             self.console.print(saved_text)
-        self._ui.start_loading_animation()
-        self.input_handler._start_input_thread()
-        time.sleep(0.2)  # Small delay to between tool calls
-
-    def _handle_ask_tool(self, tool_use, confirmation_id, message_handler):
-        """Handle the ask tool - display question and guided answers."""
-        question = tool_use["input"].get("question", "")
-        guided_answers = tool_use["input"].get("guided_answers", [])
-        if isinstance(guided_answers, str):
-            guided_answers = guided_answers.strip("\n ").splitlines()
-
-        guided_answers.append("Custom your answer")
-
-        self.input_handler._stop_input_thread()
-        # Display the question
-        self.console.print(
-            Text("\n❓ Agent is asking for clarification:", style=RICH_STYLE_BLUE_BOLD)
-        )
-        response = self.input_handler.get_choice_input(f"{question}", guided_answers)
-
-        if response == "Custom your answer":
-            custom_answer = self.input_handler.get_prompt_input("Input your answer:")
-            message_handler.resolve_tool_confirmation(
-                confirmation_id, {"action": "answer", "answer": custom_answer}
-            )
-        elif response:
-            message_handler.resolve_tool_confirmation(
-                confirmation_id, {"action": "answer", "answer": response}
-            )
-
-        else:
-            message_handler.resolve_tool_confirmation(
-                confirmation_id, {"action": "answer", "answer": "Cancelled by user"}
-            )
 
         self._ui.start_loading_animation()
-
         self.input_handler._start_input_thread()
+        time.sleep(0.2)
 
     def display_mcp_prompt_confirmation(self, prompt_data, input_queue):
         """Display MCP prompt confirmation request and get user response."""

{agentcrew_ai-0.8.4 → agentcrew_ai-0.8.5}/AgentCrew/modules/console/console_ui.py

@@ -20,7 +20,6 @@ from .constants import (
     RICH_STYLE_GREEN,
     RICH_STYLE_BLUE,
     RICH_STYLE_YELLOW,
-    RICH_STYLE_GREEN_BOLD,
     RICH_STYLE_YELLOW_BOLD,
     PROMPT_CHAR,
 )
@@ -83,11 +82,17 @@ class ConsoleUI(Observer):
 
         if event == "thinking_started":
             self.ui_effects.stop_loading_animation()  # Stop loading on first chunk
-            self.display_handlers.display_thinking_started(data)  # data is agent_name
+            # self.display_handlers.display_thinking_started(data)  # data is agent_name
         elif event == "thinking_chunk":
-            self.display_handlers.display_thinking_chunk(
-                data
-            )  # data is the thinking chunk
+            self.ui_effects.update_live_display(data, is_thinking=True)
+            # self.display_handlers.display_thinking_chunk(
+            #     data
+            # )  # data is the thinking chunk
+            #
+        elif event == "thinking_completed":
+            self.ui_effects.finish_response(
+                self.ui_effects.updated_text, is_thinking=True
+            )
         elif event == "user_message_created":
             pass
         elif event == "response_chunk":
@@ -178,10 +183,6 @@ class ConsoleUI(Observer):
                 f"{data['agent_name'] if 'agent_name' in data else 'other'} agent"
             )
             self.display_handlers.display_message(transfer_text)
-        elif event == "agent_continue":
-            self.display_handlers.display_message(
-                Text(f"\n🤖 {data.upper()}:", style=RICH_STYLE_GREEN_BOLD)
-            )
         elif event == "jump_performed":
             jump_text = Text(
                 f"🕰️ Jumping to turn {data['turn_number']}...\n",
@@ -189,12 +190,11 @@ class ConsoleUI(Observer):
             )
             preview_text = Text("Conversation rewound to: ", style=RICH_STYLE_YELLOW)
             preview_text.append(data["preview"])
+            self._clean_and_reprint_chat()
 
             self.display_handlers.display_message(jump_text)
             self.display_handlers.display_message(preview_text)
             self.input_handler.set_current_buffer(data["message"])
-        elif event == "thinking_completed":
-            self.display_handlers.display_divider()
         elif event == "file_processing":
             self.ui_effects.stop_loading_animation()  # Stop loading on first chunk
             self.display_handlers.add_file(data["file_path"])
@@ -286,25 +286,14 @@ class ConsoleUI(Observer):
         Signal handler for SIGWINCH.
         This function is called when the terminal window is resized.
         """
-        import os
         import time
 
         if self.input_handler.is_message_processing or self._is_resizing:
             return  # Ignore resize during message processing
         self._is_resizing = True
         time.sleep(0.5)  # brief pause to allow resize to complete
-        os.system("cls" if os.name == "nt" else "printf '\033c'")
-        self.display_handlers.display_loaded_conversation(
-            self.message_handler.streamline_messages, self.message_handler.agent.name
-        )
-        self.display_handlers.print_prompt_prefix(
-            self.message_handler.agent.name,
-            self.message_handler.agent.get_model(),
-            self.message_handler.tool_manager.get_effective_yolo_mode(),
-        )
-
+        self._clean_and_reprint_chat()
         self.display_handlers.print_divider("👤 YOU: ", with_time=True)
-
         prompt = Text(
             PROMPT_CHAR,
             style=RICH_STYLE_BLUE,
@@ -318,6 +307,21 @@ class ConsoleUI(Observer):
         self.console.print(prompt, end="")
         self._is_resizing = False
 
+    def _clean_and_reprint_chat(self):
+        """Clear and reprint the chat display."""
+
+        import os
+
+        os.system("cls" if os.name == "nt" else "printf '\033c'")
+        self.display_handlers.display_loaded_conversation(
+            self.message_handler.streamline_messages, self.message_handler.agent.name
+        )
+        self.display_handlers.print_prompt_prefix(
+            self.message_handler.agent.name,
+            self.message_handler.agent.get_model(),
+            self.message_handler.tool_manager.get_effective_yolo_mode(),
+        )
+
     def start_streaming_response(self, agent_name: str):
         """Start streaming the assistant's response."""
         self.ui_effects.start_streaming_response(agent_name)

agentcrew_ai-0.8.5/AgentCrew/modules/console/diff_display.py

@@ -0,0 +1,203 @@
+"""
+Diff display helper for showing file changes in console UI.
+Provides split view diff display with syntax highlighting.
+"""
+
+import difflib
+from rich.text import Text
+from rich.table import Table
+from rich.box import SIMPLE_HEAD
+from .constants import (
+    RICH_STYLE_BLUE_BOLD,
+)
+
+
+class DiffDisplay:
+    """Helper class for creating split diff views."""
+
+    @staticmethod
+    def has_search_replace_blocks(text: str) -> bool:
+        """Check if text contains search/replace blocks."""
+        return (
+            "<<<<<<< SEARCH" in text and "=======" in text and ">>>>>>> REPLACE" in text
+        )
+
+    @staticmethod
+    def parse_search_replace_blocks(blocks_text: str) -> list:
+        """
+        Parse search/replace blocks from text.
+
+        Args:
+            blocks_text: Text containing search/replace blocks
+
+        Returns:
+            List of dicts with 'index', 'search', and 'replace' keys
+        """
+        blocks = []
+        lines = blocks_text.split("\n")
+        i = 0
+        block_index = 0
+
+        while i < len(lines):
+            if lines[i].strip() == "<<<<<<< SEARCH":
+                search_lines = []
+                i += 1
+
+                while i < len(lines) and lines[i].strip() != "=======":
+                    search_lines.append(lines[i])
+                    i += 1
+
+                if i >= len(lines):
+                    break
+
+                i += 1
+                replace_lines = []
+
+                while (
+                    i < len(lines)
+                    and lines[i].strip() != ">>>>>>> REPLACE"
+                    and lines[i].strip() != "======="
+                ):
+                    replace_lines.append(lines[i])
+                    i += 1
+
+                if i >= len(lines):
+                    break
+
+                blocks.append(
+                    {
+                        "index": block_index,
+                        "search": "\n".join(search_lines),
+                        "replace": "\n".join(replace_lines),
+                    }
+                )
+                block_index += 1
+                i += 1
+            else:
+                i += 1
+
+        return blocks
+
+    @staticmethod
+    def create_split_diff_table(
+        original: str, modified: str, max_width: int = 60
+    ) -> Table:
+        """
+        Create a split diff display table using difflib for intelligent comparison.
+
+        Args:
+            original: Original text content
+            modified: Modified text content
+            max_width: Maximum width for each column
+
+        Returns:
+            Rich Table object with split diff view
+        """
+        table = Table(
+            show_header=True,
+            header_style=RICH_STYLE_BLUE_BOLD,
+            box=SIMPLE_HEAD,
+            expand=False,
+            padding=(0, 1),
+        )
+        table.add_column("Original", style="", width=max_width, no_wrap=False)
+        table.add_column("Modified", style="", width=max_width, no_wrap=False)
+
+        original_lines = original.split("\n")
+        modified_lines = modified.split("\n")
+
+        matcher = difflib.SequenceMatcher(None, original_lines, modified_lines)
+
+        for tag, i1, i2, j1, j2 in matcher.get_opcodes():
+            if tag == "equal":
+                for i, j in zip(range(i1, i2), range(j1, j2)):
+                    orig_text = Text(original_lines[i], style="dim")
+                    mod_text = Text(modified_lines[j], style="dim")
+                    table.add_row(orig_text, mod_text)
+
+            elif tag == "delete":
+                for i in range(i1, i2):
+                    orig_text = Text(original_lines[i], style="strike red")
+                    mod_text = Text("", style="dim")
+                    table.add_row(orig_text, mod_text)
+
+            elif tag == "insert":
+                for j in range(j1, j2):
+                    orig_text = Text("", style="dim")
+                    mod_text = Text(modified_lines[j], style="bold green")
+                    table.add_row(orig_text, mod_text)
+
+            elif tag == "replace":
+                max_lines = max(i2 - i1, j2 - j1)
+
+                for offset in range(max_lines):
+                    orig_idx = i1 + offset
+                    mod_idx = j1 + offset
+
+                    if orig_idx < i2 and mod_idx < j2:
+                        orig_line = original_lines[orig_idx]
+                        mod_line = modified_lines[mod_idx]
+
+                        char_matcher = difflib.SequenceMatcher(
+                            None, orig_line, mod_line
+                        )
+                        if char_matcher.ratio() > 0.5:
+                            orig_text = DiffDisplay._highlight_char_diff(
+                                orig_line, mod_line, is_original=True
+                            )
+                            mod_text = DiffDisplay._highlight_char_diff(
+                                orig_line, mod_line, is_original=False
+                            )
+                        else:
+                            orig_text = Text(orig_line, style="strike red")
+                            mod_text = Text(mod_line, style="bold green")
+
+                        table.add_row(orig_text, mod_text)
+
+                    elif orig_idx < i2:
+                        orig_text = Text(original_lines[orig_idx], style="strike red")
+                        mod_text = Text("", style="dim")
+                        table.add_row(orig_text, mod_text)
+
+                    elif mod_idx < j2:
+                        orig_text = Text("", style="dim")
+                        mod_text = Text(modified_lines[mod_idx], style="bold green")
+                        table.add_row(orig_text, mod_text)
+
+        return table
+
+    @staticmethod
+    def _highlight_char_diff(orig_line: str, mod_line: str, is_original: bool) -> Text:
+        """
+        Highlight character-level differences within a line.
+
+        Args:
+            orig_line: Original line text
+            mod_line: Modified line text
+            is_original: True to highlight original, False for modified
+
+        Returns:
+            Rich Text with character-level highlighting
+        """
+        result = Text()
+        matcher = difflib.SequenceMatcher(None, orig_line, mod_line)
+
+        for tag, i1, i2, j1, j2 in matcher.get_opcodes():
+            if is_original:
+                segment = orig_line[i1:i2]
+                if tag == "equal":
+                    result.append(segment, style="dim")
+                elif tag == "delete":
+                    result.append(segment, style="bold red on #3d0000")
+                elif tag == "replace":
+                    result.append(segment, style="bold red on #3d0000")
+            else:
+                segment = mod_line[j1:j2]
+                if tag == "equal":
+                    result.append(segment, style="dim")
+                elif tag == "insert":
+                    result.append(segment, style="bold green on #003d00")
+                elif tag == "replace":
+                    result.append(segment, style="bold green on #003d00")
+
+        return result

{agentcrew_ai-0.8.4 → agentcrew_ai-0.8.5}/AgentCrew/modules/console/display_handlers.py

@@ -217,6 +217,9 @@ class DisplayHandlers:
                     transfer_text.append(f"{msg.get('agent', 'unknown')} agent")
                     self.display_message(transfer_text)
                     continue
+
+                elif content.startswith("Content of "):
+                    continue
                 self.display_user_message(content)
             elif role == "assistant":
                 agent_name = msg.get("agent") or default_agent_name

{agentcrew_ai-0.8.4 → agentcrew_ai-0.8.5}/AgentCrew/modules/console/input_handler.py

@@ -163,7 +163,7 @@ class InputHandler:
             else:
                 if (
                     hasattr(self.message_handler, "stream_generator")
-                    and self.message_handler.stream_generator
+                    and not self.message_handler.stop_streaming
                 ):
                     try:
                         self.message_handler.stop_streaming = True