From a08f400db26ca7192c80e22c91359d7ea9a56654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=96=AF=E6=9D=B0?= <yangsijie151104@126.com>
Date: Thu, 24 Jul 2025 11:17:44 +0800
Subject: [PATCH] fix: improve command completion detection in shell tool

- Replace simple marker check with precise character-by-character comparison
- Skip newlines during marker matching from end to start
- Add echo detection to prevent false positives when command just started
- Optimize English comments for better code readability
---
 backend/agent/tools/sb_shell_tool.py | 80 +++++++++++++++++++++++++++-
 1 file changed, 78 insertions(+), 2 deletions(-)

diff --git a/backend/agent/tools/sb_shell_tool.py b/backend/agent/tools/sb_shell_tool.py
index a1f50729..4df2c9aa 100644
--- a/backend/agent/tools/sb_shell_tool.py
+++ b/backend/agent/tools/sb_shell_tool.py
@@ -168,8 +168,8 @@ class SandboxShellTool(SandboxToolsBase):
                     # Get current output and check for our completion marker
                     output_result = await self._execute_raw_command(f"tmux capture-pane -t {session_name} -p -S - -E -")
                     current_output = output_result.get("output", "")
-                    
-                    if marker in current_output:
+
+                    if self._is_command_completed(current_output, marker):
                         final_output = current_output
                         break
                 
@@ -421,6 +421,82 @@ class SandboxShellTool(SandboxToolsBase):
         except Exception as e:
             return self.fail_response(f"Error listing commands: {str(e)}")
 
+    def _is_command_completed(self, current_output: str, marker: str) -> bool:
+        """
+        Check if command execution is completed by comparing marker from end to start.
+        
+        Args:
+            current_output: Current output content
+            marker: Completion marker
+            
+        Returns:
+            bool: True if command completed, False otherwise
+        """
+        if not current_output or not marker:
+            return False
+
+        # Find the last complete marker match position to start comparison
+        # Avoid terminal prompt output at the end
+        marker_end_pos = -1
+        for i in range(len(current_output) - len(marker), -1, -1):
+            if current_output[i:i+len(marker)] == marker:
+                marker_end_pos = i + len(marker) - 1
+                break
+        
+        # Start comparison from found marker position or end of output
+        if marker_end_pos != -1:
+            output_idx = marker_end_pos
+            marker_idx = len(marker) - 1
+        else:
+            output_idx = len(current_output) - 1
+            marker_idx = len(marker) - 1
+        
+        # Compare characters from end to start
+        while marker_idx >= 0 and output_idx >= 0:
+            # Skip newlines in current_output
+            if current_output[output_idx] == '\n':
+                output_idx -= 1
+                continue
+                
+            # Compare characters
+            if current_output[output_idx] != marker[marker_idx]:
+                return False
+                
+            # Continue comparison
+            output_idx -= 1
+            marker_idx -= 1
+        
+        # If marker not fully matched
+        if marker_idx >= 0:
+            return False
+            
+        # Check if preceded by "echo " (command just started)
+        check_count = 0
+        echo_chars = "echo "
+        echo_idx = len(echo_chars) - 1
+        
+        while output_idx >= 0 and check_count < 5:
+            # Skip newlines
+            if current_output[output_idx] == '\n':
+                output_idx -= 1
+                continue
+                
+            check_count += 1
+            
+            # Check for "echo " pattern
+            if echo_idx >= 0 and current_output[output_idx] == echo_chars[echo_idx]:
+                echo_idx -= 1
+            else:
+                echo_idx = len(echo_chars) - 1
+                
+            output_idx -= 1
+            
+        # If "echo " found, command just started
+        if echo_idx < 0:
+            return False
+            
+        return True
+
     async def cleanup(self):
         """Clean up all sessions."""
         for session_name in list(self._sessions.keys()):