defer the file processing until press send

Author: daltonnyx

AgentCrew/modules/chat/message/command_processor.py

@@ -458,7 +458,7 @@ def _handle_file_command(self, user_input: str) -> CommandResult:
 
         # Process each file
         for file_path in file_paths:
-            self.message_handler._notify("file_processing", {"file_path": file_path})
+            # self.message_handler._notify("file_processing", {"file_path": file_path})
 
             # Process file with the file handling service
             if self.message_handler.file_handler is None:

AgentCrew/modules/chat/message/handler.py

@@ -1,4 +1,6 @@
-from typing import Tuple, Optional
+from typing import Tuple, Optional, List
+import os
+import shlex
 import traceback
 import time
 
@@ -55,6 +57,7 @@ def __init__(
         self.current_user_input_idx = -1
         self.last_assisstant_response_idx = -1
         self.file_handler: Optional[FileHandler] = None
+        self._queued_attached_files = []
         self.stop_streaming = False
         self.streamline_messages = []
         self.current_conversation_id: Optional[str] = None  # ID for persistence
@@ -75,6 +78,18 @@ def _messages_append(self, message):
         )
         self.streamline_messages.extend(std_msg)
 
+    def _prepare_files_processing(self, file_command):
+        self._queued_attached_files.append(file_command)
+        file_paths_str: str = file_command[6:].strip()
+        file_paths: List[str] = [
+            os.path.expanduser(path.strip())
+            for path in shlex.split(file_paths_str)
+            if path.strip()
+        ]
+
+        for file_path in file_paths:
+            self._notify("file_processing", {"file_path": file_path})
+
     async def process_user_input(
         self,
         user_input: str,
@@ -90,6 +105,10 @@ async def process_user_input(
         """
         self.history_manager.add_entry(user_input)
 
+        if user_input.startswith("/file "):
+            self._prepare_files_processing(user_input)
+            return False, True
+
         # Process commands first
         command_result = await self.command_processor.process_command(user_input)
         if command_result.handled:
@@ -122,6 +141,13 @@ async def process_user_input(
         #                     ],
         #                 }
         #             )
+
+        # Delays file processing until user send message
+
+        while len(self._queued_attached_files) > 0:
+            file_command = self._queued_attached_files.pop(0)
+            await self.command_processor.process_command(file_command)
+
         # Add regular text message
         self._messages_append(
             {"role": "user", "content": [{"type": "text", "text": user_input}]}

AgentCrew/modules/console/console_ui.py

@@ -181,7 +181,7 @@ def listen(self, event: str, data: Any = None):
             self.display_handlers.display_message(preview_text)
         elif event == "thinking_completed":
             self.display_handlers.display_divider()
-        elif event == "file_processed":
+        elif event == "file_processing":
             self.ui_effects.stop_loading_animation()  # Stop loading on first chunk
             self.display_handlers.add_file(data["file_path"])
         elif event == "consolidation_completed":

AgentCrew/modules/console/input_handler.py

@@ -192,7 +192,7 @@ def _input_thread_worker(self):
 
                 # Put the input in the queue
                 self._input_queue.put(user_input)
-                time.sleep(0.1)  # Allow time for input processing
+                time.sleep(0.4)  # Allow time for input processing
 
             except KeyboardInterrupt:
                 # Handle Ctrl+C in input thread
@@ -267,7 +267,6 @@ def get_user_input(self):
             self.display_handlers.print_prompt_prefix(
                 self.message_handler.agent.name, self.message_handler.agent.get_model()
             )
-            time.sleep(0.4)  # prevent conflict
             self.clear_buffer()
 
         # Wait for input while allowing events to be processed

AgentCrew/modules/gui/qt_ui.py

@@ -194,7 +194,6 @@ def __init__(self, message_handler: MessageHandler):
         self.current_file_bubble = None
         self.thinking_content = ""
         self.expecting_response = False
-        self._is_file_processing = False
         self._delegated_user_input = None
 
         # Track session cost
@@ -262,11 +261,6 @@ def send_message(self):
         self.current_response_bubble = None
         self.current_response_container = None
 
-        # Send the request to worker thread via signal
-        # This is thread-safe and doesn't require QMetaObject.invokeMethod
-        if self._is_file_processing:
-            self._delegated_user_input = user_input
-            return
         # Update status bar
         self.display_status_message("Processing your message...")
         self.llm_worker.process_request.emit(user_input)
@@ -504,26 +498,19 @@ def handle_event(self, event: str, data: Any):
             if self.current_file_bubble:
                 self.chat_components.remove_messages_after(self.current_file_bubble)
                 self.current_file_bubble = None
-            self._is_file_processing = False
             self.display_error(data)
         elif event == "consolidation_completed":
             self.conversation_components.display_consolidation(data)
             self.ui_state_manager.set_input_controls_enabled(True)
         elif event == "file_processing":
-            self._is_file_processing = True
             file_path = data["file_path"]
             self.current_file_bubble = self.chat_components.append_file(
                 file_path, is_user=True
             )
             if not self.loading_conversation:
                 self.ui_state_manager.set_input_controls_enabled(True)
         elif event == "file_processed":
-            if self._is_file_processing:
-                if self._delegated_user_input:
-                    self.llm_worker.process_request.emit(self._delegated_user_input)
-                    self._delegated_user_input = None
-                self.current_file_bubble = None
-                self._is_file_processing = False
+            self.current_file_bubble = None
         elif event == "image_generated":
             self.chat_components.append_file(data, False, True)
         # Command-related events are now handled by command_handler above