Merge pull request #393 from ModelEngine-Group/bwq/0620_subagent

Merge pull request #393 from ModelEngine-Group/bwq/0620_subagent

Author: liutao12138

backend/database/agent_db.py

@@ -269,7 +269,7 @@ def query_tool_instances_by_id(agent_id: int, tool_id: int, tenant_id: str, user
             ToolInstance.tool_id == tool_id,
             ToolInstance.delete_flag != 'Y')
         if user_id:
-            query = query = query.filter(or_(ToolInstance.user_id == user_id, ToolInstance.user_id == DEFAULT_USER_ID))
+            query = query.filter(or_(ToolInstance.user_id == user_id, ToolInstance.user_id == DEFAULT_USER_ID))
         tool_instance = query.first()
         if tool_instance:
             return as_dict(tool_instance)

frontend/app/[locale]/chat/streaming/chatStreamMessage.tsx

@@ -59,8 +59,14 @@ export function ChatStreamMessage({
 
   // Copy content to clipboard
   const handleCopyContent = () => {
-    if (message.finalAnswer) {
-      navigator.clipboard.writeText(message.finalAnswer)
+    const contentToCopy = message.finalAnswer || message.content;
+    if (contentToCopy) {
+      // Handle newlines: trim leading/trailing newlines and normalize multiple consecutive newlines
+      const trimmedContent = contentToCopy
+        .replace(/^\n+|\n+$/g, '') // Remove leading and trailing newlines
+        .replace(/\n{3,}/g, '\n\n'); // Replace 3+ consecutive newlines with double newlines
+
+      navigator.clipboard.writeText(trimmedContent)
         .then(() => {
           setCopied(true);
           setTimeout(() => setCopied(false), 2000);